diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index e8efde6..5f7de36 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% فوترت
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),سعر الصرف يجب أن يكون نفس {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,اسم العميل
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},لا يمكن تسمية حساب مصرفي ب {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},لا يمكن تسمية حساب مصرفي ب {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),غير المسددة ل {0} لا يمكن أن يكون أقل من الصفر ( {1} )
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,إجازة جديدة التطبيق
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,إجازة جديدة التطبيق
 apps/erpnext/erpnext/setup/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,طريقة حساب الدفع
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",سجل الأنشطة التي يقوم بها المستخدمين من المهام التي يمكن استخدامها لتتبع الوقت، والفواتير.
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},الجديد {0} # {1}
 ,Sales Partners Commission,مبيعات اللجنة الشركاء
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,الاختصار لا يمكن أن يكون أكثر من 5 أحرف
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,الاختصار لا يمكن أن يكون أكثر من 5 أحرف
 DocType: Payment Request,Payment Request,طلب الدفع
 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.",السمة القيمة {0} لا يمكن إزالتها من {1} والبند المتغيرات \ الوجود مع هذه السمة.
@@ -196,6 +196,7 @@
 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 (%),معدل الخصم على قائمة الأسعار (٪)
 DocType: Offer Letter,Select Terms and Conditions,اختر الشروط والأحكام
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,القيمة خارج
 DocType: Production Planning Tool,Sales Orders,أوامر البيع
 DocType: Purchase Taxes and Charges,Valuation,تقييم
 ,Purchase Order Trends,شراء اتجاهات ترتيب
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,تلفزيون
 DocType: Production Order Operation,Updated via 'Time Log',"تحديث عبر 'وقت دخول """
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},الحساب {0} لا ينتمي إلى شركة {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},مبلغ السلفة لا يمكن أن يكون أكبر من {0} {1}
 DocType: Naming Series,Series List for this Transaction,قائمة متسلسلة لهذه العملية
 DocType: Sales Invoice,Is Opening Entry,تم افتتاح الدخول
 DocType: Customer Group,Mention if non-standard receivable account applicable,أذكر إذا غير القياسية حساب القبض ينطبق
@@ -227,7 +229,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,يخلق زلة مرتبات المعايير المذكورة أعلاه.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,لا يوجد وصف معين
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,طلب للشراء.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,و اترك الموافق المحددة فقط يمكن أن يقدم هذا التطبيق اترك
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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} عبر إعداد&gt; إعدادات&gt; تسمية السلسلة
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},مستودع {0} لا تنتمي إلى شركة {1}
 DocType: Item Website Specification,Item Website Specification,البند مواصفات الموقع
 DocType: Payment Tool,Reference No,المرجع لا
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,ترك الممنوع
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},البند {0} قد بلغ نهايته من الحياة على {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,ترك الممنوع
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},البند {0} قد بلغ نهايته من الحياة على {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,سنوي
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,الأسهم المصالحة البند
 DocType: Stock Entry,Sales Invoice No,فاتورة مبيعات لا
@@ -249,7 +251,7 @@
 DocType: Pricing Rule,Supplier Type,المورد نوع
 DocType: Item,Publish in Hub,نشر في المحور
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,البند {0} تم إلغاء
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,البند {0} تم إلغاء
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,طلب المواد
 DocType: Bank Reconciliation,Update Clearance Date,تحديث تاريخ التخليص
 DocType: Item,Purchase Details,تفاصيل شراء
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,ملاحظة التسليم
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,إنشاء الضرائب
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,لقد تم تعديل دفع الدخول بعد سحبها. يرجى تسحبه مرة أخرى.
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} دخلت مرتين في ضريبة الصنف
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,الرجاء اختيار الشهر والسنة
@@ -329,7 +331,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,عنوان البريد الإلكتروني الخاص بك
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,يرجى الاطلاع على المرفقات
 DocType: Purchase Order,% Received,تم استلام٪
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,الإعداد الكامل بالفعل !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,الإعداد الكامل بالفعل !
 ,Finished Goods,السلع تامة الصنع
 DocType: Delivery Note,Instructions,تعليمات
 DocType: Quality Inspection,Inspected By,تفتيش من قبل
@@ -354,14 +356,13 @@
 ,Purchase Register,سجل شراء
 DocType: Landed Cost Item,Applicable Charges,الرسوم المطبقة
 DocType: Workstation,Consumable Cost,التكلفة الاستهلاكية
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1})يجب أن يمتلك صلاحية (إعتماد الإجازات)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1})يجب أن يمتلك صلاحية (إعتماد الإجازات)
 DocType: Purchase Receipt,Vehicle Date,مركبة التسجيل
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,طبي
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,السبب لفقدان
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},مغلق محطة العمل في التواريخ التالية وفقا لقائمة عطلة: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,الفرص
 DocType: Employee,Single,وحيد
-DocType: Issue,Attachment,مرفق
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,الميزانية لا يمكن تعيين لمركز التكلفة المجموعة
 DocType: Account,Cost of Goods Sold,تكلفة السلع المباعة
 DocType: Purchase Invoice,Yearly,سنويا
@@ -390,7 +391,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,السمة {0} اختيار عدة مرات في سمات الجدول
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,السمة {0} اختيار عدة مرات في سمات الجدول
 DocType: HR Settings,Employee record is created using selected field. ,يتم إنشاء سجل الموظف باستخدام الحقل المحدد.
 DocType: Sales Order,Not Applicable,لا ينطبق
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,عطلة الرئيسي.
@@ -429,7 +430,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,مستحضرات التجميل
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items",لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items",لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين
 DocType: Shipping Rule,Net Weight,الوزن الصافي
 DocType: Employee,Emergency Phone,الهاتف في حالات الطوارئ
 ,Serial No Warranty Expiry,المسلسل لا عودة انتهاء الاشتراك
@@ -440,7 +441,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,إدارة التعاقد من الباطن
 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,المعدل الذي يتم تحويل سعر العملة العملة الأساسية القائمة لشركة
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},الحساب {0} لا ينتمي للشركة: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},الحساب {0} لا ينتمي للشركة: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,اختصار استخدمت بالفعل لشركة أخرى
 DocType: Selling Settings,Default Customer Group,المجموعة الافتراضية العملاء
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",إذا تعطيل، &#39;مدور المشاركات &quot;سيتم الميدان لا تكون مرئية في أي صفقة
 DocType: BOM,Operating Cost,تكاليف التشغيل
@@ -474,6 +476,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,لا توجد في جدول الفاتورة السجلات
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,يرجى تحديد الشركة وحزب النوع الأول
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,المالية / المحاسبة العام.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,القيم المتراكمة
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",آسف ، المسلسل نص لا يمكن دمج
 DocType: Project Task,Project Task,عمل مشروع
 ,Lead Id,معرف مبادرة البيع
@@ -495,7 +498,7 @@
 DocType: Quotation,Quotation To,تسعيرة إلى
 DocType: Lead,Middle Income,المتوسطة الدخل
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),افتتاح (الكروم )
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,وحدة القياس الافتراضية للالبند {0} لا يمكن تغيير مباشرة لأنك قدمت بالفعل بعض المعاملات (s) مع UOM آخر. سوف تحتاج إلى إنشاء عنصر جديد لاستخدام افتراضي مختلف UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,وحدة القياس الافتراضية للالبند {0} لا يمكن تغيير مباشرة لأنك قدمت بالفعل بعض المعاملات (s) مع UOM آخر. سوف تحتاج إلى إنشاء عنصر جديد لاستخدام افتراضي مختلف UOM.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,المبلغ المخصص لا يمكن أن تكون سلبية
 DocType: Purchase Order Item,Billed Amt,فوترة AMT
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,مستودع منطقي لقاء ما تم إدخاله من مخزون.
@@ -573,7 +576,7 @@
 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 +543,Item has variants.,البند لديه المتغيرات.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,نوع الشجرة
@@ -586,6 +589,7 @@
 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 +33,Goods received from Suppliers.,تلقى السلع من الموردين.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,في القيمة
 DocType: Lead,Campaign Name,اسم الحملة
 ,Reserved,محجوز
 DocType: Purchase Order,Supply Raw Materials,توريد المواد الخام
@@ -600,16 +604,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,لا يمكن تحويل حساب جرت عليه أي عملية إلى دفتر حسابات (دفتر أستاذ)
 DocType: Delivery Note,Customer's Purchase Order No,الزبون أمر الشراء لا
 DocType: Employee,Cell Number,الخلية رقم
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,طلبات السيارات المواد المتولدة
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,طلبات السيارات المواد المتولدة
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,مفقود
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,"لا يمكنك إدخال قسيمة الحالي في ""ضد إدخال دفتر اليومية"" عمود"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,طاقة
 DocType: Opportunity,Opportunity From,فرصة من
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,بيان الراتب الشهري.
 DocType: Item Group,Website Specifications,موقع المواصفات
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},يوجد خطأ في قالب العناوين {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,حساب جديد
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0} من {0} من نوع {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,الصف {0}: تحويل عامل إلزامي
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",قواعد الأسعار متعددة موجود مع نفس المعايير، يرجى حل النزاع عن طريق تعيين الأولوية. قواعد السعر: {0}
 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.,القيود المحاسبية يمكن توضع مقابل عناصر فرعية. لا يسمح بربطها  مقابل المجموعات.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,لا يمكن إيقاف أو إلغاء BOM كما أنه مرتبط مع BOMs أخرى
 DocType: Opportunity,Maintenance,صيانة
@@ -671,7 +677,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,قائمة الأسعار غير محددة
 DocType: Employee,Family Background,الخلفية العائلية
 DocType: Process Payroll,Send Email,إرسال البريد الإلكتروني
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},تحذير: مرفق غير صالح {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},تحذير: مرفق غير صالح {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,لا يوجد تصريح
 DocType: Company,Default Bank Account,الافتراضي الحساب المصرفي
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",لتصفية استنادا الحزب، حدد حزب النوع الأول
@@ -701,13 +707,13 @@
 DocType: Production Planning Tool,Select Items,حدد العناصر
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} مقابل الفاتورة {1} بتاريخ {2}
 DocType: Maintenance Visit,Completion Status,استكمال الحالة
-DocType: Sales Invoice Item,Target Warehouse,الهدف مستودع
+DocType: Production Order,Target Warehouse,الهدف مستودع
 DocType: Item,Allow over delivery or receipt upto this percent,سماح على تسليم أو استلام تصل هذه النسبة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,التسليم المتوقع التاريخ لا يمكن أن يكون قبل تاريخ ترتيب المبيعات
 DocType: Upload Attendance,Import Attendance,الحضور الاستيراد
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,جميع مجموعات الصنف
 DocType: Process Payroll,Activity Log,سجل النشاط
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,صافي الربح / الخسارة
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,صافي الربح / الخسارة
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,يؤلف تلقائيا رسالة على تقديم المعاملات.
 DocType: Production Order,Item To Manufacture,البند لتصنيع
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} الوضع هو {2}
@@ -715,7 +721,7 @@
 DocType: Sales Order Item,Projected Qty,الكمية المتوقع
 DocType: Sales Invoice,Payment Due Date,تاريخ استحقاق السداد
 DocType: Newsletter,Newsletter Manager,مدير النشرة الإخبارية
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,البند البديل {0} موجود بالفعل مع نفس الصفات
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,البند البديل {0} موجود بالفعل مع نفس الصفات
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;فتح&#39;
 DocType: Notification Control,Delivery Note Message,ملاحظة تسليم رسالة
 DocType: Expense Claim,Expenses,نفقات
@@ -725,7 +731,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,البحوث والتنمية
 ,Amount to Bill,تصل إلى بيل
 DocType: Company,Registration Details,تسجيل تفاصيل
-DocType: Item,Re-Order Qty,إعادة ترتيب الكميه
+DocType: Item Reorder,Re-Order Qty,إعادة ترتيب الكميه
 DocType: Leave Block List Date,Leave Block List Date,ترك بلوك تاريخ قائمة
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},من المقرر أن يرسل إلى {0}
 DocType: Pricing Rule,Price or Discount,سعر الخصم أو
@@ -768,7 +774,7 @@
 DocType: Bank Reconciliation,Total Amount,المبلغ الكلي لل
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,نشر الإنترنت
 DocType: Production Planning Tool,Production Orders,أوامر الإنتاج
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,توازن القيمة
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,توازن القيمة
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,قائمة مبيعات الأسعار
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,نشر لمزامنة العناصر
 DocType: Bank Reconciliation,Account Currency,عملة الحساب
@@ -777,7 +783,7 @@
 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 +538,Item Variants {0} updated,البند المتغيرات {0} تحديث
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,البند المتغيرات {0} تحديث
 DocType: Quality Inspection Reading,Reading 6,قراءة 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,مقدم فاتورة الشراء
 DocType: Address,Shop,تسوق
@@ -854,7 +860,7 @@
 DocType: POS Profile,Cash/Bank Account,النقد / البنك حساب
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,العناصر إزالتها مع أي تغيير في كمية أو قيمة.
 DocType: Delivery Note,Delivery To,التسليم إلى
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,الجدول السمة إلزامي
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,خصم
@@ -882,7 +888,7 @@
 DocType: Tax Rule,Shipping State,الدولة الشحن
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"يجب إضافة البند باستخدام ""الحصول على السلع من شراء إيصالات 'زر"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,مصاريف المبيعات
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,شراء القياسية
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,شراء القياسية
 DocType: GL Entry,Against,ضد
 DocType: Item,Default Selling Cost Center,الافتراضي البيع مركز التكلفة
 DocType: Sales Partner,Implementation Partner,تنفيذ الشريك
@@ -924,7 +930,7 @@
 DocType: Sales Partner,Distributor,موزع
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,التسوق شحن العربة القاعدة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,إنتاج النظام {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',الرجاء تعيين &#39;تطبيق خصم إضافي على&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',الرجاء تعيين &#39;تطبيق خصم إضافي على&#39;
 ,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.,حدد وقت السجلات وتقديمها إلى إنشاء فاتورة مبيعات جديدة.
@@ -992,9 +998,9 @@
 DocType: Contact,User ID,المستخدم ID
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,عرض ليدجر
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,أقرب
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group",يوجد اسم مجموعة أصناف بنفس الاسم، الرجاء تغيير اسم الصنف أو إعادة تسمية المجموعة
 DocType: Production Order,Manufacture against Sales Order,تصنيع ضد ترتيب المبيعات
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,بقية العالم
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,إجمالي الأجور
@@ -1024,7 +1030,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged",آسف، و الشركات لا يمكن دمج
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged",آسف، و الشركات لا يمكن دمج
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,صغير
 DocType: Employee,Employee Number,رقم الموظف
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},الحالة رقم ( ق ) قيد الاستخدام بالفعل. محاولة من القضية لا { 0 }
@@ -1043,7 +1049,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,زراعة
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,المنتجات أو الخدمات الخاصة بك
 DocType: Mode of Payment,Mode of Payment,طريقة الدفع
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,وينبغي أن يكون موقع صورة ملف العامة أو عنوان الموقع
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,وينبغي أن يكون موقع صورة ملف العامة أو عنوان الموقع
 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,معلومات اتصال المستودع
@@ -1115,6 +1121,7 @@
 DocType: Address,Utilities,خدمات
 DocType: Purchase Invoice Item,Accounting,المحاسبة
 DocType: Features Setup,Features Setup,ميزات الإعداد
+DocType: Item,Is Service Item,هو البند خدمة
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,فترة الطلب لا يمكن أن يكون خارج فترةالاجزات المخصصة
 DocType: Activity Cost,Projects,مشاريع
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,الرجاء اختيار السنة المالية
@@ -1145,7 +1152,7 @@
 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 +465,cannot be greater than 100,لا يمكن أن يكون أكبر من 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,البند {0} ليس الأسهم الإغلاق
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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 +1212,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,حكومة
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,المتغيرات البند
 DocType: Company,Services,الخدمات
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),مجموع ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),مجموع ({0})
 DocType: Cost Center,Parent Cost Center,الأم تكلفة مركز
 DocType: Sales Invoice,Source,مصدر
 DocType: Leave Type,Is Leave Without Pay,وإجازة بدون راتب
@@ -1278,17 +1285,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,إعادة إرسال البريد الإلكتروني الدفع
 DocType: Dependent Task,Dependent Task,العمل تعتمد
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},إجازة من نوع {0} لا يمكن أن تكون أطول من {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,الكمية المستهلكة
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} مشاهدة
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,صافي التغير في النقد
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,صافي التغير في النقد
 DocType: Salary Structure Deduction,Salary Structure Deduction,هيكل المرتبات / الخصومات
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,وحدة القياس {0} تم إدخال أكثر من مرة واحدة في معامل التحويل الجدول
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,وحدة القياس {0} تم إدخال أكثر من مرة واحدة في معامل التحويل الجدول
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},دفع طلب بالفعل {0}
 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 +182,Quantity must not be more than {0},لا يجب أن تكون الكمية أكثر من {0}
@@ -1350,7 +1357,7 @@
 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: Packed Item,To Warehouse (Optional),إلى مستودع (اختياري)
 DocType: Sales Invoice,Paid Amount (Company Currency),المبلغ المدفوع (شركة العملات)
 DocType: Purchase Invoice,Additional Discount,خصم إضافي
 DocType: Selling Settings,Selling Settings,بيع إعدادات
@@ -1359,7 +1366,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",شركة والشهر و السنة المالية إلزامي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,مصاريف التسويق
 ,Item Shortage Report,البند تقرير نقص
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","يذكر الوزن، \n يرجى ذكر ""الوزن UOM"" للغاية"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","يذكر الوزن، \n يرجى ذكر ""الوزن UOM"" للغاية"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,طلب المواد المستخدمة لانشاء الحركة المخزنية
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,واحد وحدة من عنصر.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',وقت دخول الدفعة {0} يجب ' نشره '
@@ -1370,6 +1377,7 @@
 DocType: Employee,Date Of Retirement,تاريخ التقاعد
 DocType: Upload Attendance,Get Template,الحصول على قالب
 DocType: Address,Postal,بريدي
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,إعداد ERPNext كامل!
 DocType: Item,Weightage,الوزن
 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,يوجد مجموعة العملاء بنفس الاسم الرجاء تغيير اسم العميل أو إعادة تسمية مجموعة العملاء
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,الرجاء اختيار {0} أولا.
@@ -1398,12 +1406,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,عدد كبير جدا من الأعمدة. تصدير التقرير وطباعته باستخدام تطبيق جدول البيانات.
 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 +139,Main,رئيسي
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,رئيسي
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,مختلف
 DocType: Naming Series,Set prefix for numbering series on your transactions,تحديد بادئة للترقيم المتسلسل على المعاملات الخاصة بك
 DocType: Employee Attendance Tool,Employees HTML,الموظفين HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,لا يمكن إلغاء النظام على توقف . نزع السدادة لإلغاء .
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,BOM الافتراضي ({0}) يجب أن تكون نشطة لهذا البند أو قالبها
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,المتغيرات
@@ -1428,7 +1436,6 @@
 DocType: Sales Order,To Deliver and Bill,لتسليم وبيل
 DocType: GL Entry,Credit Amount in Account Currency,مبلغ القرض في حساب العملات
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,سجلات الوقت للتصنيع.
-DocType: Item,Apply Warehouse-wise Reorder Level,تطبيق مستودع الحكمة إعادة ترتيب مستوى
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} يجب أن تعتمد
 DocType: Authorization Control,Authorization Control,إذن التحكم
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},الصف # {0}: رفض مستودع إلزامي ضد رفض البند {1}
@@ -1527,6 +1534,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,الصف # {0} عملية {1} لم يكتمل ل{2} الكمية من السلع تامة الصنع في أمر الإنتاج # {3}. يرجى تحديث حالة عملية عن طريق سجلات الوقت
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,الاستثمارات
 DocType: Issue,Resolution Details,قرار تفاصيل
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,المخصصات
 DocType: Quality Inspection Reading,Acceptance Criteria,معايير القبول
 DocType: Item Attribute,Attribute Name,السمة اسم
 DocType: Item Group,Show In Website,تظهر في الموقع
@@ -1577,7 +1585,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,حساب المطالبة بانتظار الموافقة. فقط الموافق المصروفات يمكن تحديث الحالة.
 DocType: Purchase Invoice,Additional Discount Amount,مقدار الخصم الاضافي
 DocType: Leave Block List Allow,Leave Block List Allow,ترك قائمة الحظر السماح
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,"الاسم المختصر لا يمكن أن يكون فارغاً أو ""مسافة"""
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,"الاسم المختصر لا يمكن أن يكون فارغاً أو ""مسافة"""
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,مجموعة لغير المجموعه
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,الرياضة
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,الإجمالي الفعلي
@@ -1618,7 +1626,7 @@
 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**.,**السنة المالية** تمثل سنة مالية. يتم تعقب كل القيود المحاسبية والمعاملات الرئيسية الأخرى مقابل **السنة المالية**.
 DocType: Opportunity,Customer / Lead Address,العميل / الرصاص العنوان
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},تحذير: شهادة SSL غير صالحة في المرفق {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},تحذير: شهادة SSL غير صالحة في المرفق {0}
 DocType: Production Order Operation,Actual Operation Time,الفعلي وقت التشغيل
 DocType: Authorization Rule,Applicable To (User),تنطبق على (المستخدم)
 DocType: Purchase Taxes and Charges,Deduct,خصم
@@ -1767,7 +1775,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,القضية رقم لا يمكن أن يكون 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,إذا كان لديك فريق المبيعات والشركاء بيع (شركاء القنوات) يمكن أن يوصف بها والحفاظ على مساهمتها في نشاط المبيعات
 DocType: Item,Show a slideshow at the top of the page,تظهر الشرائح في أعلى الصفحة
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,مخازن
+DocType: Item,"Allow in Sales Order of type ""Service""",السماح في ترتيب المبيعات من نوع &quot;الخدمة&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,مخازن
 DocType: Time Log,Projects Manager,مدير المشاريع
 DocType: Serial No,Delivery Time,وقت التسليم
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,بناء على شيخوخة
@@ -1792,7 +1801,7 @@
 ,Financial Analytics,تحليلات مالية
 DocType: Quality Inspection,Verified By,التحقق من
 DocType: Address,Subsidiary,شركة فرعية
-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.",لا يمكن تغيير العملة الافتراضية الشركة ، وذلك لأن هناك معاملات القائمة. يجب أن يتم إلغاء المعاملات لتغيير العملة الافتراضية.
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",لا يمكن تغيير العملة الافتراضية الشركة ، وذلك لأن هناك معاملات القائمة. يجب أن يتم إلغاء المعاملات لتغيير العملة الافتراضية.
 DocType: Quality Inspection,Purchase Receipt No,لا شراء استلام
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,العربون
 DocType: Process Payroll,Create Salary Slip,إنشاء زلة الراتب
@@ -1840,7 +1849,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,المواد الخام لا يمكن أن يكون فارغا.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.",تعذر تحديث الأسهم، فاتورة تحتوي انخفاض الشحن البند.
 DocType: Newsletter,Test,اختبار
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'",كما أن هناك معاملات الأوراق المالية الموجودة لهذا البند، \ لا يمكنك تغيير قيم &quot;ليس لديه المسلسل &#39;،&#39; لديه دفعة لا &#39;،&#39; هل البند الأسهم&quot; و &quot;أسلوب التقييم&quot;
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,خيارات مجلة الدخول
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,لا يمكنك تغيير معدل إذا ذكر BOM agianst أي بند
@@ -1949,7 +1958,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,يرجى ملاحظة التسليم أولا
 DocType: Purchase Invoice,Currency and Price List,العملة وقائمة الأسعار
 DocType: Opportunity,Customer / Lead Name,العميل / اسم الرصاص
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,إزالة التاريخ لم يرد ذكرها
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,إزالة التاريخ لم يرد ذكرها
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,الإنتاج
 DocType: Item,Allow Production Order,تسمح أمر الإنتاج
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,الصف {0} : يجب أن يكون تاريخ بدء قبل تاريخ الانتهاء
@@ -1959,7 +1968,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,إجمالي الدخل
 DocType: Purchase Receipt,Time at which materials were received,الوقت الذي وردت المواد
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,بلدي العناوين
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,بلدي العناوين
 DocType: Stock Ledger Entry,Outgoing Rate,أسعار المنتهية ولايته
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,فرع المؤسسة الرئيسية .
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,أو
@@ -2028,7 +2037,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,إدارة مجموعة العملاء شجرة .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,اسم مركز تكلفة جديد
 DocType: Leave Control Panel,Leave Control Panel,ترك لوحة التحكم
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,لم يتم العثور على قالب العنوان الافتراضي. يرجى إنشاء واحدة جديدة من الإعداد> طباعة والعلامات التجارية> قالب العنوان.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,لم يتم العثور على قالب العنوان الافتراضي. يرجى إنشاء واحدة جديدة من الإعداد> طباعة والعلامات التجارية> قالب العنوان.
 DocType: Appraisal,HR User,HR العضو
 DocType: Purchase Invoice,Taxes and Charges Deducted,خصم الضرائب والرسوم
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,قضايا
@@ -2045,7 +2054,7 @@
 ,Sales Browser,متصفح المبيعات
 DocType: Journal Entry,Total Credit,إجمالي الائتمان
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},موجود آخر {0} # {1} ضد حركة مخزنية {2}: تحذير
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,محلي
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,كبير
@@ -2064,7 +2073,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,جميع معاملات البيع يمكن الموسومة ضد ** عدة أشخاص المبيعات ** بحيث يمكنك تعيين ورصد الأهداف.
 ,S.O. No.,S.O. رقم
 DocType: Production Order Operation,Make Time Log,جعل وقت دخول
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,الرجاء ضبط كمية إعادة الطلب
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},يرجى إنشاء العملاء من الرصاص {0}
 DocType: Price List,Applicable for Countries,ينطبق على البلدان
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,أجهزة الكمبيوتر
@@ -2151,7 +2159,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,الحصول على مدخلات ذات صلة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,القيود المحاسبية لمخزون
 DocType: Sales Invoice,Sales Team1,مبيعات Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,البند {0} غير موجود
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,البند {0} غير موجود
 DocType: Sales Invoice,Customer Address,العنوان العملاء
 DocType: Payment Request,Recipient and Message,المتلقي والرسالة
 DocType: Purchase Invoice,Apply Additional Discount On,تطبيق خصم إضافي على
@@ -2193,7 +2201,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,تقييم قيم
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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,إعادة تسمية الدخول
@@ -2231,7 +2239,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,من فضلك ادخل تاريخ التخفيف .
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,اترك فقط مع وضع تطبيقات ' وافق ' يمكن تقديم
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,عنوان عنوانها إلزامية.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,عنوان عنوانها إلزامية.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,أدخل اسم الحملة إذا كان مصدر من التحقيق هو حملة
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,صحيفة الناشرين
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,تحديد السنة المالية
@@ -2255,6 +2263,7 @@
 DocType: UOM,Must be Whole Number,يجب أن يكون عدد صحيح
 DocType: Leave Control Panel,New Leaves Allocated (In Days),أوراق الجديدة المخصصة (بالأيام)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,المسلسل لا {0} غير موجود
+DocType: Sales Invoice Item,Customer Warehouse (Optional),مستودع العميل (اختياري)
 DocType: Pricing Rule,Discount Percentage,نسبة الخصم
 DocType: Payment Reconciliation Invoice,Invoice Number,رقم الفاتورة
 apps/erpnext/erpnext/hooks.py +55,Orders,أوامر
@@ -2364,7 +2373,7 @@
 DocType: Appraisal,Appraisal,تقييم
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,ويتكرر التاريخ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,المفوض بالتوقيع
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},"الموافق عل الاجازة يجب ان يكون واحد من 
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,Leave approver must be one of {0},"الموافق عل الاجازة يجب ان يكون واحد من 
 {0}"
 DocType: Hub Settings,Seller Email,البائع البريد الإلكتروني
 DocType: Project,Total Purchase Cost (via Purchase Invoice),مجموع تكلفة الشراء (عن طريق شراء الفاتورة)
@@ -2534,7 +2543,7 @@
 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 +733,Show tax break-up,مشاهدة الضرائب تفكك
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,مشاهدة الضرائب تفكك
 apps/erpnext/erpnext/accounts/party.py +283,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',إذا كنت تنطوي في نشاط الصناعات التحويلية . تمكن السلعة ' يتم تصنيعها '
@@ -2584,7 +2593,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,الرجاء إعادة الكتابة اسم الشركة لتأكيد
@@ -2611,9 +2620,6 @@
 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,يجب أن يكون تاريخ الالتحاق بالعمل أكبر من تاريخ الميلاد
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,هيكل المرتبات
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","توجد عدة الأسعار القاعدة مع المعايير نفسها، يرجى حل \
- الصراع عن طريق تعيين الأولوية. قواعد السعر: {0}"
 DocType: Account,Bank,مصرف
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,شركة الطيران
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,قضية المواد
@@ -2638,7 +2644,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,الأوراق المالية و البورصات السلعية
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',وحدة القياس الافتراضية للخيار &#39;{0}&#39; يجب أن يكون نفس في قالب &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',وحدة القياس الافتراضية للخيار &#39;{0}&#39; يجب أن يكون نفس في قالب &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,إحسب الربح بناء على
 DocType: Delivery Note Item,From Warehouse,من مستودع
 DocType: Purchase Taxes and Charges,Valuation and Total,التقييم وتوتال
@@ -2647,7 +2653,7 @@
 DocType: Account,Purchase User,شراء العضو
 DocType: Notification Control,Customize the Notification,تخصيص إعلام
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,التدفق النقدي من العمليات
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,لا يمكن حذف القالب الافتراضي العنوان
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,لا يمكن حذف القالب الافتراضي العنوان
 DocType: Sales Invoice,Shipping Rule,الشحن القاعدة
 DocType: Manufacturer,Limited to 12 characters,تقتصر على 12 حرفا
 DocType: Journal Entry,Print Heading,طباعة عنوان
@@ -2741,7 +2747,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,بيانات المشروع من الحكمة ليست متاحة لل اقتباس
 DocType: Project,Expected End Date,تاريخ الإنتهاء المتوقع
 DocType: Appraisal Template,Appraisal Template Title,تقييم قالب عنوان
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,تجاري
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,خدمات رهيبة
@@ -2760,7 +2766,7 @@
 DocType: Customer,Default Receivable Accounts,افتراضي حسابات المقبوضات
 DocType: Tax Rule,Billing State,الدولة الفواتير
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,نقل
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),جلب BOM انفجرت (بما في ذلك المجالس الفرعية)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),جلب BOM انفجرت (بما في ذلك المجالس الفرعية)
 DocType: Authorization Rule,Applicable To (Employee),تنطبق على (موظف)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,يرجع تاريخ إلزامي
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,الاضافة للسمة {0} لا يمكن أن يكون 0
@@ -2793,7 +2799,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,لا يسمح السلبية قيم التقييم
 DocType: Holiday List,Weekly Off,العطلة الأسبوعية
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",ل، 2012 على سبيل المثال 2012-13
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),الربح المؤقت / الخسارة (الائتمان)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),الربح المؤقت / الخسارة (الائتمان)
 DocType: Sales Invoice,Return Against Sales Invoice,العودة ضد فاتورة المبيعات
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,البند 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},الرجاء تعيين القيمة الافتراضية {0} في شركة {1}
@@ -2824,6 +2830,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,إضافة الطفل
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,دور السماح للتعيين الحسابات المجمدة وتحرير مقالات المجمدة
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,لا يمكن تحويل مركز التكلفة إلى دفتر الأستاذ كما فعلت العقد التابعة
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,القيمة افتتاح
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,المسلسل #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,عمولة على المبيعات
 DocType: Offer Letter Term,Value / Description,قيمة / الوصف
@@ -2857,7 +2864,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,تم حذف جميع المعاملات المتعلقة بهذه الشركة!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,كما في تاريخ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,امتحان
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,مستودع الافتراضي هو إلزامي بالنسبة لمخزون السلعة .
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},دفع المرتبات لشهر {0} و السنة {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,إدراج السيارات أسعار قائمة الأسعار إذا مفقود
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,إجمالي المبلغ المدفوع
@@ -2893,7 +2899,7 @@
 DocType: Payment Tool,Set Matching Amounts,ضبط المبالغ مطابقة
 DocType: Purchase Invoice,Taxes and Charges Added,أضيفت الضرائب والرسوم
 ,Sales Funnel,مبيعات القمع
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,الاسم المختصر إلزامي
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,الاسم المختصر إلزامي
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,شكرا لك على اهتمامك في الاشتراك في تحديثات لدينا
 ,Qty to Transfer,الكمية للنقل
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,اقتباسات لعروض أو العملاء.
@@ -2921,7 +2927,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,اقتباس المورد
 DocType: Quotation,In Words will be visible once you save the Quotation.,وبعبارة تكون مرئية بمجرد حفظ اقتباس.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} لم يتوقف
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},الباركود {0} مستخدم بالفعل في الصنف {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,الأحداث القادمة
@@ -2944,7 +2950,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,اختر السنة المالية ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS الملف المطلوب لجعل الدخول POS
 DocType: Hub Settings,Name Token,اسم رمز
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,البيع القياسية
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,البيع القياسية
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,واحدة على الاقل مستودع إلزامي
 DocType: Serial No,Out of Warranty,لا تغطيه الضمان
 DocType: BOM Replace Tool,Replace,استبدل
@@ -3067,7 +3073,7 @@
 DocType: Sales Invoice,Paid Amount,المبلغ المدفوع
 ,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,وضع هذا القالب كما العنوان الافتراضي حيث لا يوجد الافتراضية الأخرى
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,وضع هذا القالب كما العنوان الافتراضي حيث لا يوجد الافتراضية الأخرى
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","رصيد حساب بالفعل في الخصم، لا يسمح لك تعيين ""الرصيد يجب أن يكون 'ك' الائتمان '"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,إدارة الجودة
 DocType: Production Planning Tool,Filter based on customer,تصفية على أساس العملاء
@@ -3168,7 +3174,7 @@
 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 +19,Shortage Qty,نقص الكمية
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,البديل البند {0} موجود مع نفس الصفات
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,البديل البند {0} موجود مع نفس الصفات
 DocType: Salary Slip,Salary Slip,إيصال الراتب
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' إلى تاريخ ' مطلوب
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",.إنشاء التعبئة زلات لحزم ليتم تسليمها. المستخدمة لإخطار رقم   الحزمة، محتويات الحزمة وزنها.
@@ -3179,7 +3185,7 @@
 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.",عند &quot;المقدمة&quot; أي من المعاملات تم، بريد الكتروني المنبثقة تلقائيا فتح لإرسال بريد الكتروني الى &quot;الاتصال&quot; المرتبطة في تلك المعاملة، مع الصفقة كمرفق. يجوز للمستخدم أو قد لا إرسال البريد الإلكتروني.
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,إعدادات العالمية
 DocType: Employee Education,Employee Education,تعليم الموظف
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,هناك حاجة لجلب البند التفاصيل.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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} وقد وردت بالفعل
@@ -3205,6 +3211,7 @@
 DocType: BOM,Manufacturing User,التصنيع العضو
 DocType: Purchase Order,Raw Materials Supplied,المواد الخام الموردة
 DocType: Purchase Invoice,Recurring Print Format,تنسيق طباعة متكرر
+DocType: C-Form,Series,سلسلة ترقيم الوثيقة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,التسليم المتوقع التاريخ لا يمكن أن يكون قبل تاريخ طلب شراء
 DocType: Appraisal,Appraisal Template,تقييم قالب
 DocType: Item Group,Item Classification,تصنيف البند
@@ -3291,7 +3298,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: إدخال إعادة ترتيب موجود بالفعل لهذا المستودع {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.",لا يمكن ان تعلن بانها فقدت ، لأن أحرز اقتباس .
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,مدير ماستر شراء
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,إنتاج النظام {0} يجب أن تقدم
@@ -3299,7 +3306,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,التقارير الرئيسية
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,حتى الآن لا يمكن أن يكون قبل تاريخ من
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,إضافة / تحرير الأسعار
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,بلدي أوامر
@@ -3347,7 +3354,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},الصف # {0}: تعيين مورد للالبند {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,الموقع صورة {0} تعلق على البند {1} لا يمكن العثور
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,الموقع صورة {0} تعلق على البند {1} لا يمكن العثور
 DocType: Issue,Content Type,نوع المحتوى
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,الكمبيوتر
 DocType: Item,List this Item in multiple groups on the website.,قائمة هذا البند في مجموعات متعددة على شبكة الانترنت.
@@ -3361,7 +3368,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,"""لهُ رقم تسلسل""  لا يمكن ان يكون ""نعم"" لبند غير قابل للتخزين"
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'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,رئيس حساب
@@ -3387,7 +3394,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,إغلاق حساب {0} يجب أن يكون من نوع المسؤولية / حقوق المساهمين
 DocType: Authorization Rule,Based On,وبناء على
 DocType: Sales Order Item,Ordered Qty,أمرت الكمية
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,البند هو تعطيل {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,البند هو تعطيل {0}
 DocType: Stock Settings,Stock Frozen Upto,الأسهم المجمدة لغاية
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},فترة من وفترة لمواعيد إلزامية لالمتكررة {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,مشروع النشاط / المهمة.
@@ -3395,7 +3402,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",يجب أن يتم التحقق الشراء، إذا تم تحديد مطبق للك {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,يجب أن يكون الخصم أقل من 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),شطب المبلغ (شركة العملات)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,الصف # {0}: الرجاء تعيين كمية إعادة الطلب
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,الصف # {0}: الرجاء تعيين كمية إعادة الطلب
 DocType: Landed Cost Voucher,Landed Cost Voucher,هبطت التكلفة قسيمة
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},الرجاء تعيين {0}
 DocType: Purchase Invoice,Repeat on Day of Month,تكرار في يوم من شهر
@@ -3468,7 +3475,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,عرض الآن
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,حدد الفترة التي سيتم إنشاء فاتورة تلقائيا
 DocType: BOM,Raw Material Cost,المواد الخام التكلفة
-DocType: Item,Re-Order Level,إعادة ترتيب مستوى
+DocType: Item Reorder,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.,إدخال عناصر والكمية المخططة التي تريد رفع أوامر الإنتاج أو تحميل المواد الخام لتحليلها.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,جزئي
 DocType: Employee,Applicable Holiday List,ينطبق عطلة قائمة
@@ -3523,7 +3530,7 @@
 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 +573,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة السمة للسمة {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3602,7 +3609,7 @@
 DocType: Address,Office,مكتب
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,المدخلات المحاسبية  لدفتر اليومية.
 DocType: Delivery Note Item,Available Qty at From Warehouse,الكمية المتوفرة في المستودعات من
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,يرجى تحديد سجل الموظف أولا.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,يرجى تحديد سجل الموظف أولا.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,الرجاء إدخال حساب المصاريف
@@ -3677,7 +3684,7 @@
 DocType: Item Attribute,Numeric Values,قيم رقمية
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,إرفاق صورة الشعار/العلامة التجارية
 DocType: Customer,Commission Rate,اللجنة قيم
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,جعل البديل
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,جعل البديل
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,منع مغادرة الطلبات المقدمة من الإدارة.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,السلة فارغة
 DocType: Production Order,Actual Operating Cost,الفعلية تكاليف التشغيل
@@ -3694,15 +3701,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item",لضبط مستوى إعادة الطلب، يجب أن يكون البند لشراء السلعة أو التصنيع البند
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),(نصف يوم)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(نصف يوم)
 DocType: Supplier,Credit Days,الائتمان أيام
 DocType: Leave Type,Is Carry Forward,والمضي قدما
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,BOM الحصول على أصناف من
diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv
index ed2d2b0..93e486d 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% Обявен
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Валутен курс трябва да бъде същата като {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Име на клиента
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Банкова сметка не може да бъде определен като {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Банкова сметка не може да бъде определен като {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Изключително за {0} не може да бъде по-малък от нула ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,New Оставете Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,New Оставете Application
 apps/erpnext/erpnext/setup/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,Начин на разплащателна сметка
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Вход на дейности, извършени от потребители срещу задачи, които могат да се използват за проследяване на времето, за фактуриране."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},New {0} # {1}
 ,Sales Partners Commission,Търговски партньори на Комисията
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Съкращение не може да има повече от 5 символа
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Съкращение не може да има повече от 5 символа
 DocType: Payment Request,Payment Request,Payment Request
 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.",Умение Value {0} не може да бъде отстранен от {1} като т Варианти \ съществува с този атрибут.
@@ -195,6 +195,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,Изберете Общи условия
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,Out Value
 DocType: Production Planning Tool,Sales Orders,Продажби Поръчки
 DocType: Purchase Taxes and Charges,Valuation,Оценка
 ,Purchase Order Trends,Поръчката Trends
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Телевизия
 DocType: Production Order Operation,Updated via 'Time Log',Updated чрез &quot;Time Log&quot;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Сметка {0} не принадлежи към Фирма {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Адванс сума не може да бъде по-голяма от {0} {1}
 DocType: Naming Series,Series List for this Transaction,Series Списък за тази транзакция
 DocType: Sales Invoice,Is Opening Entry,Се отваря Влизане
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Споменете, ако нестандартно вземане предвид приложимо"
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Създава заплата приплъзване за посочените по-горе критерии.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Няма описание дадено
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Заявка за покупка.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Само избраният Оставете одобряващ да подадете този отпуск Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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&gt; Settings&gt; именуване Series"
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Warehouse {0} не принадлежи на фирмата {1}
 DocType: Item Website Specification,Item Website Specification,Позиция Website Specification
 DocType: Payment Tool,Reference No,Референтен номер по
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Оставете Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},Точка {0} е достигнал края на своя живот на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,Оставете Блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Точка {0} е достигнал края на своя живот на {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Склад за помирение Точка
 DocType: Stock Entry,Sales Invoice No,Продажби Фактура Не
@@ -248,7 +250,7 @@
 DocType: Pricing Rule,Supplier Type,Доставчик Type
 DocType: Item,Publish in Hub,Публикувай в Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,Точка {0} е отменен
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Точка {0} е отменен
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Материал Искане
 DocType: Bank Reconciliation,Update Clearance Date,Актуализация Клирънсът Дата
 DocType: Item,Purchase Details,Изкупните Детайли
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Фактура
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Създаване Данъци
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Заплащане вписване е променен, след като го извади. Моля, изтеглете го отново."
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} въведен два пъти в Данък
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,"Моля, изберете месец и година"
@@ -327,7 +329,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Вашата електронна поща
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,"Моля, вижте прикачения файл"
 DocType: Purchase Order,% Received,% Получени
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Setup Вече Complete !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Setup Вече Complete !!
 ,Finished Goods,Готова продукция
 DocType: Delivery Note,Instructions,Инструкции
 DocType: Quality Inspection,Inspected By,Инспектирани от
@@ -352,14 +354,13 @@
 ,Purchase Register,Покупка Регистрация
 DocType: Landed Cost Item,Applicable Charges,Приложимите цени
 DocType: Workstation,Consumable Cost,Консумативи Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) трябва да има роля в ""Одобряващ напускане"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) трябва да има роля в ""Одобряващ напускане"""
 DocType: Purchase Receipt,Vehicle Date,Камион Дата
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Медицински
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина за загубата
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},"Workstation е затворен на следните дати, както на Holiday Списък: {0}"
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Възможности
 DocType: Employee,Single,Единичен
-DocType: Issue,Attachment,Привързаност
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Бюджетът не може да се настрои за Cost Center Group
 DocType: Account,Cost of Goods Sold,Себестойност на продадените стоки
 DocType: Purchase Invoice,Yearly,Годишно
@@ -388,7 +389,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
 DocType: HR Settings,Employee record is created using selected field. ,Запис на служителите е създаден с помощта на избран област.
 DocType: Sales Order,Not Applicable,Не Е Приложимо
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Holiday майстор.
@@ -427,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Козметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items","За да се слеят, следните свойства трябва да са едни и същи и за двете позиции"
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","За да се слеят, следните свойства трябва да са едни и същи и за двете позиции"
 DocType: Shipping Rule,Net Weight,Нето Тегло
 DocType: Employee,Emergency Phone,Телефон за спешни
 ,Serial No Warranty Expiry,Пореден № Warranty Изтичане
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Управление Подизпълнители
 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,"Скоростта, с която Ценоразпис валута се превръща в основна валута на компанията"
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Сметка {0} не принадлежи на фирма: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Сметка {0} не принадлежи на фирма: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Съкращение вече се използва за друга компания
 DocType: Selling Settings,Default Customer Group,Default Customer Group
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ако деактивирате, поле &quot;Rounded Общо&quot; няма да се вижда в всяка сделка"
 DocType: BOM,Operating Cost,Експлоатационни разходи
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Не са намерени в таблицата с Invoice записи
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Моля изберете Company и Party Type първи
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Финансови / Счетоводство година.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Натрупаните стойности
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Съжаляваме, серийни номера не могат да бъдат слети"
 DocType: Project Task,Project Task,Проект Task
 ,Lead Id,Lead Id
@@ -492,7 +495,7 @@
 DocType: Quotation,Quotation To,Офертата до
 DocType: Lead,Middle Income,Среден доход
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Откриване (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Default мерната единица за т {0} не може да се променя директно, защото вече сте направили някаква сделка (и) с друга мерна единица. Вие ще трябва да се създаде нова т да използвате различен Default мерна единица."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Default мерната единица за т {0} не може да се променя директно, защото вече сте направили някаква сделка (и) с друга мерна единица. Вие ще трябва да се създаде нова т да използвате различен Default мерна единица."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Отпусната сума не може да бъде отрицателна
 DocType: Purchase Order Item,Billed Amt,Таксуваната Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Логически Склад, за които са направени стоковите разписки."
@@ -570,7 +573,7 @@
 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 +543,Item has variants.,Точка има варианти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -583,6 +586,7 @@
 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 +33,Goods received from Suppliers.,Получените стоки от доставчици.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,В Value
 DocType: Lead,Campaign Name,Име на кампанията
 ,Reserved,Резервирано
 DocType: Purchase Order,Supply Raw Materials,Доставка суровини
@@ -597,16 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Сметка със съществуващa трансакция не може да бъде превърната в Главна Счетоводна Книга
 DocType: Delivery Note,Customer's Purchase Order No,Клиента поръчка Не
 DocType: Employee,Cell Number,Броя на клетките
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Материал Исканията Генерирани
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Auto Материал Исканията Генерирани
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Загубен
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Вие не можете да въведете текущата ваучер &quot;Срещу вестник Entry&quot; колона
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Енергия
 DocType: Opportunity,Opportunity From,Opportunity От
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Месечно извлечение заплата.
 DocType: Item Group,Website Specifications,Сайт Спецификации
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Има грешка във вашата Адрес Шаблон {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,New Account
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: От {0} от вид {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Превръщане Factor е задължително
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Няколко правила за цените съществува по същите критерии, моля, разрешаване на конфликти чрез възлагане приоритет. Правила Цена: {0}"
 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.,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да деактивирате или да отмени BOM тъй като тя е свързана с други спецификации на материали
 DocType: Opportunity,Maintenance,Поддръжка
@@ -649,7 +655,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,Ценова листа не избран
 DocType: Employee,Family Background,Семейна среда
 DocType: Process Payroll,Send Email,Изпрати е-мейл
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Внимание: Invalid Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Внимание: Invalid Attachment {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Няма разрешение
 DocType: Company,Default Bank Account,Default Bank Account
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","За да филтрирате базирани на партия, изберете страна Напишете първия"
@@ -679,13 +685,13 @@
 DocType: Production Planning Tool,Select Items,Изберете артикули
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} срещу Сметка {1} от {2}
 DocType: Maintenance Visit,Completion Status,Завършване Status
-DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
+DocType: Production Order,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Оставя се в продължение на доставка или получаване до запълването този процент
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,Очаквана дата на доставка не може да бъде преди Продажби Поръчка Дата
 DocType: Upload Attendance,Import Attendance,Внос Присъствие
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Всички стокови групи
 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,Нетна печалба / загуба
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Нетна печалба / загуба
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматично композира съобщение при представяне на сделките.
 DocType: Production Order,Item To Manufacture,Точка за производство
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статут е {2}
@@ -693,7 +699,7 @@
 DocType: Sales Order Item,Projected Qty,Прогнозно Количество
 DocType: Sales Invoice,Payment Due Date,Дължимото плащане Дата
 DocType: Newsletter,Newsletter Manager,Newsletter мениджъра
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Позиция Variant {0} вече съществува с едни и същи атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Позиция Variant {0} вече съществува с едни и същи атрибути
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',"""Начален баланс"""
 DocType: Notification Control,Delivery Note Message,Бележка за доставка на ЛС
 DocType: Expense Claim,Expenses,Разходи
@@ -703,7 +709,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Research &amp; развитие
 ,Amount to Bill,Сума за Bill
 DocType: Company,Registration Details,Регистрация Детайли
-DocType: Item,Re-Order Qty,Re-Поръчка Количество
+DocType: Item Reorder,Re-Order Qty,Re-Поръчка Количество
 DocType: Leave Block List Date,Leave Block List Date,Оставете Block List Дата
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Планирана да изпрати на {0}
 DocType: Pricing Rule,Price or Discount,Цена или Discount
@@ -746,7 +752,7 @@
 DocType: Bank Reconciliation,Total Amount,Обща Сума
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Производствени поръчки
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Балансова стойност
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Балансова стойност
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Продажби Ценоразпис
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,"Публикуване, за да синхронизирате елементи"
 DocType: Bank Reconciliation,Account Currency,Сметка на валути
@@ -755,7 +761,7 @@
 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 +538,Item Variants {0} updated,Позиция Варианти {0} актуализиран
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,Позиция Варианти {0} актуализиран
 DocType: Quality Inspection Reading,Reading 6,Четене 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Фактурата за покупка Advance
 DocType: Address,Shop,Магазин
@@ -832,7 +838,7 @@
 DocType: POS Profile,Cash/Bank Account,Cash / Bank Account
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Премахнати артикули с никаква промяна в количеството или стойността.
 DocType: Delivery Note,Delivery To,Доставка до
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,Умение маса е задължително
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Отстъпка
@@ -860,7 +866,7 @@
 DocType: Tax Rule,Shipping State,Доставка членка
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Т трябва да се добавят с помощта на &quot;получават от покупка Приходи&quot; бутона
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Продажби Разходи
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Standard Изкупуването
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Standard Изкупуването
 DocType: GL Entry,Against,Срещу
 DocType: Item,Default Selling Cost Center,Default Selling Cost Center
 DocType: Sales Partner,Implementation Partner,Партньор за изпълнение
@@ -902,7 +908,7 @@
 DocType: Sales Partner,Distributor,Разпределител
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Количка Доставка Правило
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,Производство Поръчка {0} трябва да се отмени преди анулира тази поръчка за продажба
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',"Моля, задайте &quot;Прилагане Допълнителна отстъпка от &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',"Моля, задайте &quot;Прилагане Допълнителна отстъпка от &#39;"
 ,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 и подадем да създадете нов фактурата за продажба.
@@ -970,9 +976,9 @@
 DocType: Contact,User ID,User ID
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Виж Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Най-ранната
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group","Артикул Group съществува със същото име, моля да промените името на елемент или преименувате група т"
 DocType: Production Order,Manufacture against Sales Order,Производство срещу Продажби Поръчка
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Останалата част от света
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,Брутно възнаграждение
@@ -1002,7 +1008,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Съжаляваме, компаниите не могат да бъдат слети"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Съжаляваме, компаниите не могат да бъдат слети"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Малък
 DocType: Employee,Employee Number,Брой на служителите
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Дело Номер (а) вече са в употреба. Опитайте от Case Не {0}
@@ -1021,7 +1027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Земеделие
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Вашите продукти или услуги
 DocType: Mode of Payment,Mode of Payment,Начин на плащане
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Сайт на снимката трябва да бъде държавна файл или уеб сайт URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Сайт на снимката трябва да бъде държавна файл или уеб сайт URL
 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,Склад Информация за контакт
@@ -1093,6 +1099,7 @@
 DocType: Address,Utilities,Комунални услуги
 DocType: Purchase Invoice Item,Accounting,Счетоводство
 DocType: Features Setup,Features Setup,Удобства Setup
+DocType: Item,Is Service Item,Дали Service Точка
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Срок за кандидатстване не може да бъде извън отпуск период на разпределение
 DocType: Activity Cost,Projects,Проекти
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Моля изберете фискална година
@@ -1123,7 +1130,7 @@
 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 +465,cannot be greater than 100,не може да бъде по-голяма от 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,"Точка {0} не е в наличност, т"
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1182,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Правителство
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Елемент Варианти
 DocType: Company,Services,Услуги
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Общо ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Общо ({0})
 DocType: Cost Center,Parent Cost Center,Родител Cost Center
 DocType: Sales Invoice,Source,Източник
 DocType: Leave Type,Is Leave Without Pay,Дали си тръгне без Pay
@@ -1255,17 +1262,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Повторно изпращане на плащане Email
 DocType: Dependent Task,Dependent Task,Зависим Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},Разрешение за типа {0} не може да бъде по-дълъг от {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,Консумирана Сума
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Изглед
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Нетна промяна в Cash
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Нетна промяна в Cash
 DocType: Salary Structure Deduction,Salary Structure Deduction,Структура Заплата Приспадане
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Мерна единица {0} е въведен повече от веднъж в реализациите Factor Таблица
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Мерна единица {0} е въведен повече от веднъж в реализациите Factor Таблица
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Вече съществува Payment Request {0}
 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 +182,Quantity must not be more than {0},Количество не трябва да бъде повече от {0}
@@ -1327,7 +1334,7 @@
 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: Packed Item,To Warehouse (Optional),За да Warehouse (по избор)
 DocType: Sales Invoice,Paid Amount (Company Currency),Платената сума (Company валути)
 DocType: Purchase Invoice,Additional Discount,Допълнителна отстъпка
 DocType: Selling Settings,Selling Settings,Продаваме Settings
@@ -1336,7 +1343,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Фирма, Месец и фискална година е задължително"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Разходите за маркетинг
 ,Item Shortage Report,Позиция Недостиг Доклад
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тегло се споменава, \ nМоля спомена &quot;Тегло мерна единица&quot; твърде"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тегло се споменава, \ nМоля спомена &quot;Тегло мерна единица&quot; твърде"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Материал Заявка използва за направата на този запас Влизане
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Единична единица на дадена позиция.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Време Log Партида {0} трябва да бъде &quot;Изпратен&quot;
@@ -1347,6 +1354,7 @@
 DocType: Employee,Date Of Retirement,Дата на пенсиониране
 DocType: Upload Attendance,Get Template,Вземи Template
 DocType: Address,Postal,Пощенски
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 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 Група Клиенти съществува със същото име моля, променете името на Клиента или преименувайте Група Клиенти"
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Моля изберете {0} на първо място.
@@ -1375,12 +1383,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Твърде много колони. Износ на доклада и да го отпечатате с помощта на приложение за електронни таблици.
 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 +139,Main,Основен
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Основен
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Вариант
 DocType: Naming Series,Set prefix for numbering series on your transactions,Определете префикс за номериране серия от вашите сделки
 DocType: Employee Attendance Tool,Employees HTML,Служители на HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,"Спряно за да не могат да бъдат отменени. Отпуши, за да отмените."
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) трябва да бъде активен за тази позиция или си шаблон
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,Варианти
@@ -1405,7 +1413,6 @@
 DocType: Sales Order,To Deliver and Bill,Да се доставят и Bill
 DocType: GL Entry,Credit Amount in Account Currency,Credit Сума в Account валути
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Час Logs за производство.
-DocType: Item,Apply Warehouse-wise Reorder Level,Нанесете Warehouse-мъдър Пренареждане Level
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} трябва да бъде представено
 DocType: Authorization Control,Authorization Control,Разрешение Control
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: отхвърля Warehouse е задължително срещу отхвърли т {1}
@@ -1503,6 +1510,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,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}: Операция {1} не е завършен за {2} Количество на готовата продукция в производствена поръчка # {3}. Моля Статусът на работа чрез Час Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Инвестиции
 DocType: Issue,Resolution Details,Резолюция Детайли
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Разпределянето
 DocType: Quality Inspection Reading,Acceptance Criteria,Критерии За Приемане
 DocType: Item Attribute,Attribute Name,Име на атрибута
 DocType: Item Group,Show In Website,Покажи В Website
@@ -1553,7 +1561,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense претенция изчаква одобрение. Само за сметка одобряващ да актуализирате състоянието.
 DocType: Purchase Invoice,Additional Discount Amount,Допълнителна отстъпка сума
 DocType: Leave Block List Allow,Leave Block List Allow,Оставете Block List Позволете
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Съкращение не може да бъде празно или интервал
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Съкращение не може да бъде празно или интервал
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Група за Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спортен
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Общо Край
@@ -1594,7 +1602,7 @@
 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**.,** Фискална година ** представлява финансова година. Всички счетоводни записвания и други големи сделки се проследяват срещу ** Фискална година **.
 DocType: Opportunity,Customer / Lead Address,Клиент / Lead Адрес
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Внимание: Invalid сертификат SSL за закрепване {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Внимание: Invalid сертификат SSL за закрепване {0}
 DocType: Production Order Operation,Actual Operation Time,Действително време за операцията
 DocType: Authorization Rule,Applicable To (User),Приложими по отношение на (User)
 DocType: Purchase Taxes and Charges,Deduct,Приспада
@@ -1743,7 +1751,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case No. не може да бъде 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,Ако имате екип по продажбите и продажбата Partners (партньорите) те могат да бъдат маркирани и поддържа техния принос в дейността на продажбите
 DocType: Item,Show a slideshow at the top of the page,Покажи на слайдшоу в горната част на страницата
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Магазини
+DocType: Item,"Allow in Sales Order of type ""Service""",Оставя в продажбите на поръчката от тип &quot;услуга&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Магазини
 DocType: Time Log,Projects Manager,Мениджър Проекти
 DocType: Serial No,Delivery Time,Време За Доставка
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Застаряването на населението на базата на
@@ -1768,7 +1777,7 @@
 ,Financial Analytics,Финансови Analytics
 DocType: Quality Inspection,Verified By,Проверени от
 DocType: Address,Subsidiary,Филиал
-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.","Не може да се промени валута по подразбиране на фирмата, защото има съществуващи сделки. Сделките трябва да бъдат отменени, за да промените валута по подразбиране."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Не може да се промени валута по подразбиране на фирмата, защото има съществуващи сделки. Сделките трябва да бъдат отменени, за да промените валута по подразбиране."
 DocType: Quality Inspection,Purchase Receipt No,Покупка Квитанция Не
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Задатък
 DocType: Process Payroll,Create Salary Slip,Създайте Заплата Slip
@@ -1816,7 +1825,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,"Суровини, които не могат да бъдат празни."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Не можа да се актуализира склад, фактура съдържа капка корабоплаването т."
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'","Тъй като има съществуващи сделки борсови за тази позиция, \ не можете да промените стойностите на &#39;има сериен номер &quot;,&quot; Има Batch Не &quot;,&quot; Трябва ли Фондова т &quot;и&quot; Метод на оценка &quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick вестник Влизане
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Вие не можете да променяте скоростта, ако BOM споменато agianst всеки елемент"
@@ -1905,7 +1914,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Моля Бележка за доставка първа
 DocType: Purchase Invoice,Currency and Price List,Валута и ценова листа
 DocType: Opportunity,Customer / Lead Name,Клиент / Lead Име
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Клирънсът Дата които не са споменати
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Клирънсът Дата които не са споменати
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Производство
 DocType: Item,Allow Production Order,Оставя производствена поръчка
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Началната дата трябва да е преди крайната дата
@@ -1915,7 +1924,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,Общо Приходи
 DocType: Purchase Receipt,Time at which materials were received,При която бяха получени материали Time
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,Моите адреси
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Моите адреси
 DocType: Stock Ledger Entry,Outgoing Rate,Изходящ Курсове
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Браншова организация майстор.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,или
@@ -1984,7 +1993,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Управление Customer Group Tree.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,New Cost Center Име
 DocType: Leave Control Panel,Leave Control Panel,Оставете Control Panel
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"Не подразбиране Адрес Template намерен. Моля, създайте нов от Setup&gt; Печат и Branding&gt; Адрес Template."
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"Не подразбиране Адрес Template намерен. Моля, създайте нов от Setup&gt; Печат и Branding&gt; Адрес Template."
 DocType: Appraisal,HR User,HR потребителя
 DocType: Purchase Invoice,Taxes and Charges Deducted,"Данъци и такси, удържани"
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Въпроси
@@ -2001,7 +2010,7 @@
 ,Sales Browser,Продажбите Browser
 DocType: Journal Entry,Total Credit,Общ кредит
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Съществува Друг {0} # {1} срещу входната запас {2}: Предупреждение
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Местен
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Голям
@@ -2020,7 +2029,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Всички продажби Сделки могат да бъдат маркирани с множество ** продавачи **, така че можете да настроите и да наблюдават цели."
 ,S.O. No.,SO No.
 DocType: Production Order Operation,Make Time Log,Направи Time Log
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,"Моля, задайте повторна поръчка количество"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},"Моля, създайте Customer от Lead {0}"
 DocType: Price List,Applicable for Countries,Приложимо за Държави
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Компютри
@@ -2095,7 +2103,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Вземете съответните вписвания
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Счетоводен запис за Складова аличност
 DocType: Sales Invoice,Sales Team1,Продажбите Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Точка {0} не съществува
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Точка {0} не съществува
 DocType: Sales Invoice,Customer Address,Customer Адрес
 DocType: Payment Request,Recipient and Message,Получател и ЛС
 DocType: Purchase Invoice,Apply Additional Discount On,Нанесете Допълнителна отстъпка от
@@ -2137,7 +2145,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Оценка Оценка
 apps/erpnext/erpnext/stock/get_item_details.py +274,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} не съществува в таблицата по-горе &quot;Покупка Приходи&quot;
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,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 +155,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
@@ -2175,7 +2183,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Моля, въведете облекчаване дата."
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Оставете само заявления, със статут на &quot;Одобрена&quot; може да бъде подадено"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Заглавие на Адрес е задължително.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Заглавие на Адрес е задължително.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Въведете името на кампанията, ако източник на запитване е кампания"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Издателите на вестници
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Изберете фискална година
@@ -2199,6 +2207,7 @@
 DocType: UOM,Must be Whole Number,Трябва да е цяло число
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нови листа Отпуснати (в дни)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Пореден № {0} не съществува
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Склад на клиенти (по избор)
 DocType: Pricing Rule,Discount Percentage,Отстъпка Процент
 DocType: Payment Reconciliation Invoice,Invoice Number,Номер на фактура
 apps/erpnext/erpnext/hooks.py +55,Orders,Заповеди
@@ -2308,7 +2317,7 @@
 DocType: Appraisal,Appraisal,Оценка
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Дата се повтаря
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Оторизиран подписалите
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},Оставете одобряващ трябва да бъде един от {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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,Начален Час
@@ -2477,7 +2486,7 @@
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Сменете Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Държава мъдър адрес по подразбиране Templates
 DocType: Sales Order Item,Supplier delivers to Customer,Доставчик доставя на Клиента
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Покажи данък разпадането
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Покажи данък разпадането
 apps/erpnext/erpnext/accounts/party.py +283,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',Ако включат в производствената активност. Активира т &quot;се произвежда&quot;
@@ -2526,7 +2535,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,"Моля име повторно вид фирма, за да потвърдите"
@@ -2553,8 +2562,6 @@
 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,Дата на Присъединяване трябва да е по-голяма от Дата на раждане
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Структура Заплата
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"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/setup_wizard/industry_type.py +9,Airline,Авиолиния
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Материал Issue
@@ -2579,7 +2586,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Ценни книжа и стоковите борси
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default мерната единица за Variant &#39;{0}&#39; трябва да бъде същото, както в Template &quot;{1}&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default мерната единица за Variant &#39;{0}&#39; трябва да бъде същото, както в Template &quot;{1}&quot;"
 DocType: Shipping Rule,Calculate Based On,Изчислете основава на
 DocType: Delivery Note Item,From Warehouse,От Warehouse
 DocType: Purchase Taxes and Charges,Valuation and Total,Оценка и Total
@@ -2588,7 +2595,7 @@
 DocType: Account,Purchase User,Покупка на потребителя
 DocType: Notification Control,Customize the Notification,Персонализиране на Notification
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Парични потоци от операции
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Default Адрес Template не може да бъде изтрита
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Default Адрес Template не може да бъде изтрита
 DocType: Sales Invoice,Shipping Rule,Доставка Правило
 DocType: Manufacturer,Limited to 12 characters,Ограничено до 12 символа
 DocType: Journal Entry,Print Heading,Print Heading
@@ -2681,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,Търговски
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Яки Услуги
@@ -2700,7 +2707,7 @@
 DocType: Customer,Default Receivable Accounts,По подразбиране вземания Accounts
 DocType: Tax Rule,Billing State,Billing членка
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Прехвърляне
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Изважда се взриви BOM (включително монтажните възли)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),Изважда се взриви BOM (включително монтажните възли)
 DocType: Authorization Rule,Applicable To (Employee),Приложими по отношение на (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,Поради Дата е задължително
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Увеличаване на Умение {0} не може да бъде 0
@@ -2733,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Отрицателна оценка процент не е позволено
 DocType: Holiday List,Weekly Off,Седмичен Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Защото например 2012, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Временна печалба / загуба (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Временна печалба / загуба (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Върнете Срещу фактурата за продажба
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Позиция 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},"Моля, задайте стойност по подразбиране {0} в Company {1}"
@@ -2764,6 +2771,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Добави Поделемент
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Роля позволено да определят замразени сметки &amp; Редактиране на замразени влизания
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Не може да конвертирате Cost Center да Леджър, тъй като има дете възли"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Откриване Value
 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,Комисията за покупко-продажба
 DocType: Offer Letter Term,Value / Description,Стойност / Описание
@@ -2797,7 +2805,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,"Успешно заличава всички транзакции, свързани с тази компания!"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Както по Дата
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Изпитание
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,"Default Warehouse е задължително за склад, т."
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Изплащането на заплатите за месец {0} и година {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto вложка Ценоразпис ставка, ако липсва"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Общо платената сума
@@ -2833,7 +2840,7 @@
 DocType: Payment Tool,Set Matching Amounts,Задайте съвпадение Суми
 DocType: Purchase Invoice,Taxes and Charges Added,Данъци и такси Добавен
 ,Sales Funnel,Продажбите на фунията
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Съкращение е задължително
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Съкращение е задължително
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Благодарим ви за проявения интерес към абонирате за нашите новини
 ,Qty to Transfer,Количество да Трансфер
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Цитати на потенциални клиенти или клиенти.
@@ -2861,7 +2868,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,Доставчик оферта
 DocType: Quotation,In Words will be visible once you save the Quotation.,По думите ще бъде видим след като спаси цитата.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} е спрян
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Barcode {0} вече се използва в т {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Предстоящи събития
@@ -2883,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Изберете фискална година ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS профил изисква да направи POS Влизане
 DocType: Hub Settings,Name Token,Име Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Standard Selling
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Поне един склад е задължително
 DocType: Serial No,Out of Warranty,Извън гаранция
 DocType: BOM Replace Tool,Replace,Заменете
@@ -3006,7 +3013,7 @@
 DocType: Sales Invoice,Paid Amount,Платената сума
 ,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,"Настройването на тази Адрес Шаблон по подразбиране, тъй като няма друг случай на неизпълнение"
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,"Настройването на тази Адрес Шаблон по подразбиране, тъй като няма друг случай на неизпълнение"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Управление на качеството
 DocType: Production Planning Tool,Filter based on customer,Филтър на базата на клиент
@@ -3107,7 +3114,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","За да зададете тази фискална година, като по подразбиране, щракнете върху &quot;По подразбиране&quot;"
 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 +19,Shortage Qty,Недостиг Количество
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
 DocType: Salary Slip,Salary Slip,Заплата Slip
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""До дата"" се изисква"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Генериране на товарителници за пакети трябва да бъдат доставени. Използва се за уведомяване на пакетите номер, съдържание на пакети и теглото му."
@@ -3118,7 +3125,7 @@
 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.","Когато някоя от проверени сделките се &quot;Изпратен&quot;, имейл изскачащ автоматично отваря, за да изпратите електронно писмо до свързаната с &quot;контакт&quot; в тази сделка, със сделката като прикачен файл. Потребителят може или не може да изпрати имейл."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Global Settings
 DocType: Employee Education,Employee Education,Служител Образование
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,"Той е необходим, за да донесе точка Details."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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} вече е получил
@@ -3144,6 +3151,7 @@
 DocType: BOM,Manufacturing User,Производство на потребителя
 DocType: Purchase Order,Raw Materials Supplied,"Сурови материали, доставени"
 DocType: Purchase Invoice,Recurring Print Format,Повтарящо Print Format
+DocType: C-Form,Series,Серия
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,Очаквана дата на доставка не може да бъде преди поръчка Дата
 DocType: Appraisal,Appraisal Template,Оценка Template
 DocType: Item Group,Item Classification,Позиция Класификация
@@ -3219,7 +3227,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Един запис Пренареждане вече съществува за този склад {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.","Не може да се декларира като изгубена, защото цитата е направено."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Покупка Майстор на мениджъра
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Производство Поръчка {0} трябва да бъде представено
@@ -3227,7 +3235,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Основните доклади
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Към днешна дата не може да бъде преди от дата
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Добавяне / Редактиране на цените
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Моите поръчки
@@ -3275,7 +3283,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Row # {0}: Определете доставчик за т {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,"Сайт на снимката {0}, прикрепена към т {1} не може да бъде намерена"
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,"Сайт на снимката {0}, прикрепена към т {1} не може да бъде намерена"
 DocType: Issue,Content Type,Content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Компютър
 DocType: Item,List this Item in multiple groups on the website.,Списък този продукт в няколко групи в сайта.
@@ -3289,7 +3297,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,'Има сериен номер' не може да бъде 'Да' за нескладируеми стоки
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'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,Главна Сметка
@@ -3315,7 +3323,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Закриване на профила {0} трябва да е от тип Отговорност / Equity
 DocType: Authorization Rule,Based On,Базиран На
 DocType: Sales Order Item,Ordered Qty,Поръчано Количество
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Точка {0} е деактивиран
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Точка {0} е деактивиран
 DocType: Stock Settings,Stock Frozen Upto,Фондова Frozen Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},"Период От и периода, за датите задължителни за повтарящи {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Дейността на проект / задача.
@@ -3323,7 +3331,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Изкупуването трябва да се провери, ако има такива се избира като {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Отстъпка трябва да е по-малко от 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Напиши Off Сума (Company валути)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,"Row # {0}: Моля, задайте повторна поръчка количество"
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,"Row # {0}: Моля, задайте повторна поръчка количество"
 DocType: Landed Cost Voucher,Landed Cost Voucher,Поземлен Cost Ваучер
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Моля, задайте {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Повторете в Деня на Месец
@@ -3395,7 +3403,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Вижте сега
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Изберете периода, когато фактурата ще бъде генериран автоматично"
 DocType: BOM,Raw Material Cost,Разходи за суровини
-DocType: Item,Re-Order Level,Re-Поръчка Level
+DocType: Item Reorder,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.,"Въведете предмети и планирано Количество, за които искате да се повиши производствените поръчки или да изтеглите суровини за анализ."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Непълен работен ден
 DocType: Employee,Applicable Holiday List,Приложимо Holiday Списък
@@ -3450,7 +3458,7 @@
 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 +573,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3529,7 +3537,7 @@
 DocType: Address,Office,Офис
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Счетоводни вписвания в дневник.
 DocType: Delivery Note Item,Available Qty at From Warehouse,В наличност Количество в От Warehouse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Моля изберете Record Employee първия.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,Моля изберете Record Employee първия.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,"Моля, въведете Expense Account"
@@ -3604,7 +3612,7 @@
 DocType: Item Attribute,Numeric Values,Числови стойности
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Прикрепете Logo
 DocType: Customer,Commission Rate,Комисията Курсове
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Направи Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Направи Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Заявленията за отпуск блок на отдел.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Количката е празна
 DocType: Production Order,Actual Operating Cost,Действителни оперативни разходи
@@ -3621,15 +3629,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item","За да зададете ниво на повторна поръчка, т трябва да бъде покупка или производство Точка Точка"
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),(Половин ден)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(Половин ден)
 DocType: Supplier,Credit Days,Кредитните Days
 DocType: Leave Type,Is Carry Forward,Дали Пренасяне
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Получават от BOM
diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv
index 9856926..538cffc 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% দেখানো হয়েছিল
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),এক্সচেঞ্জ রেট হিসাবে একই হতে হবে {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ক্রেতার নাম
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},ব্যাংক অ্যাকাউন্ট হিসেবে নামকরণ করা যাবে না {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},ব্যাংক অ্যাকাউন্ট হিসেবে নামকরণ করা যাবে না {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),বিশিষ্ট {0} হতে পারে না শূন্য কম ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,নিউ ছুটি আবেদন
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,নিউ ছুটি আবেদন
 apps/erpnext/erpnext/setup/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,পেমেন্ট একাউন্ট এর মোড
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","ক্রিয়াকলাপ এর লগ, বিলিং সময় ট্র্যাকিং জন্য ব্যবহার করা যেতে পারে যে কার্য বিরুদ্ধে ব্যবহারকারীদের দ্বারা সঞ্চালিত."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},নতুন {0}: # {1}
 ,Sales Partners Commission,সেলস পার্টনার্স কমিশন
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,অধিক 5 অক্ষর থাকতে পারে না সমাহার
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,অধিক 5 অক্ষর থাকতে পারে না সমাহার
 DocType: Payment Request,Payment Request,পরিশোধের অনুরোধ
 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.",মূল্য {0} {1} আইটেম হিসাবে রুপভেদ \ থেকে মুছে ফেলা যাবে না গুন এই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান.
@@ -195,6 +195,7 @@
 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 (%),মূল্য তালিকা রেট বাট্টা (%)
 DocType: Offer Letter,Select Terms and Conditions,নির্বাচন শর্তাবলী
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,আউট মূল্য
 DocType: Production Planning Tool,Sales Orders,বিক্রয় আদেশ
 DocType: Purchase Taxes and Charges,Valuation,মাননির্ণয়
 ,Purchase Order Trends,অর্ডার প্রবণতা ক্রয়
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,টিভি
 DocType: Production Order Operation,Updated via 'Time Log',&#39;টাইম ইন&#39; র মাধ্যমে আপডেট
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},অ্যাকাউন্ট {0} কোম্পানি অন্তর্গত নয় {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},অগ্রিম পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0} {1}
 DocType: Naming Series,Series List for this Transaction,এই লেনদেনে সিরিজ তালিকা
 DocType: Sales Invoice,Is Opening Entry,এন্ট্রি খোলা হয়
 DocType: Customer Group,Mention if non-standard receivable account applicable,উল্লেখ অ স্ট্যান্ডার্ড প্রাপ্য যদি প্রযোজ্য
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,উপরে উল্লিখিত মানদণ্ড জন্য বেতন স্লিপ তৈরি করা হয়.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,দেওয়া কোন বিবরণ
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,কেনার জন্য অনুরোধ জানান.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,শুধু নির্বাচিত ছুটি রাজসাক্ষী এই ছুটি আবেদন জমা দিতে পারেন
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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} সেটআপ&gt; সেটিংস মাধ্যমে&gt; নামকরণ সিরিজ জন্য সিরিজ নামকরণ সেট করুন
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},{0} ওয়্যারহাউস কোম্পানি অন্তর্গত নয় {1}
 DocType: Item Website Specification,Item Website Specification,আইটেম ওয়েবসাইট স্পেসিফিকেশন
 DocType: Payment Tool,Reference No,রেফারেন্স কোন
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,ত্যাগ অবরুদ্ধ
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,ত্যাগ অবরুদ্ধ
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,বার্ষিক
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,শেয়ার রিকনসিলিয়েশন আইটেম
 DocType: Stock Entry,Sales Invoice No,বিক্রয় চালান কোন
@@ -248,7 +250,7 @@
 DocType: Pricing Rule,Supplier Type,সরবরাহকারী ধরন
 DocType: Item,Publish in Hub,হাব প্রকাশ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,উপাদানের জন্য অনুরোধ
 DocType: Bank Reconciliation,Update Clearance Date,আপডেট পরিস্কারের তারিখ
 DocType: Item,Purchase Details,ক্রয় বিবরণ
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,চালান পত্র
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,করের আপ সেট
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,আপনি এটি টানা পরে পেমেন্ট ভুক্তি নথীটি পরিবর্তিত হয়েছে. আবার এটি টান করুন.
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} আইটেম ট্যাক্স দুইবার প্রবেশ
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,মাস এবং বছর নির্বাচন করুন
@@ -327,7 +329,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,আপনার ইমেইল ঠিকানা
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,অনুগ্রহ পূর্বক সংযুক্তি দেখুন
 DocType: Purchase Order,% Received,% গৃহীত
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,সেটআপ ইতিমধ্যে সম্পূর্ণ !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,সেটআপ ইতিমধ্যে সম্পূর্ণ !!
 ,Finished Goods,সমাপ্ত পণ্য
 DocType: Delivery Note,Instructions,নির্দেশনা
 DocType: Quality Inspection,Inspected By,পরিদর্শন
@@ -352,14 +354,13 @@
 ,Purchase Register,ক্রয় নিবন্ধন
 DocType: Landed Cost Item,Applicable Charges,চার্জ প্রযোজ্য
 DocType: Workstation,Consumable Cost,Consumable খরচ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ভূমিকা থাকতে হবে &#39;ছুটি রাজসাক্ষী&#39;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ভূমিকা থাকতে হবে &#39;ছুটি রাজসাক্ষী&#39;
 DocType: Purchase Receipt,Vehicle Date,যানবাহন তারিখ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,মেডিকেল
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,হারানোর জন্য কারণ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},ওয়ার্কস্টেশন ছুটির তালিকা অনুযায়ী নিম্নলিখিত তারিখগুলি উপর বন্ধ করা হয়: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,সুযোগ
 DocType: Employee,Single,একক
-DocType: Issue,Attachment,ক্রোক
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,বাজেট গ্রুপ খরচ কেন্দ্র স্থাপন করা যাবে না
 DocType: Account,Cost of Goods Sold,বিক্রি সামগ্রীর খরচ
 DocType: Purchase Invoice,Yearly,বাত্সরিক
@@ -388,7 +389,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
 DocType: HR Settings,Employee record is created using selected field. ,কর্মচারী রেকর্ড নির্বাচিত ক্ষেত্র ব্যবহার করে নির্মিত হয়.
 DocType: Sales Order,Not Applicable,প্রযোজ্য নয়
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,হলিডে মাস্টার.
@@ -427,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,অঙ্গরাগ
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items",মার্জ করার জন্য নিম্নলিখিত বৈশিষ্ট্য উভয় আইটেম জন্য একই হতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items",মার্জ করার জন্য নিম্নলিখিত বৈশিষ্ট্য উভয় আইটেম জন্য একই হতে হবে
 DocType: Shipping Rule,Net Weight,প্রকৃত ওজন
 DocType: Employee,Emergency Phone,জরুরী ফোন
 ,Serial No Warranty Expiry,সিরিয়াল কোন পাটা মেয়াদ উত্তীর্ন
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,ম্যানেজিং প্রণীত
 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,হারে যা মূল্যতালিকা মুদ্রার এ কোম্পানির বেস কারেন্সি রূপান্তরিত হয়
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},{0} অ্যাকাউন্ট কোম্পানি অন্তর্গত নয়: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},{0} অ্যাকাউন্ট কোম্পানি অন্তর্গত নয়: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,সমাহার ইতিমধ্যে অন্য কোম্পানীর জন্য ব্যবহৃত
 DocType: Selling Settings,Default Customer Group,ডিফল্ট গ্রাহক গ্রুপ
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","অক্ষম করলে, &#39;গোলাকৃতি মোট&#39; ক্ষেত্রের কোনো লেনদেনে দৃশ্যমান হবে না"
 DocType: BOM,Operating Cost,পরিচালনা খরচ
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,চালান টেবিল অন্তর্ভুক্ত কোন রেকর্ড
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,প্রথম কোম্পানি ও অনুষ্ঠান প্রকার নির্বাচন করুন
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,আর্থিক / অ্যাকাউন্টিং বছর.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,সঞ্চিত মূল্যবোধ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","দুঃখিত, সিরিয়াল আমরা মার্জ করা যাবে না"
 DocType: Project Task,Project Task,প্রকল্প টাস্ক
 ,Lead Id,লিড আইডি
@@ -492,7 +495,7 @@
 DocType: Quotation,Quotation To,উদ্ধৃতি
 DocType: Lead,Middle Income,মধ্য আয়
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),খোলা (যোগাযোগ Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,আপনি ইতিমধ্যে অন্য UOM সঙ্গে কিছু লেনদেন (গুলি) করেছেন কারণ আইটেম জন্য মেজার ডিফল্ট ইউনিট {0} সরাসরি পরিবর্তন করা যাবে না. আপনি একটি ভিন্ন ডিফল্ট UOM ব্যবহার করার জন্য একটি নতুন আইটেম তৈরি করতে হবে.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,আপনি ইতিমধ্যে অন্য UOM সঙ্গে কিছু লেনদেন (গুলি) করেছেন কারণ আইটেম জন্য মেজার ডিফল্ট ইউনিট {0} সরাসরি পরিবর্তন করা যাবে না. আপনি একটি ভিন্ন ডিফল্ট UOM ব্যবহার করার জন্য একটি নতুন আইটেম তৈরি করতে হবে.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,বরাদ্দ পরিমাণ নেতিবাচক হতে পারে না
 DocType: Purchase Order Item,Billed Amt,দেখানো হয়েছিল মাসিক
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,শেয়ার এন্ট্রি তৈরি করা হয় যার বিরুদ্ধে একটি লজিক্যাল ওয়্যারহাউস.
@@ -570,7 +573,7 @@
 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 +543,Item has variants.,আইটেম ভিন্নতা আছে.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,বৃক্ষ ধরন
@@ -583,6 +586,7 @@
 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 +33,Goods received from Suppliers.,পণ্য সরবরাহকারী থেকে প্রাপ্ত.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,মান
 DocType: Lead,Campaign Name,প্রচারাভিযান নাম
 ,Reserved,সংরক্ষিত
 DocType: Purchase Order,Supply Raw Materials,সাপ্লাই কাঁচামালের
@@ -597,16 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,বিদ্যমান লেনদেনের সঙ্গে অ্যাকাউন্ট লেজার রূপান্তরিত করা যাবে না
 DocType: Delivery Note,Customer's Purchase Order No,গ্রাহকের ক্রয় আদেশ কোন
 DocType: Employee,Cell Number,মোবাইল নম্বর
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,অটো উপাদান অনুরোধ উত্পন্ন
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,অটো উপাদান অনুরোধ উত্পন্ন
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,নষ্ট
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,আপনি কলাম &#39;জার্নাল এন্ট্রি বিরুদ্ধে&#39; বর্তমান ভাউচার লিখতে পারবেন না
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,শক্তি
 DocType: Opportunity,Opportunity From,থেকে সুযোগ
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,মাসিক বেতন বিবৃতি.
 DocType: Item Group,Website Specifications,ওয়েবসাইট উল্লেখ
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},আপনার ঠিকানা টেমপ্লেট মধ্যে একটি ত্রুটি আছে {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,নতুন একাউন্ট
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: টাইপ {1} এর {0} থেকে
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,সারি {0}: রূপান্তর ফ্যাক্টর বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","একাধিক দাম বিধি একই মানদণ্ড সঙ্গে বিদ্যমান, অগ্রাধিকার বরাদ্দ করে সংঘাত সমাধান করুন. দাম নিয়মাবলী: {0}"
 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.,হিসাব থেকে পাতার নোড বিরুদ্ধে তৈরি করা যেতে পারে. দলের বিরুদ্ধে সাজপোশাকটি অনুমতি দেওয়া হয় না.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,নিষ্ক্রিয় অথবা অন্য BOMs সাথে সংযুক্ত করা হয় হিসাবে BOM বাতিল করতে পারেন না
 DocType: Opportunity,Maintenance,রক্ষণাবেক্ষণ
@@ -649,7 +655,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,মূল্যতালিকা নির্বাচিত না
 DocType: Employee,Family Background,পারিবারিক ইতিহাস
 DocType: Process Payroll,Send Email,বার্তা পাঠাও
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},সতর্কবাণী: অবৈধ সংযুক্তি {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},সতর্কবাণী: অবৈধ সংযুক্তি {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,অনুমতি নেই
 DocType: Company,Default Bank Account,ডিফল্ট ব্যাঙ্ক অ্যাকাউন্ট
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","পার্টি উপর ভিত্তি করে ফিল্টার করুন, নির্বাচন পার্টি প্রথম টাইপ"
@@ -679,13 +685,13 @@
 DocType: Production Planning Tool,Select Items,আইটেম নির্বাচন করুন
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} বিল বিরুদ্ধে {1} তারিখের {2}
 DocType: Maintenance Visit,Completion Status,শেষ অবস্থা
-DocType: Sales Invoice Item,Target Warehouse,উদ্দিষ্ট ওয়্যারহাউস
+DocType: Production Order,Target Warehouse,উদ্দিষ্ট ওয়্যারহাউস
 DocType: Item,Allow over delivery or receipt upto this percent,এই শতাংশ পর্যন্ত বিতরণ বা প্রাপ্তি ধরে মঞ্জুরি
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,প্রত্যাশিত প্রসবের তারিখ বিক্রয় আদেশ তারিখের আগে হতে পারে না
 DocType: Upload Attendance,Import Attendance,আমদানি এ্যাটেনডেন্স
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,সকল আইটেম গ্রুপ
 DocType: Process Payroll,Activity Log,কার্য বিবরণ
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,নিট লাভ / ক্ষতি
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,নিট লাভ / ক্ষতি
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,স্বয়ংক্রিয়ভাবে লেনদেন জমা বার্তা রচনা.
 DocType: Production Order,Item To Manufacture,আইটেম উত্পাদনপ্রণালী
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} অবস্থা {2} হয়
@@ -693,7 +699,7 @@
 DocType: Sales Order Item,Projected Qty,অভিক্ষিপ্ত Qty
 DocType: Sales Invoice,Payment Due Date,পরিশোধযোগ্য তারিখ
 DocType: Newsletter,Newsletter Manager,নিউজলেটার ম্যানেজার
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,আইটেম ভেরিয়েন্ট {0} ইতিমধ্যে একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,আইটেম ভেরিয়েন্ট {0} ইতিমধ্যে একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',' শুরু'
 DocType: Notification Control,Delivery Note Message,হুণ্ডি পাঠান
 DocType: Expense Claim,Expenses,খরচ
@@ -703,7 +709,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,গবেষণা ও উন্নয়ন
 ,Amount to Bill,বিল পরিমাণ
 DocType: Company,Registration Details,রেজিস্ট্রেশন বিস্তারিত
-DocType: Item,Re-Order Qty,পুনরায় আদেশ Qty
+DocType: Item Reorder,Re-Order Qty,পুনরায় আদেশ Qty
 DocType: Leave Block List Date,Leave Block List Date,ব্লক তালিকা তারিখ ত্যাগ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},পাঠাতে তফসিলি {0}
 DocType: Pricing Rule,Price or Discount,দাম বা ডিসকাউন্ট
@@ -746,7 +752,7 @@
 DocType: Bank Reconciliation,Total Amount,মোট পরিমাণ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,ইন্টারনেট প্রকাশনা
 DocType: Production Planning Tool,Production Orders,উত্পাদনের আদেশ
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,ব্যালেন্স মূল্য
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,ব্যালেন্স মূল্য
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,বিক্রয় মূল্য তালিকা
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,আইটেম সিঙ্ক প্রকাশ করুন
 DocType: Bank Reconciliation,Account Currency,অ্যাকাউন্ট মুদ্রা
@@ -755,7 +761,7 @@
 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 +538,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
 DocType: Quality Inspection Reading,Reading 6,6 পঠন
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,চালান অগ্রিম ক্রয়
 DocType: Address,Shop,দোকান
@@ -832,7 +838,7 @@
 DocType: POS Profile,Cash/Bank Account,নগদ / ব্যাংক অ্যাকাউন্ট
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,পরিমাণ বা মান কোন পরিবর্তনের সঙ্গে সরানো আইটেম.
 DocType: Delivery Note,Delivery To,বিতরণ
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,ডিসকাউন্ট
@@ -860,7 +866,7 @@
 DocType: Tax Rule,Shipping State,শিপিং রাজ্য
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,আইটেম বাটন &#39;ক্রয় রসিদ থেকে জানানোর পান&#39; ব্যবহার করে যোগ করা হবে
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,সেলস খরচ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,স্ট্যান্ডার্ড রাজধানীতে
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,স্ট্যান্ডার্ড রাজধানীতে
 DocType: GL Entry,Against,বিরুদ্ধে
 DocType: Item,Default Selling Cost Center,ডিফল্ট বিক্রি খরচ কেন্দ্র
 DocType: Sales Partner,Implementation Partner,বাস্তবায়ন অংশীদার
@@ -902,7 +908,7 @@
 DocType: Sales Partner,Distributor,পরিবেশক
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,শপিং কার্ট শিপিং রুল
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,উৎপাদন অর্ডার {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',সেট &#39;অতিরিক্ত ডিসকাউন্ট প্রযোজ্য&#39; দয়া করে
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',সেট &#39;অতিরিক্ত ডিসকাউন্ট প্রযোজ্য&#39; দয়া করে
 ,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.,সময় লগসমূহ নির্বাচন করুন এবং একটি নতুন বিক্রয় চালান তৈরি জমা দিন.
@@ -970,9 +976,9 @@
 DocType: Contact,User ID,ব্যবহারকারী আইডি
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,দেখুন লেজার
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,পুরনো
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group","একটি আইটেম গ্রুপ একই নামের সঙ্গে বিদ্যমান, আইটেমের নাম পরিবর্তন বা আইটেম গ্রুপ নামান্তর করুন"
 DocType: Production Order,Manufacture against Sales Order,সেলস আদেশের বিরুদ্ধে প্রস্তুত
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,বিশ্বের বাকি
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,গ্রস পে
@@ -1002,7 +1008,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","দুঃখিত, কোম্পানি মার্জ করা যাবে না"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","দুঃখিত, কোম্পানি মার্জ করা যাবে না"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,ছোট
 DocType: Employee,Employee Number,চাকুরিজীবী সংখ্যা
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},মামলা নং (গুলি) ইতিমধ্যে ব্যবহারে রয়েছে. মামলা নং থেকে কর {0}
@@ -1021,7 +1027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,কৃষি
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,আপনার পণ্য বা সেবা
 DocType: Mode of Payment,Mode of Payment,পেমেন্ট মোড
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,ওয়েবসাইট চিত্র একটি পাবলিক ফাইল বা ওয়েবসাইট URL হওয়া উচিত
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,ওয়েবসাইট চিত্র একটি পাবলিক ফাইল বা ওয়েবসাইট URL হওয়া উচিত
 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,ওয়ারহাউস যোগাযোগের তথ্য
@@ -1093,6 +1099,7 @@
 DocType: Address,Utilities,ইউটিলিটি
 DocType: Purchase Invoice Item,Accounting,হিসাবরক্ষণ
 DocType: Features Setup,Features Setup,বৈশিষ্ট্য সেটআপ
+DocType: Item,Is Service Item,পরিষেবা আইটেম
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,আবেদনের সময় বাইরে ছুটি বরাদ্দ সময়ের হতে পারে না
 DocType: Activity Cost,Projects,প্রকল্প
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,ফিস্ক্যাল বছর নির্বাচন করুন
@@ -1123,7 +1130,7 @@
 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 +465,cannot be greater than 100,এর চেয়ে বড় 100 হতে পারে না
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
 DocType: Maintenance Visit,Unscheduled,অনির্ধারিত
 DocType: Employee,Owned,মালিক
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,বিনা বেতনে ছুটি উপর নির্ভর করে
@@ -1182,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,সরকার
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,আইটেম রুপভেদ
 DocType: Company,Services,সেবা
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),মোট ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),মোট ({0})
 DocType: Cost Center,Parent Cost Center,মূল খরচ কেন্দ্র
 DocType: Sales Invoice,Source,উত্স
 DocType: Leave Type,Is Leave Without Pay,বিনা বেতনে ছুটি হয়
@@ -1255,17 +1262,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,পেমেন্ট ইমেইল পুনরায় পাঠান
 DocType: Dependent Task,Dependent Task,নির্ভরশীল কার্য
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},ধরনের ছুটি {0} চেয়ে বেশি হতে পারেনা {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,ক্ষয়প্রাপ্ত পরিমাণ
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} দেখুন
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,ক্যাশ মধ্যে নিট পরিবর্তন
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,ক্যাশ মধ্যে নিট পরিবর্তন
 DocType: Salary Structure Deduction,Salary Structure Deduction,বেতন কাঠামো সিদ্ধান্তগ্রহণ
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,মেজার {0} এর ইউনিট রূপান্তর ফ্যাক্টর ছক একাধিকবার প্রবেশ করানো হয়েছে
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,মেজার {0} এর ইউনিট রূপান্তর ফ্যাক্টর ছক একাধিকবার প্রবেশ করানো হয়েছে
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},পেমেন্ট অনুরোধ ইতিমধ্যেই বিদ্যমান {0}
 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 +182,Quantity must not be more than {0},পরিমাণ বেশী হবে না {0}
@@ -1327,7 +1334,7 @@
 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: Packed Item,To Warehouse (Optional),গুদাম থেকে (ঐচ্ছিক)
 DocType: Sales Invoice,Paid Amount (Company Currency),প্রদত্ত পরিমাণ (কোম্পানি একক)
 DocType: Purchase Invoice,Additional Discount,অতিরিক্ত ছাড়
 DocType: Selling Settings,Selling Settings,সেটিংস বিক্রি
@@ -1336,7 +1343,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","কোম্পানি, মাস এবং ফিস্ক্যাল বছর বাধ্যতামূলক"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,বিপণন খরচ
 ,Item Shortage Report,আইটেম পত্র
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ওজন \ n দয়া খুব &quot;ওজন UOM&quot; উল্লেখ, উল্লেখ করা হয়"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ওজন \ n দয়া খুব &quot;ওজন UOM&quot; উল্লেখ, উল্লেখ করা হয়"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,উপাদানের জন্য অনুরোধ এই স্টক এন্ট্রি করতে ব্যবহৃত
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,একটি আইটেম এর একক.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',টাইম ইন ব্যাচ {0} &#39;লগইন&#39; হতে হবে
@@ -1347,6 +1354,7 @@
 DocType: Employee,Date Of Retirement,অবসর তারিখ
 DocType: Upload Attendance,Get Template,টেমপ্লেট করুন
 DocType: Address,Postal,ঠিকানা
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext সেটআপ সম্পূর্ণ!
 DocType: Item,Weightage,গুরুত্ব
 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,একটি গ্রাহক গ্রুপ একই নামের সঙ্গে বিদ্যমান গ্রাহকের নাম পরিবর্তন বা ক্রেতা গ্রুপ নামান্তর করুন
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,{0} প্রথম নির্বাচন করুন.
@@ -1375,12 +1383,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,অনেক কলাম. প্রতিবেদন এবং রফতানি একটি স্প্রেডশীট অ্যাপ্লিকেশন ব্যবহার করে তা প্রিন্ট করা হবে.
 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 +139,Main,প্রধান
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,প্রধান
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,বৈকল্পিক
 DocType: Naming Series,Set prefix for numbering series on your transactions,আপনার লেনদেনের উপর সিরিজ সংখ্যায়ন জন্য সেট উপসর্গ
 DocType: Employee Attendance Tool,Employees HTML,এমপ্লয়িজ এইচটিএমএল
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,থামানো অর্ডার বাতিল করা যাবে না. বাতিল করতে দুর.
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,ডিফল্ট BOM ({0}) এই আইটেমটি বা তার টেমপ্লেট জন্য সক্রিয় হতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,রুপভেদ
@@ -1405,7 +1413,6 @@
 DocType: Sales Order,To Deliver and Bill,রক্ষা কর এবং বিল থেকে
 DocType: GL Entry,Credit Amount in Account Currency,অ্যাকাউন্টের মুদ্রা মধ্যে ক্রেডিট পরিমাণ
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,উত্পাদন জন্য সময় লগসমূহ.
-DocType: Item,Apply Warehouse-wise Reorder Level,ওয়ারহাউস অনুসার রেকর্ডার শ্রেনী প্রয়োগ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} দাখিল করতে হবে
 DocType: Authorization Control,Authorization Control,অনুমোদন কন্ট্রোল
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},সারি # {0}: ওয়্যারহাউস প্রত্যাখ্যাত প্রত্যাখ্যান আইটেম বিরুদ্ধে বাধ্যতামূলক {1}
@@ -1503,6 +1510,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,সারি # {0}: অপারেশন {1} উত্পাদনের মধ্যে সমাপ্ত পণ্য {2} Qty জন্য সম্পন্ন করা হয় না আদেশ # {3}. সময় লগসমূহ মাধ্যমে অপারেশন অবস্থা আপডেট করুন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,বিনিয়োগ
 DocType: Issue,Resolution Details,রেজোলিউশনের বিবরণ
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,বরাে
 DocType: Quality Inspection Reading,Acceptance Criteria,গ্রহণযোগ্য বৈশিষ্ট্য
 DocType: Item Attribute,Attribute Name,নাম গুন
 DocType: Item Group,Show In Website,ওয়েবসাইট দেখান
@@ -1553,7 +1561,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,ব্যয় দাবি অনুমোদনের জন্য স্থগিত করা হয়. শুধু ব্যয় রাজসাক্ষী স্ট্যাটাস আপডেট করতে পারবেন.
 DocType: Purchase Invoice,Additional Discount Amount,অতিরিক্ত মূল্য ছাড়ের পরিমাণ
 DocType: Leave Block List Allow,Leave Block List Allow,ব্লক মঞ্জুর তালিকা ত্যাগ
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,সংক্ষিপ্তকরণ ফাঁকা বা স্থান হতে পারে না
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,সংক্ষিপ্তকরণ ফাঁকা বা স্থান হতে পারে না
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,অ-গ্রুপ গ্রুপ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,স্পোর্টস
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,প্রকৃত মোট
@@ -1594,7 +1602,7 @@
 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**.,** অর্থবছরের ** একটি অর্থবছরে প্রতিনিধিত্ব করে. সব হিসাব ভুক্তি এবং অন্যান্য প্রধান লেনদেন ** ** অর্থবছরের বিরুদ্ধে ট্র্যাক করা হয়.
 DocType: Opportunity,Customer / Lead Address,গ্রাহক / লিড ঠিকানা
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},সতর্কবাণী: সংযুক্তি অবৈধ SSL সার্টিফিকেট {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},সতর্কবাণী: সংযুক্তি অবৈধ SSL সার্টিফিকেট {0}
 DocType: Production Order Operation,Actual Operation Time,প্রকৃত অপারেশন টাইম
 DocType: Authorization Rule,Applicable To (User),প্রযোজ্য (ব্যবহারকারী)
 DocType: Purchase Taxes and Charges,Deduct,বিয়োগ করা
@@ -1743,7 +1751,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,মামলা নং 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,"আপনি (চ্যানেল পার্টনার্স) সেলস টিম এবং বিক্রয় অংশীদার থাকে, তাহলে তারা বাঁধা এবং বিক্রয় কার্যকলাপ নারীর অবদানের বজায় যাবে"
 DocType: Item,Show a slideshow at the top of the page,পৃষ্ঠার উপরের একটি স্লাইডশো প্রদর্শন
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,দোকান
+DocType: Item,"Allow in Sales Order of type ""Service""",টাইপ &quot;সেবা&quot; বিক্রয় আদেশ মঞ্জুর
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,দোকান
 DocType: Time Log,Projects Manager,প্রকল্প ম্যানেজার
 DocType: Serial No,Delivery Time,প্রসবের সময়
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,উপর ভিত্তি করে বুড়ো
@@ -1768,7 +1777,7 @@
 ,Financial Analytics,আর্থিক বিশ্লেষণ
 DocType: Quality Inspection,Verified By,কর্তৃক যাচাইকৃত
 DocType: Address,Subsidiary,সহায়ক
-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.","বিদ্যমান লেনদেন আছে, কারণ, কোম্পানির ডিফল্ট মুদ্রা পরিবর্তন করতে পারবেন. লেনদেন ডিফল্ট মুদ্রা পরিবর্তন বাতিল করতে হবে."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","বিদ্যমান লেনদেন আছে, কারণ, কোম্পানির ডিফল্ট মুদ্রা পরিবর্তন করতে পারবেন. লেনদেন ডিফল্ট মুদ্রা পরিবর্তন বাতিল করতে হবে."
 DocType: Quality Inspection,Purchase Receipt No,কেনার রসিদ কোন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,অগ্রিক
 DocType: Process Payroll,Create Salary Slip,বেতন স্লিপ তৈরি
@@ -1816,7 +1825,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,কাঁচামালের ফাঁকা থাকতে পারে না.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","স্টক আপডেট করা যায়নি, চালান ড্রপ শিপিং আইটেমটি রয়েছে."
 DocType: Newsletter,Test,পরীক্ষা
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'","বিদ্যমান শেয়ার লেনদেন আপনাকে মান পরিবর্তন করতে পারবেন না \ এই আইটেমটি জন্য আছে &#39;সিরিয়াল কোন হয়েছে&#39;, &#39;ব্যাচ করিয়াছেন&#39;, &#39;স্টক আইটেম&#39; এবং &#39;মূল্যনির্ধারণ পদ্ধতি&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,দ্রুত জার্নাল এন্ট্রি
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,BOM কোন আইটেম agianst উল্লেখ তাহলে আপনি হার পরিবর্তন করতে পারবেন না
@@ -1905,7 +1914,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,দয়া হুণ্ডি প্রথম
 DocType: Purchase Invoice,Currency and Price List,মুদ্রা ও মূল্যতালিকা
 DocType: Opportunity,Customer / Lead Name,গ্রাহক / লিড নাম
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,পরিস্কারের তারিখ উল্লেখ না
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,পরিস্কারের তারিখ উল্লেখ না
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,উত্পাদনের
 DocType: Item,Allow Production Order,মঞ্জুরি উৎপাদন অর্ডার
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,সারি {0}: আরম্ভের তারিখ শেষ তারিখের আগে হওয়া আবশ্যক
@@ -1915,7 +1924,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,মোট আয়
 DocType: Purchase Receipt,Time at which materials were received,"উপকরণ গৃহীত হয়েছে, যা এ সময়"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,আমার ঠিকানা
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,আমার ঠিকানা
 DocType: Stock Ledger Entry,Outgoing Rate,আউটগোয়িং কলের হার
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,সংস্থার শাখা মাস্টার.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,বা
@@ -1984,7 +1993,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,গ্রাহক গ্রুপ গাছ পরিচালনা.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,নতুন খরচ কেন্দ্রের নাম
 DocType: Leave Control Panel,Leave Control Panel,কন্ট্রোল প্যানেল ছেড়ে চলে
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,কোন ডিফল্ট ঠিকানা টেমপ্লেট পাওয়া যায় নি. সেটআপ&gt; ছাপানো ও ব্র্যান্ডিং&gt; ঠিকানা টেমপ্লেট থেকে একটি নতুন তৈরি করুন.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,কোন ডিফল্ট ঠিকানা টেমপ্লেট পাওয়া যায় নি. সেটআপ&gt; ছাপানো ও ব্র্যান্ডিং&gt; ঠিকানা টেমপ্লেট থেকে একটি নতুন তৈরি করুন.
 DocType: Appraisal,HR User,এইচআর ব্যবহারকারী
 DocType: Purchase Invoice,Taxes and Charges Deducted,কর ও শুল্ক বাদ
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,সমস্যা
@@ -2001,7 +2010,7 @@
 ,Sales Browser,সেলস ব্রাউজার
 DocType: Journal Entry,Total Credit,মোট ক্রেডিট
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},সতর্কতা: আরেকটি {0} # {1} শেয়ার এন্ট্রি বিরুদ্ধে বিদ্যমান {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,স্থানীয়
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,বড়
@@ -2020,7 +2029,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,আপনি সেট এবং নির্দেশকের লক্ষ্যমাত্রা নজর রাখতে পারেন যাতে সব বিক্রয় লেনদেন একাধিক ** বিক্রয় ব্যক্তি ** বিরুদ্ধে ট্যাগ করা যায়.
 ,S.O. No.,তাই নং
 DocType: Production Order Operation,Make Time Log,টাইম ইন করুন
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,পুনর্বিন্যাস পরিমাণ সেট করুন
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},লিড থেকে গ্রাহক তৈরি করুন {0}
 DocType: Price List,Applicable for Countries,দেশ সমূহ জন্য প্রযোজ্য
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,কম্পিউটার
@@ -2095,7 +2103,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,প্রাসঙ্গিক এন্ট্রি পেতে
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,স্টক জন্য অ্যাকাউন্টিং এণ্ট্রি
 DocType: Sales Invoice,Sales Team1,সেলস team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,আইটেম {0} অস্তিত্ব নেই
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,আইটেম {0} অস্তিত্ব নেই
 DocType: Sales Invoice,Customer Address,গ্রাহকের ঠিকানা
 DocType: Payment Request,Recipient and Message,প্রাপক এবং পাঠান
 DocType: Purchase Invoice,Apply Additional Discount On,অতিরিক্ত ডিসকাউন্ট উপর প্রয়োগ
@@ -2137,7 +2145,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,মূল্যনির্ধারণ হার
 apps/erpnext/erpnext/stock/get_item_details.py +274,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} উপরোক্ত &#39;ক্রয় রসিদের&#39; টেবিলের অস্তিত্ব নেই কেনার রসিদ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,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 +155,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,পাসওয়ার্ড ভুলে গেছেন? পুনঃনামকরণ
@@ -2175,7 +2183,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,তারিখ মুক্তিদান লিখুন.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,শুধু স্ট্যাটাস &#39;অনুমোদিত&#39; জমা করা যেতে পারে সঙ্গে অ্যাপ্লিকেশন ছেড়ে দিন
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,ঠিকানা শিরোনাম বাধ্যতামূলক.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,ঠিকানা শিরোনাম বাধ্যতামূলক.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,তদন্ত উৎস প্রচারণা যদি প্রচারাভিযানের নাম লিখুন
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,সংবাদপত্র পাবলিশার্স
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ফিস্ক্যাল বছর নির্বাচন
@@ -2199,6 +2207,7 @@
 DocType: UOM,Must be Whole Number,গোটা সংখ্যা হতে হবে
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(দিন) বরাদ্দ নতুন পাতার
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,সিরিয়াল কোন {0} অস্তিত্ব নেই
+DocType: Sales Invoice Item,Customer Warehouse (Optional),গ্রাহক ওয়্যারহাউস (ঐচ্ছিক)
 DocType: Pricing Rule,Discount Percentage,ডিসকাউন্ট শতাংশ
 DocType: Payment Reconciliation Invoice,Invoice Number,চালান নম্বর
 apps/erpnext/erpnext/hooks.py +55,Orders,আদেশ
@@ -2308,7 +2317,7 @@
 DocType: Appraisal,Appraisal,গুণগ্রাহিতা
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,তারিখ পুনরাবৃত্তি করা হয়
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,অনুমোদিত স্বাক্ষরকারী
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},এক হতে হবে রাজসাক্ষী ত্যাগ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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,সময় শুরু
@@ -2477,7 +2486,7 @@
 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 +733,Show tax break-up,দেখান ট্যাক্স ব্রেক আপ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,দেখান ট্যাক্স ব্রেক আপ
 apps/erpnext/erpnext/accounts/party.py +283,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',আপনি উত্পাদন ক্রিয়াকলাপে জড়িত করে. সক্ষম করে আইটেম &#39;নির্মিত হয়&#39;
@@ -2526,7 +2535,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,পুনরায় টাইপ কোম্পানি নাম নিশ্চিত অনুগ্রহ
@@ -2553,8 +2562,6 @@
 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,যোগদান তারিখ জন্ম তারিখ থেকে বড় হওয়া উচিত
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,বেতন কাঠামো
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","একাধিক মূল্য রুল একই মানদণ্ডের সঙ্গে বিদ্যমান, অগ্রাধিকার বরাদ্দ দ্বারা \ দ্বন্দ্ব সমাধান করুন. দাম বিধি: {0}"
 DocType: Account,Bank,ব্যাংক
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,বিমানসংস্থা
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,ইস্যু উপাদান
@@ -2579,7 +2586,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,সিকিউরিটিজ ও পণ্য বিনিময়ের
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',বৈকল্পিক জন্য মেজার ডিফল্ট ইউনিট &#39;{0}&#39; টেমপ্লেট হিসাবে একই হতে হবে &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',বৈকল্পিক জন্য মেজার ডিফল্ট ইউনিট &#39;{0}&#39; টেমপ্লেট হিসাবে একই হতে হবে &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ভিত্তি করে গণনা
 DocType: Delivery Note Item,From Warehouse,গুদাম থেকে
 DocType: Purchase Taxes and Charges,Valuation and Total,মূল্যনির্ধারণ এবং মোট
@@ -2588,7 +2595,7 @@
 DocType: Account,Purchase User,ক্রয় ব্যবহারকারী
 DocType: Notification Control,Customize the Notification,বিজ্ঞপ্তি কাস্টমাইজ করুন
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,অপারেশন থেকে নগদ প্রবাহ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,ডিফল্ট ঠিকানা টেমপ্লেট মোছা যাবে না
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,ডিফল্ট ঠিকানা টেমপ্লেট মোছা যাবে না
 DocType: Sales Invoice,Shipping Rule,শিপিং রুল
 DocType: Manufacturer,Limited to 12 characters,12 অক্ষরের মধ্যে সীমাবদ্ধ
 DocType: Journal Entry,Print Heading,প্রিন্ট শীর্ষক
@@ -2681,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,প্রকল্প-ভিত্তিক তথ্য উদ্ধৃতি জন্য উপলব্ধ নয়
 DocType: Project,Expected End Date,সমাপ্তি প্রত্যাশিত তারিখ
 DocType: Appraisal Template,Appraisal Template Title,মূল্যায়ন টেমপ্লেট শিরোনাম
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,ব্যবসায়িক
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,জট্টিল সেবা
@@ -2700,7 +2707,7 @@
 DocType: Customer,Default Receivable Accounts,গ্রহনযোগ্য অ্যাকাউন্ট ডিফল্ট
 DocType: Tax Rule,Billing State,বিলিং রাজ্য
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,হস্তান্তর
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),(সাব-সমাহারগুলি সহ) অপ্রমাণিত BOM পান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),(সাব-সমাহারগুলি সহ) অপ্রমাণিত BOM পান
 DocType: Authorization Rule,Applicable To (Employee),প্রযোজ্য (কর্মচারী)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,দরুন জন্ম বাধ্যতামূলক
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,অ্যাট্রিবিউট জন্য বর্ধিত {0} 0 হতে পারবেন না
@@ -2733,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,নেতিবাচক মূল্যনির্ধারণ হার অনুমোদিত নয়
 DocType: Holiday List,Weekly Off,সাপ্তাহিক ছুটি
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","যেমন 2012, 2012-13 জন্য"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),প্রোভিশনাল লাভ / ক্ষতি (ক্রেডিট)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),প্রোভিশনাল লাভ / ক্ষতি (ক্রেডিট)
 DocType: Sales Invoice,Return Against Sales Invoice,বিরুদ্ধে বিক্রয় চালান আসতে
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,আইটেম 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},কোম্পানি এ ডিফল্ট মান {0} সেট করুন {1}
@@ -2764,6 +2771,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,শিশু করো
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,ভূমিকা হিমায়িত একাউন্টস ও সম্পাদনা হিমায়িত সাজপোশাকটি সেট করার মঞ্জুরি
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,এটা সন্তানের নোড আছে খতিয়ান করার খরচ কেন্দ্র রূপান্তর করতে পারবেন না
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,খোলা মূল্য
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,সিরিয়াল #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,বিক্রয় কমিশনের
 DocType: Offer Letter Term,Value / Description,মূল্য / বিবরণ:
@@ -2797,7 +2805,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,সফলভাবে এই কোম্পানীর সাথে সম্পর্কিত সব লেনদেন মোছা!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,আজকের তারিখে
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,পরীক্ষাকাল
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,ডিফল্ট গুদাম স্টক আইটেম জন্য বাধ্যতামূলক.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},মাসের জন্য বেতন পরিশোধ {0} এবং বছরের {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,অটো সন্নিবেশ মূল্য তালিকা হার অনুপস্থিত যদি
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,মোট প্রদত্ত পরিমাণ
@@ -2833,7 +2840,7 @@
 DocType: Payment Tool,Set Matching Amounts,সেট পরিমাণ সমন্বয়
 DocType: Purchase Invoice,Taxes and Charges Added,কর ও চার্জ যোগ
 ,Sales Funnel,বিক্রয় ফানেল
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,সমাহার বাধ্যতামূলক
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,সমাহার বাধ্যতামূলক
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,আমাদের আপডেট সাবস্ক্রাইব আপনার আগ্রহের জন্য আপনাকে ধন্যবাদ
 ,Qty to Transfer,স্থানান্তর করতে Qty
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,বিশালাকার বা গ্রাহকরা কোট.
@@ -2861,7 +2868,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,সরবরাহকারী উদ্ধৃতি
 DocType: Quotation,In Words will be visible once you save the Quotation.,আপনি উধৃতি সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} থামানো হয়
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},বারকোড {0} ইতিমধ্যে আইটেম ব্যবহৃত {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,আসন্ন ঘটনাবলী
@@ -2883,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,ফিস্ক্যাল বছর নির্বাচন ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,পিওএস প্রোফাইল পিওএস এন্ট্রি করতে প্রয়োজন
 DocType: Hub Settings,Name Token,নাম টোকেন
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,স্ট্যান্ডার্ড বিক্রি
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,স্ট্যান্ডার্ড বিক্রি
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,অন্তত একটি গুদাম বাধ্যতামূলক
 DocType: Serial No,Out of Warranty,পাটা আউট
 DocType: BOM Replace Tool,Replace,প্রতিস্থাপন করা
@@ -3006,7 +3013,7 @@
 DocType: Sales Invoice,Paid Amount,দেওয়া পরিমাণ
 ,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,অন্য কোন ডিফল্ট আছে হিসাবে ডিফল্ট হিসেবে এই ঠিকানায় টেমপ্লেট সেটিং
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,অন্য কোন ডিফল্ট আছে হিসাবে ডিফল্ট হিসেবে এই ঠিকানায় টেমপ্লেট সেটিং
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ইতিমধ্যে ডেবিট অ্যাকাউন্ট ব্যালেন্স, আপনি &#39;ক্রেডিট&#39; হিসেবে &#39;ব্যালেন্স করতে হবে&#39; সেট করার অনুমতি দেওয়া হয় না"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,গুনমান ব্যবস্থাপনা
 DocType: Production Planning Tool,Filter based on customer,ফিল্টার গ্রাহক উপর ভিত্তি করে
@@ -3107,7 +3114,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",", ডিফল্ট হিসাবে চলতি অর্থবছরেই সেট করতে &#39;ডিফল্ট হিসাবে সেট করুন&#39; ক্লিক করুন"
 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 +19,Shortage Qty,ঘাটতি Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
 DocType: Salary Slip,Salary Slip,বেতন পিছলানো
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'তারিখ পর্যন্ত' প্রয়োজন
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","প্যাকেজ বিতরণ করা জন্য স্লিপ বোঁচকা নির্মাণ করা হয়. বাক্স সংখ্যা, প্যাকেজের বিষয়বস্তু এবং তার ওজন অবহিত করা."
@@ -3118,7 +3125,7 @@
 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.","চেক লেনদেনের কোনো &quot;জমা&quot; করা হয়, তখন একটি ইমেল পপ-আপ স্বয়ংক্রিয়ভাবে একটি সংযুক্তি হিসাবে লেনদেনের সঙ্গে, যে লেনদেনে যুক্ত &quot;যোগাযোগ&quot; একটি ইমেল পাঠাতে খোলা. ব্যবহারকারী may অথবা ইমেইল পাঠাতে পারে."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,গ্লোবাল সেটিংস
 DocType: Employee Education,Employee Education,কর্মচারী শিক্ষা
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,এটি একটি আইটেম বিবরণ পেতে প্রয়োজন হয়.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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} ইতিমধ্যে গৃহীত হয়েছে
@@ -3144,6 +3151,7 @@
 DocType: BOM,Manufacturing User,উৎপাদন ব্যবহারকারী
 DocType: Purchase Order,Raw Materials Supplied,কাঁচামালের সরবরাহ
 DocType: Purchase Invoice,Recurring Print Format,পুনরাবৃত্ত মুদ্রণ বিন্যাস
+DocType: C-Form,Series,সিরিজ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,প্রত্যাশিত প্রসবের তারিখ ক্রয় আদেশ তারিখের আগে হতে পারে না
 DocType: Appraisal,Appraisal Template,মূল্যায়ন টেমপ্লেট
 DocType: Item Group,Item Classification,আইটেম সাইট
@@ -3219,7 +3227,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},সারি {0}: একটি রেকর্ডার এন্ট্রি ইতিমধ্যে এই গুদাম জন্য বিদ্যমান {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.","উদ্ধৃতি দেয়া হয়েছে, কারণ যত হারিয়ে ডিক্লেয়ার করতে পারেন না."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ক্রয় মাস্টার ম্যানেজার
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,অর্ডার {0} দাখিল করতে হবে উৎপাদন
@@ -3227,7 +3235,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,প্রধান প্রতিবেদন
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,তারিখ থেকে তারিখের আগে হতে পারে না
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,/ সম্পাদনা বর্ণনা করো
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,আমার আদেশ
@@ -3275,7 +3283,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},সারি # {0}: আইটেমের জন্য সেট সরবরাহকারী {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,আইটেম {1} সংযুক্ত ওয়েবসাইট চিত্র {0} পাওয়া যাবে না
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,আইটেম {1} সংযুক্ত ওয়েবসাইট চিত্র {0} পাওয়া যাবে না
 DocType: Issue,Content Type,কোন ধরনের
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,কম্পিউটার
 DocType: Item,List this Item in multiple groups on the website.,ওয়েবসাইটে একাধিক গ্রুপ এই আইটেম তালিকা.
@@ -3289,7 +3297,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,'সিরিয়াল নং আছে' কখনই নন-ষ্টক আইটেমের ক্ষেত্রে 'হ্যাঁ' হতে পারবে না
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'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,অ্যাকাউন্ট হেড
@@ -3315,7 +3323,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,অ্যাকাউন্ট {0} সমাপ্তি ধরনের দায় / ইক্যুইটি হওয়া আবশ্যক
 DocType: Authorization Rule,Based On,উপর ভিত্তি করে
 DocType: Sales Order Item,Ordered Qty,আদেশ Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
 DocType: Stock Settings,Stock Frozen Upto,শেয়ার হিমায়িত পর্যন্ত
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},থেকে এবং আবর্তক সময়সীমার জন্য বাধ্যতামূলক তারিখ সময়ের {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,প্রকল্পের কার্যকলাপ / টাস্ক.
@@ -3323,7 +3331,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","প্রযোজ্য হিসাবে নির্বাচিত করা হয় তাহলে কেনার, চেক করা আবশ্যক {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,বাট্টা কম 100 হতে হবে
 DocType: Purchase Invoice,Write Off Amount (Company Currency),পরিমাণ বন্ধ লিখুন (কোম্পানি একক)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,সারি # {0}: পুনর্বিন্যাস পরিমাণ সেট করুন
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,সারি # {0}: পুনর্বিন্যাস পরিমাণ সেট করুন
 DocType: Landed Cost Voucher,Landed Cost Voucher,ল্যান্ড কস্ট ভাউচার
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},সেট করুন {0}
 DocType: Purchase Invoice,Repeat on Day of Month,মাস দিন পুনরাবৃত্তি
@@ -3395,7 +3403,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,এখন দেখুন
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,চালান স্বয়ংক্রিয়ভাবে উত্পন্ন করা হবে যখন কাল নির্বাচন
 DocType: BOM,Raw Material Cost,কাঁচামাল খরচ
-DocType: Item,Re-Order Level,পুনর্বিন্যাস স্তর
+DocType: Item Reorder,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 লিখুন."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,খন্ডকালীন
 DocType: Employee,Applicable Holiday List,প্রযোজ্য ছুটির তালিকা
@@ -3450,7 +3458,7 @@
 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 +573,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3529,7 +3537,7 @@
 DocType: Address,Office,অফিস
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,অ্যাকাউন্টিং জার্নাল এন্ট্রি.
 DocType: Delivery Note Item,Available Qty at From Warehouse,গুদাম থেকে এ উপলব্ধ Qty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,প্রথম কর্মী রেকর্ড নির্বাচন করুন.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,প্রথম কর্মী রেকর্ড নির্বাচন করুন.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,ব্যয় অ্যাকাউন্ট লিখুন দয়া করে
@@ -3604,7 +3612,7 @@
 DocType: Item Attribute,Numeric Values,সাংখ্যিক মান
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,লোগো সংযুক্ত
 DocType: Customer,Commission Rate,কমিশন হার
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,ভেরিয়েন্ট করুন
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,ভেরিয়েন্ট করুন
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,ডিপার্টমেন্ট দ্বারা ব্লক ছেড়ে অ্যাপ্লিকেশন.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,কার্ট খালি হয়
 DocType: Production Order,Actual Operating Cost,আসল অপারেটিং খরচ
@@ -3621,15 +3629,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item","পুনর্বিন্যাস স্তর সেট করতে, আইটেমটি একটি ক্রয় আইটেম বা উৎপাদন আইটেম হতে হবে"
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),(অর্ধদিবস)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(অর্ধদিবস)
 DocType: Supplier,Credit Days,ক্রেডিট দিন
 DocType: Leave Type,Is Carry Forward,এগিয়ে বহন করা হয়
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,BOM থেকে জানানোর পান
diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv
index a380e0b..2899292 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,Naplaćeno%
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Tečajna lista moraju biti isti kao {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Naziv klijenta
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Žiro račun ne može biti imenovan kao {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Žiro račun ne može biti imenovan kao {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Izvanredna za {0} ne može biti manji od nule ( {1} )
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Novi dopust Primjena
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Novi dopust Primjena
 apps/erpnext/erpnext/setup/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
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log aktivnosti obavljaju korisnike od zadataka koji se mogu koristiti za praćenje vremena, billing."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},New {0}: {1} #
 ,Sales Partners Commission,Prodaja Partneri komisija
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Skraćeni naziv ne može imati više od 5 znakova
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Skraćeni naziv ne može imati više od 5 znakova
 DocType: Payment Request,Payment Request,Plaćanje Upit
 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.",Vrijednost atributa {0} se ne može ukloniti iz {1} kao Stavka Varijante \ postoje sa ovim atributom.
@@ -196,6 +196,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,Odaberite uvjeti
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,out vrijednost
 DocType: Production Planning Tool,Sales Orders,Sales Orders
 DocType: Purchase Taxes and Charges,Valuation,Procjena
 ,Purchase Order Trends,Trendovi narudžbenica kupnje
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizija
 DocType: Production Order Operation,Updated via 'Time Log',Ažurirano putem 'Time Log'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konto {0} ne pripada preduzeću {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},iznos Advance ne može biti veći od {0} {1}
 DocType: Naming Series,Series List for this Transaction,Serija Popis za ovu transakciju
 DocType: Sales Invoice,Is Opening Entry,Je Otvaranje unos
 DocType: Customer Group,Mention if non-standard receivable account applicable,Spomenite ako nestandardnih potraživanja računa važećim
@@ -227,7 +229,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Stvara plaće slip za gore navedene kriterije.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Nema opisa dano
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Zahtjev za kupnju.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/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&gt; Settings&gt; Imenovanje serije
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Skladište {0} ne pripada tvrtki {1}
 DocType: Item Website Specification,Item Website Specification,Specifikacija web stranice artikla
 DocType: Payment Tool,Reference No,Poziv na broj
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Ostavite blokirani
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Ostavite blokirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,Annual,godišnji
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Pomirenje Item
 DocType: Stock Entry,Sales Invoice No,Faktura prodaje br
@@ -249,7 +251,7 @@
 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 +606,Item {0} is cancelled,Artikal {0} je otkazan
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Artikal {0} je otkazan
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Materijal zahtjev
 DocType: Bank Reconciliation,Update Clearance Date,Ažurirajte provjeri datum
 DocType: Item,Purchase Details,Kupnja Detalji
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Otpremnica
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Postavljanje Porezi
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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
@@ -329,7 +331,7 @@
 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 +215,Please see attachment,Pogledajte prilog
 DocType: Purchase Order,% Received,% Pozicija
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Podešavanja je već okončano!!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Podešavanja je već okončano!!
 ,Finished Goods,gotovih proizvoda
 DocType: Delivery Note,Instructions,Instrukcije
 DocType: Quality Inspection,Inspected By,Provjereno od strane
@@ -354,14 +356,13 @@
 ,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 +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mora imati ulogu 'Leave Approver'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{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/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
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation je zatvoren sljedećih datuma po Holiday List: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Mogućnosti
 DocType: Employee,Single,Singl
-DocType: Issue,Attachment,Vezanost
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budžet se ne može postaviti za grupu troškova Center
 DocType: Account,Cost of Goods Sold,Troškovi prodane robe
 DocType: Purchase Invoice,Yearly,Godišnji
@@ -390,7 +391,7 @@
 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 +564,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 +550,Attribute {0} selected multiple times in Attributes Table,Atribut {0} odabrani više puta u atributi tabeli
 DocType: HR Settings,Employee record is created using selected field. ,Zaposlenika rekord je stvorio pomoću odabranog polja.
 DocType: Sales Order,Not Applicable,Nije primjenjivo
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Majstor za odmor .
@@ -429,7 +430,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,kozmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
 DocType: Shipping Rule,Net Weight,Neto težina
 DocType: Employee,Emergency Phone,Hitna Telefon
 ,Serial No Warranty Expiry,Serijski Nema jamstva isteka
@@ -440,7 +441,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Upravljanje Subcontracting
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konto {0} ne pripada preduzeću {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Konto {0} ne pripada preduzeću {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Skraćenica već koristi za druge kompanije
 DocType: Selling Settings,Default Customer Group,Zadana grupa korisnika
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ako onemogućite, &#39;Ukupno&#39; Zaobljeni polje neće biti vidljiv u bilo kojoj transakciji"
 DocType: BOM,Operating Cost,Operativni troškovi
@@ -476,6 +478,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Nisu pronađeni u tablici fakturu
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Molimo najprije odaberite Društva i Party Tip
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Financijska / obračunska godina .
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,akumulirani Vrijednosti
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Žao nam je , Serial Nos ne mogu spojiti"
 DocType: Project Task,Project Task,Projektnog zadatka
 ,Lead Id,Id potencijalnog kupca
@@ -497,7 +500,7 @@
 DocType: Quotation,Quotation To,Ponuda za
 DocType: Lead,Middle Income,Srednji Prihodi
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Otvaranje ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Uobičajeno mjerna jedinica za artikl {0} ne može se mijenjati izravno, jer ste već napravili neke transakcije (e) sa drugim UOM. Morat ćete stvoriti nove stavke koristiti drugačiji Uobičajeno UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Uobičajeno mjerna jedinica za artikl {0} ne može se mijenjati izravno, jer ste već napravili neke transakcije (e) sa drugim UOM. Morat ćete stvoriti nove stavke koristiti drugačiji Uobičajeno UOM."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
 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.
@@ -575,7 +578,7 @@
 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 +543,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -588,6 +591,7 @@
 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 +33,Goods received from Suppliers.,Roba dobijena od dobavljača.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,u vrijednost
 DocType: Lead,Campaign Name,Naziv kampanje
 ,Reserved,Rezervirano
 DocType: Purchase Order,Supply Raw Materials,Supply sirovine
@@ -602,16 +606,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Konto sa postojećim transakcijama se ne može pretvoriti u glavnu knjigu
 DocType: Delivery Note,Customer's Purchase Order No,Kupca Narudžbenica br
 DocType: Employee,Cell Number,Mobitel Broj
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto materijala Zahtjevi Generirano
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Auto materijala Zahtjevi Generirano
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Izgubljen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,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/setup_wizard/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.
 DocType: Item Group,Website Specifications,Web Specifikacije
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Postoji greška u vašem Adresa Template {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Novi račun
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} {1} tipa
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Više pravila Cijena postoji sa istim kriterijima, molimo vas da riješe sukob dodjelom prioriteta. Cijena pravila: {0}"
 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.,Računovodstva unosi može biti pokrenuta protiv lista čvorova. Nisu dozvoljeni stavke protiv Grupe.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne može se isključiti ili otkaže BOM kao što je povezano s drugim Boms
 DocType: Opportunity,Maintenance,Održavanje
@@ -673,7 +679,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,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/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Bez dozvole
 DocType: Company,Default Bank Account,Zadani bankovni račun
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Da biste filtrirali na osnovu stranke, izaberite Party prvog tipa"
@@ -703,13 +709,13 @@
 DocType: Production Planning Tool,Select Items,Odaberite artikle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} {1} protiv Bill od {2}
 DocType: Maintenance Visit,Completion Status,Završetak Status
-DocType: Sales Invoice Item,Target Warehouse,Ciljana galerija
+DocType: Production Order,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 +50,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/setup_wizard/install_fixtures.py +17,All Item Groups,Sve grupe artikala
 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,Neto dobit / gubitak
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Neto dobit / gubitak
 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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} {2} status
@@ -717,7 +723,7 @@
 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
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Stavka Variant {0} već postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Stavka Variant {0} već postoji s istim atributima
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Otvaranje&#39;
 DocType: Notification Control,Delivery Note Message,Otpremnica - poruka
 DocType: Expense Claim,Expenses,troškovi
@@ -727,7 +733,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Istraživanje i razvoj
 ,Amount to Bill,Iznos za naplatu
 DocType: Company,Registration Details,Registracija Brodu
-DocType: Item,Re-Order Qty,Re-order Količina
+DocType: Item Reorder,Re-Order Qty,Re-order Količina
 DocType: Leave Block List Date,Leave Block List Date,Ostavite Date Popis Block
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planirano za slanje na {0}
 DocType: Pricing Rule,Price or Discount,Cijena i popust
@@ -770,7 +776,7 @@
 DocType: Bank Reconciliation,Total Amount,Ukupan iznos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet izdavaštvo
 DocType: Production Planning Tool,Production Orders,Nalozi
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Vrijednost bilance
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Vrijednost bilance
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Sales Cjenovnik
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Objavite za sinhronizaciju stavke
 DocType: Bank Reconciliation,Account Currency,Valuta račun
@@ -779,7 +785,7 @@
 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 +538,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -856,7 +862,7 @@
 DocType: POS Profile,Cash/Bank Account,Novac / bankovni račun
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Atribut sto je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Popust
@@ -884,7 +890,7 @@
 DocType: Tax Rule,Shipping State,State dostava
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Stavka mora biti dodan pomoću 'Get stavki iz Kupovina Primici' gumb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Prodajni troškovi
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Standardna kupnju
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Standardna kupnju
 DocType: GL Entry,Against,Protiv
 DocType: Item,Default Selling Cost Center,Zadani trošak prodaje
 DocType: Sales Partner,Implementation Partner,Provedba partner
@@ -926,7 +932,7 @@
 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 +210,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/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Molimo podesite &#39;primijeniti dodatne popusta na&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Molimo podesite &#39;primijeniti dodatne popusta na&#39;
 ,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.
@@ -994,9 +1000,9 @@
 DocType: Contact,User ID,Korisnički ID
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Pogledaj Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najstarije
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Proizvodnja protiv prodaje Reda
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Ostatak svijeta
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1026,7 +1032,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Mali
 DocType: Employee,Employee Number,Zaposlenik Broj
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Slučaj Ne ( i) je već u uporabi . Pokušajte s predmetu broj {0}
@@ -1045,7 +1051,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Poljoprivreda
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Vaši proizvodi ili usluge
 DocType: Mode of Payment,Mode of Payment,Način plaćanja
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Sajt slika treba da bude javni datoteke ili web stranice URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Sajt slika treba da bude javni datoteke ili web stranice URL
 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
@@ -1117,6 +1123,7 @@
 DocType: Address,Utilities,Komunalne usluge
 DocType: Purchase Invoice Item,Accounting,Računovodstvo
 DocType: Features Setup,Features Setup,Značajke konfiguracija
+DocType: Item,Is Service Item,Je usluga
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Period aplikacija ne može biti razdoblje raspodjele izvan odsustva
 DocType: Activity Cost,Projects,Projekti
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Odaberite Fiskalna godina
@@ -1147,7 +1154,7 @@
 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 +465,cannot be greater than 100,ne može biti veća od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Stavka {0} nijestock Stavka
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1207,7 +1214,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Vlada
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Stavka Varijante
 DocType: Company,Services,Usluge
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Ukupno ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Ukupno ({0})
 DocType: Cost Center,Parent Cost Center,Roditelj troška
 DocType: Sales Invoice,Source,Izvor
 DocType: Leave Type,Is Leave Without Pay,Ostavi se bez plate
@@ -1280,17 +1287,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ponovo pošaljite mail plaćanja
 DocType: Dependent Task,Dependent Task,Zavisna Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Pogledaj
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Neto promjena u gotovini
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Neto promjena u gotovini
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plaća Struktura Odbitak
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Plaćanje Zahtjev već postoji {0}
 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 +182,Quantity must not be more than {0},Količina ne smije biti više od {0}
@@ -1352,7 +1359,7 @@
 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: Packed 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
@@ -1361,7 +1368,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Tvrtka , Mjesec i Fiskalna godina je obvezno"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Troškovi marketinga
 ,Item Shortage Report,Nedostatak izvješća za artikal
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spominje, \n Navedite ""Težina UOM"" previše"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spominje, \n Navedite ""Težina UOM"" previše"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materijal Zahtjev se koristi da bi se ova Stock unos
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Jedna jedinica stavku.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',"Vrijeme Log Batch {0} mora biti "" Postavio '"
@@ -1372,6 +1379,7 @@
 DocType: Employee,Date Of Retirement,Datum odlaska u mirovinu
 DocType: Upload Attendance,Get Template,Kreiraj predložak
 DocType: Address,Postal,Poštanski
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 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.
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Odaberite {0} na prvom mjestu.
@@ -1400,12 +1408,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Previše stupovi. Izvesti izvješće i ispisati pomoću aplikacije za proračunske tablice.
 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 +139,Main,Glavni
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Glavni
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Varijanta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Postavite prefiks za numeriranje niza na svoje transakcije
 DocType: Employee Attendance Tool,Employees HTML,Zaposleni HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,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 +367,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/stock/doctype/item/item.py +361,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
@@ -1430,7 +1438,6 @@
 DocType: Sales Order,To Deliver and Bill,Dostaviti i Bill
 DocType: GL Entry,Credit Amount in Account Currency,Iznos kredita u računu valuta
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Dnevnici vremena za proizvodnju.
-DocType: Item,Apply Warehouse-wise Reorder Level,Nanesite Skladište-mudar Ponovno red Level
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} mora biti dostavljena
 DocType: Authorization Control,Authorization Control,Odobrenje kontrole
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Odbijena Skladište je obavezno protiv odbijen Stavka {1}
@@ -1529,6 +1536,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,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}: {1} Operacija nije završen za {2} Količina gotovih proizvoda u proizvodnji Order # {3}. Molimo vas da ažurirate rad status via Time Dnevnici
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investicije
 DocType: Issue,Resolution Details,Rezolucija o Brodu
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,izdvajanja
 DocType: Quality Inspection Reading,Acceptance Criteria,Kriterij prihvaćanja
 DocType: Item Attribute,Attribute Name,Atributi Ime
 DocType: Item Group,Show In Website,Pokaži Na web stranice
@@ -1579,7 +1587,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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
 DocType: Leave Block List Allow,Leave Block List Allow,Ostavite Blok Popis Dopustite
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Skraćeno ne može biti prazan ili prostora
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Skraćeno ne može biti prazan ili prostora
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grupa Non-grupa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportovi
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Ukupno Actual
@@ -1620,7 +1628,7 @@
 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 **.
 DocType: Opportunity,Customer / Lead Address,Kupac / Olovo Adresa
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL certifikat o prilogu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL certifikat o prilogu {0}
 DocType: Production Order Operation,Actual Operation Time,Stvarni Operation Time
 DocType: Authorization Rule,Applicable To (User),Odnosi se na (Upute)
 DocType: Purchase Taxes and Charges,Deduct,Odbiti
@@ -1769,7 +1777,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Slučaj broj ne može 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,Ako imate prodajnog tima i prodaja partnerima (partneri) mogu biti označene i održavati svoj doprinos u prodajne aktivnosti
 DocType: Item,Show a slideshow at the top of the page,Prikaži slideshow na vrhu stranice
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,prodavaonice
+DocType: Item,"Allow in Sales Order of type ""Service""",Dozvolite u naloga prodaje tipa &quot;Servis&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,prodavaonice
 DocType: Time Log,Projects Manager,Projekti Manager
 DocType: Serial No,Delivery Time,Vrijeme isporuke
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Starenje temelju On
@@ -1794,7 +1803,7 @@
 ,Financial Analytics,Financijski Analytics
 DocType: Quality Inspection,Verified By,Ovjeren od strane
 DocType: Address,Subsidiary,Podružnica
-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 mogu promijeniti tvrtke zadanu valutu , jer postoje neki poslovi . Transakcije mora biti otkazana promijeniti zadanu valutu ."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Ne mogu promijeniti tvrtke zadanu valutu , jer postoje neki poslovi . Transakcije mora biti otkazana promijeniti zadanu valutu ."
 DocType: Quality Inspection,Purchase Receipt No,Primka br.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,kapara
 DocType: Process Payroll,Create Salary Slip,Stvaranje plaće Slip
@@ -1842,7 +1851,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Sirovine ne može biti prazan.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Nije mogao ažurirati zaliha, faktura sadrži drop shipping stavke."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 &#39;Ima Serial Ne&#39;, &#39;Ima serijski br&#39;, &#39;Je li Stock Stavka&#39; i &#39;Vrednovanje metoda&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Brzi unos u dnevniku
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti brzinu ako BOM spomenuo agianst bilo predmet
@@ -1951,7 +1960,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Molimo da Isporuka Note prvi
 DocType: Purchase Invoice,Currency and Price List,Valuta i cjenik
 DocType: Opportunity,Customer / Lead Name,Kupac / Ime osobe
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Razmak Datum nije spomenuo
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Razmak Datum nije spomenuo
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,proizvodnja
 DocType: Item,Allow Production Order,Dopustite proizvodni nalog
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Red {0} : Datum početka mora biti prije datuma završetka
@@ -1961,7 +1970,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 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 +118,My Addresses,Moj Adrese
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Moj Adrese
 DocType: Stock Ledger Entry,Outgoing Rate,Odlazni Rate
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Organizacija grana majstor .
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,ili
@@ -2030,7 +2039,7 @@
 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 +302,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 +95,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.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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
 DocType: Purchase Invoice,Taxes and Charges Deducted,Porezi i naknade oduzeti
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Pitanja
@@ -2047,7 +2056,7 @@
 ,Sales Browser,prodaja preglednik
 DocType: Journal Entry,Total Credit,Ukupna kreditna
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} {1} # postoji protiv ulaska zaliha {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Lokalno
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Veliki
@@ -2066,7 +2075,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Sve Sales Transakcije mogu biti označena protiv više osoba ** ** Sales, tako da možete postaviti i pratiti ciljeve."
 ,S.O. No.,S.O. Ne.
 DocType: Production Order Operation,Make Time Log,Make Time Log
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Molimo podesite Ponovno redj količinu
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Molimo stvoriti kupac iz Olovo {0}
 DocType: Price List,Applicable for Countries,Za zemlje u
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Računari
@@ -2153,7 +2161,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Kreiraj relevantne ulaze
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Računovodstvo Entry za Stock
 DocType: Sales Invoice,Sales Team1,Prodaja Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Artikal {0} ne postoji
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Artikal {0} ne postoji
 DocType: Sales Invoice,Customer Address,Kupac Adresa
 DocType: Payment Request,Recipient and Message,Primalac i poruka
 DocType: Purchase Invoice,Apply Additional Discount On,Nanesite dodatni popust na
@@ -2195,7 +2203,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Vrednovanje Stopa
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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
@@ -2233,7 +2241,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Unesite olakšavanja datum .
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Ostavite samo one prijave sa statusom "" Odobreno"" može se podnijeti"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Naziv adrese je obavezan.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Naziv adrese je obavezan.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Unesite naziv kampanje, ako je izvor upit je kampanja"
 apps/erpnext/erpnext/setup/setup_wizard/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
@@ -2257,6 +2265,7 @@
 DocType: UOM,Must be Whole Number,Mora biti cijeli broj
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Novi Lišće alociran (u danima)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serijski Ne {0} ne postoji
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Customer Warehouse (Opcionalno)
 DocType: Pricing Rule,Discount Percentage,Postotak rabata
 DocType: Payment Reconciliation Invoice,Invoice Number,Račun broj
 apps/erpnext/erpnext/hooks.py +55,Orders,Narudžbe
@@ -2366,7 +2375,7 @@
 DocType: Appraisal,Appraisal,Procjena
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum se ponavlja
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Ovlašteni potpisnik
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},Ostavite odobritelj mora biti jedan od {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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
@@ -2535,7 +2544,7 @@
 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
 DocType: Sales Order Item,Supplier delivers to Customer,Dobavljač dostavlja kupaca
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Pokaži porez break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Pokaži porez break-up
 apps/erpnext/erpnext/accounts/party.py +283,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 '
@@ -2584,7 +2593,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,Molimo vas da ponovno tipa naziv firme za potvrdu
@@ -2611,9 +2620,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Plaća Struktura
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Višestruki Cijena pravilo postoji sa istim kriterijima, molimo Vas da riješe sukob \
- dodjeljivanjem prioriteta. Cijena Pravila: {0}"
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aviokompanija
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Izdanje materijala
@@ -2638,7 +2644,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vrijednosni papiri i robne razmjene
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Uobičajeno mjerna jedinica za varijantu &#39;{0}&#39; mora biti isti kao u obrascu &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Uobičajeno mjerna jedinica za varijantu &#39;{0}&#39; mora biti isti kao u obrascu &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun zasnovan na
 DocType: Delivery Note Item,From Warehouse,Od Skladište
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednovanje i Total
@@ -2647,7 +2653,7 @@
 DocType: Account,Purchase User,Kupovina korisnika
 DocType: Notification Control,Customize the Notification,Prilagodite Obavijest
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Novčani tok iz poslovanja
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Zadani predložak adrese ne može se izbrisati
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Zadani predložak adrese ne može se izbrisati
 DocType: Sales Invoice,Shipping Rule,Pravilo transporta
 DocType: Manufacturer,Limited to 12 characters,Ograničena na 12 znakova
 DocType: Journal Entry,Print Heading,Ispis Naslov
@@ -2741,7 +2747,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,trgovački
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Nevjerovatne usluge
@@ -2760,7 +2766,7 @@
 DocType: Customer,Default Receivable Accounts,Uobičajeno Potraživanja Računi
 DocType: Tax Rule,Billing State,State billing
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Prijenos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,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 +95,Due Date is mandatory,Due Date je obavezno
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Prirast za Atributi {0} ne može biti 0
@@ -2793,7 +2799,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Privremeni dobit / gubitak (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Privremeni dobit / gubitak (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Vratiti Protiv Sales fakture
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Stavka 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Molimo postavite default vrijednost {0} {1} u Društvo
@@ -2824,6 +2830,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Dodaj podređenu stavku
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Uloga Dozvoljena Set Frozen Accounts & Frozen Edit unosi
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Ne može se pretvoriti troška za knjigu , kao da ima djece čvorova"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,otvaranje vrijednost
 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 prodaju
 DocType: Offer Letter Term,Value / Description,Vrijednost / Opis
@@ -2857,7 +2864,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Uspješno obrisane sve transakcije koje se odnose na ove kompanije!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kao i na datum
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probni rad
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Glavno skladište je obvezno za skladišni proizvod.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Isplata plaće za mjesec {0} i godina {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto umetak Cjenik stopa ako nedostaje
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Ukupno uplaćeni iznos
@@ -2893,7 +2899,7 @@
 DocType: Payment Tool,Set Matching Amounts,Set Matching Iznosi
 DocType: Purchase Invoice,Taxes and Charges Added,Porezi i naknade Dodano
 ,Sales Funnel,prodaja dimnjak
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Skraćenica je obavezno
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Skraćenica je obavezno
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Hvala Vam na Vašem interesu za pretplatu na naš ažuriranja
 ,Qty to Transfer,Količina za prijenos
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Ponude za kupce ili potencijalne kupce.
@@ -2921,7 +2927,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} je zaustavljen
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Barkod {0} se već koristi u artiklu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Najave događaja
@@ -2944,7 +2950,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Odaberite fiskalnu godinu ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS Profil potrebno da bi POS upis
 DocType: Hub Settings,Name Token,Ime Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Standardna prodaja
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Standardna prodaja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -3067,7 +3073,7 @@
 DocType: Sales Invoice,Paid Amount,Plaćeni iznos
 ,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"
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,"Postavljanje Ova adresa predloška kao zadano, jer nema drugog zadano"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje računa već u zaduženje, ne smiju postaviti 'ravnoteža se mora' kao 'kreditne'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,upravljanja kvalitetom
 DocType: Production Planning Tool,Filter based on customer,Filter temelji se na kupca
@@ -3168,7 +3174,7 @@
 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 +19,Shortage Qty,Nedostatak Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' To Date ' je potrebno
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generirajte pakovanje Slips za pakete dostaviti. Koristi se za obavijesti paket broja, sadržaj paket i njegove težine."
@@ -3179,7 +3185,7 @@
 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 &quot;Postavio&quot;, e-mail pop-up automatski otvorio poslati e-mail na povezane &quot;Kontakt&quot; 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 +749,It is needed to fetch Item Details.,Potrebno je da se donese Stavka Detalji.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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
@@ -3205,6 +3211,7 @@
 DocType: BOM,Manufacturing User,Proizvodnja korisnika
 DocType: Purchase Order,Raw Materials Supplied,Sirovine nabavlja
 DocType: Purchase Invoice,Recurring Print Format,Ponavlja Format
+DocType: C-Form,Series,serija
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,Stavka Klasifikacija
@@ -3291,7 +3298,7 @@
 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 +434,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 +420,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 ."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kupovina Master Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Proizvodnja Red {0} mora biti podnesen
@@ -3299,7 +3306,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Glavni izvještaji
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Do danas ne može biti prije od datuma
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Dodaj / Uredi cijene
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Moje narudžbe
@@ -3346,7 +3353,8 @@
 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} {1} za
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Sajt Slika {0} prilogu Stavka {1} ne može biti pronađena
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Row # {0}: Set dobavljač za stavku {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Sajt Slika {0} prilogu Stavka {1} ne može biti pronađena
 DocType: Issue,Content Type,Vrsta sadržaja
 apps/erpnext/erpnext/setup/setup_wizard/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.
@@ -3360,7 +3368,7 @@
 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 +357,'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 +351,'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
@@ -3386,7 +3394,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Zatvaranje računa {0} mora biti tipa odgovornosti / Equity
 DocType: Authorization Rule,Based On,Na osnovu
 DocType: Sales Order Item,Ordered Qty,Naručena kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Stavka {0} je onemogućeno
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +168,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.
@@ -3394,7 +3402,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Kupnja treba provjeriti, ako je primjenjivo za odabrano kao {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabatt mora biti manji od 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Otpis Iznos (poduzeća Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Row # {0}: Molimo set Ponovno redj količinu
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Row # {0}: Molimo set Ponovno redj količinu
 DocType: Landed Cost Voucher,Landed Cost Voucher,Sleteo Cost vaučera
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Molimo postavite {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ponovite na dan u mjesecu
@@ -3467,7 +3475,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Pregled Sada
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Odaberite razdoblje kada faktura će biti generiran automatski
 DocType: BOM,Raw Material Cost,Troškovi sirovina
-DocType: Item,Re-Order Level,Re-order Level
+DocType: Item Reorder,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.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Part - time
 DocType: Employee,Applicable Holiday List,Primjenjivo odmor Popis
@@ -3522,7 +3530,7 @@
 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 +573,Please specify Attribute Value for attribute {0},Molimo navedite vrijednost atributa za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3601,7 +3609,7 @@
 DocType: Address,Office,Ured
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Računovodstvene stavke
 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 +226,Please select Employee Record first.,Molimo odaberite zaposlenih Record prvi.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,Molimo odaberite zaposlenih Record prvi.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,Unesite trošak računa
@@ -3676,7 +3684,7 @@
 DocType: Item Attribute,Numeric Values,Brojčane vrijednosti
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Priložiti logo
 DocType: Customer,Commission Rate,Komisija Stopa
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Make Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Make Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Blok ostaviti aplikacija odjelu.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Košarica je prazna
 DocType: Production Order,Actual Operating Cost,Stvarni operativnih troškova
@@ -3693,15 +3701,14 @@
 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 +380,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 +419,"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 +408,"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 +380, (Half Day),(Pola dana)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index 660e5b7..6999b02 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% Facturat
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Tipus de canvi ha de ser el mateix que {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nom del client
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Compte bancari no pot ser nomenat com {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Compte bancari no pot ser nomenat com {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Excedent per {0} no pot ser menor que zero ({1})
@@ -47,7 +47,7 @@
 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&#39;inici
 apps/erpnext/erpnext/utilities/transaction_base.py +107,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 +206,New Leave Application,Nova aplicació Deixar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Nova aplicació Deixar
 apps/erpnext/erpnext/setup/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
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Bloc d'activitats realitzades pels usuaris durant les feines que es poden utilitzar per al seguiment del temps, facturació."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Nova {0}: # {1}
 ,Sales Partners Commission,Comissió dels revenedors
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Abreviatura no pot tenir més de 5 caràcters
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Abreviatura no pot tenir més de 5 caràcters
 DocType: Payment Request,Payment Request,Sol·licitud de Pagament
 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.",Atribut Valor {0} no es pot treure de {1} com Article Variants \ existeixen amb aquest atribut.
@@ -196,6 +196,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,Selecciona Termes i Condicions
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,valor fora
 DocType: Production Planning Tool,Sales Orders,Ordres de venda
 DocType: Purchase Taxes and Charges,Valuation,Valoració
 ,Purchase Order Trends,Compra Tendències Sol·licitar
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisió
 DocType: Production Order Operation,Updated via 'Time Log',Actualitzat a través de 'Hora de registre'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},El compte {0} no pertany a l'empresa {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},quantitat d&#39;avanç no pot ser més gran que {0} {1}
 DocType: Naming Series,Series List for this Transaction,Llista de Sèries per a aquesta transacció
 DocType: Sales Invoice,Is Opening Entry,És assentament d'obertura
 DocType: Customer Group,Mention if non-standard receivable account applicable,Esmenteu si compta per cobrar no estàndard aplicable
@@ -227,7 +229,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea nòmina per als criteris abans esmentats.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Cap descripció donada
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Sol·licitud de venda.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/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ó&gt; Configuració&gt; Sèrie Naming"
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Magatzem {0} no pertany a l'empresa {1}
 DocType: Item Website Specification,Item Website Specification,Especificacions d'article al Web
 DocType: Payment Tool,Reference No,Referència número
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Absència bloquejada
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Absència bloquejada
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Estoc Reconciliació article
 DocType: Stock Entry,Sales Invoice No,Factura No
@@ -249,7 +251,7 @@
 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 +606,Item {0} is cancelled,L'article {0} està cancel·lat
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,L'article {0} està cancel·lat
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Sol·licitud de materials
 DocType: Bank Reconciliation,Update Clearance Date,Actualització Data Liquidació
 DocType: Item,Purchase Details,Informació de compra
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Nota de lliurament
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configuració d&#39;Impostos
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} entrat dues vegades en l'Impost d'article
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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
@@ -329,7 +331,7 @@
 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 +215,Please see attachment,"Si us plau, vegeu el document adjunt"
 DocType: Purchase Order,% Received,% Rebut
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Configuració acabada !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Configuració acabada !!
 ,Finished Goods,Béns Acabats
 DocType: Delivery Note,Instructions,Instruccions
 DocType: Quality Inspection,Inspected By,Inspeccionat per
@@ -354,14 +356,13 @@
 ,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 +169,{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 +189,{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/setup_wizard/install_fixtures.py +39,Medical,Metge
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Motiu de pèrdua
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Estació de treball està tancada en les següents dates segons Llista de vacances: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Oportunitats
 DocType: Employee,Single,Solter
-DocType: Issue,Attachment,Accessori
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Pressupost no es pot establir de centres de cost Grup
 DocType: Account,Cost of Goods Sold,Cost de Vendes
 DocType: Purchase Invoice,Yearly,Anual
@@ -390,7 +391,7 @@
 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 +564,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 +550,Attribute {0} selected multiple times in Attributes Table,Atribut {0} seleccionat diverses vegades en la taula Atributs
 DocType: HR Settings,Employee record is created using selected field. ,Es crea el registre d'empleat utilitzant el camp seleccionat.
 DocType: Sales Order,Not Applicable,No Aplicable
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Mestre de vacances.
@@ -429,7 +430,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Productes cosmètics
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"To merge, following properties must be same for both items","Per fusionar, propietats han de ser el mateix per a tots dos articles"
 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
@@ -440,7 +441,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Subcontractació Gestió
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Compte {0} no pertany a la companyia: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Compte {0} no pertany a la companyia: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Abreviatura ja utilitzat per una altra empresa
 DocType: Selling Settings,Default Customer Group,Grup predeterminat Client
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Si ho desactives, el camp 'Arrodonir Total' no serà visible a cap transacció"
 DocType: BOM,Operating Cost,Cost de funcionament
@@ -476,6 +478,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,No es troben en la taula de registres de factures
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Seleccioneu de l'empresa i el Partit Tipus primer
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Exercici comptabilitat /.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Els valors acumulats
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Ho sentim, els números de sèrie no es poden combinar"
 DocType: Project Task,Project Task,Tasca del projecte
 ,Lead Id,Identificador del client potencial
@@ -497,7 +500,7 @@
 DocType: Quotation,Quotation To,Oferta per
 DocType: Lead,Middle Income,Ingrés Mig
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Obertura (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unitat de mesura per defecte per a l&#39;article {0} no es pot canviar directament perquè ja ha realitzat alguna transacció (s) amb una altra UOM. Vostè haurà de crear un nou element a utilitzar un UOM predeterminat diferent.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unitat de mesura per defecte per a l&#39;article {0} no es pot canviar directament perquè ja ha realitzat alguna transacció (s) amb una altra UOM. Vostè haurà de crear un nou element a utilitzar un UOM predeterminat diferent.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Suma assignat no pot ser negatiu
 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.
@@ -575,7 +578,7 @@
 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 +543,Item has variants.,L&#39;article té variants.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item has variants.,L&#39;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
@@ -588,6 +591,7 @@
 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 +33,Goods received from Suppliers.,Productes rebuts de proveïdors.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,en Valor
 DocType: Lead,Campaign Name,Nom de la campanya
 ,Reserved,Reservat
 DocType: Purchase Order,Supply Raw Materials,Subministrament de Matèries Primeres
@@ -602,16 +606,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,El Compte de la transacció existent no es pot convertir a llibre major
 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/stock/reorder_item.py +171,Auto Material Requests Generated,Les sol·licituds de material auto generada
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Les sol·licituds de material auto generada
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdut
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,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/setup_wizard/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.
 DocType: Item Group,Website Specifications,Especificacions del lloc web
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Hi ha un error en la seva plantilla de direcció {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Nou Compte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Des {0} de tipus {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Fila {0}: el factor de conversió és obligatori
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Regles Preu múltiples existeix amb el mateix criteri, si us plau, resoldre els conflictes mitjançant l&#39;assignació de prioritat. Regles de preus: {0}"
 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.,Entrades de Comptabilitat es poden fer en contra de nodes fulla. No es permeten els comentaris en contra dels grups.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,No es pot desactivar o cancel·lar BOM ja que està vinculat amb altres llistes de materials
 DocType: Opportunity,Maintenance,Manteniment
@@ -673,7 +679,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,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/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Advertència: no vàlida Adjunt {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Advertència: no vàlida Adjunt {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,No permission
 DocType: Company,Default Bank Account,Compte bancari per defecte
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Per filtrar la base de la festa, seleccioneu Partit Escrigui primer"
@@ -703,13 +709,13 @@
 DocType: Production Planning Tool,Select Items,Seleccionar elements
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} contra Bill {1} {2} de data
 DocType: Maintenance Visit,Completion Status,Estat de finalització
-DocType: Sales Invoice Item,Target Warehouse,Magatzem destí
+DocType: Production Order,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 +50,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/setup_wizard/install_fixtures.py +17,All Item Groups,Tots els grups d'articles
 DocType: Process Payroll,Activity Log,Registre d'activitat
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Guany/Pèrdua neta
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Guany/Pèrdua neta
 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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Estat és {2}
@@ -717,7 +723,7 @@
 DocType: Sales Order Item,Projected Qty,Quantitat projectada
 DocType: Sales Invoice,Payment Due Date,Data de pagament
 DocType: Newsletter,Newsletter Manager,Butlletí Administrador
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Article Variant {0} ja existeix amb els mateixos atributs
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Article Variant {0} ja existeix amb els mateixos atributs
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Obertura&#39;
 DocType: Notification Control,Delivery Note Message,Missatge de la Nota de lliurament
 DocType: Expense Claim,Expenses,Despeses
@@ -727,7 +733,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Investigació i Desenvolupament
 ,Amount to Bill,La quantitat a Bill
 DocType: Company,Registration Details,Detalls de registre
-DocType: Item,Re-Order Qty,Re-Quantitat
+DocType: Item Reorder,Re-Order Qty,Re-Quantitat
 DocType: Leave Block List Date,Leave Block List Date,Deixa Llista de bloqueig Data
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programat per enviar a {0}
 DocType: Pricing Rule,Price or Discount,Preu o Descompte
@@ -770,7 +776,7 @@
 DocType: Bank Reconciliation,Total Amount,Quantitat total
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publicant a Internet
 DocType: Production Planning Tool,Production Orders,Ordres de Producció
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Valor Saldo
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Valor Saldo
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Llista de preus de venda
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicar sincronitzar articles
 DocType: Bank Reconciliation,Account Currency,Compte moneda
@@ -779,7 +785,7 @@
 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 +538,Item Variants {0} updated,Article Variants {0} actualitza
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -856,7 +862,7 @@
 DocType: POS Profile,Cash/Bank Account,Compte de Caixa / Banc
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Taula d&#39;atributs és obligatori
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,Attribute table is mandatory,Taula d&#39;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/public/js/pos/pos.html +28,Discount,Descompte
@@ -884,7 +890,7 @@
 DocType: Tax Rule,Shipping State,Estat de l&#39;enviament
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,L'article ha de ser afegit usant 'Obtenir elements de rebuts de compra' botó
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Despeses de venda
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Compra Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Compra Standard
 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ó
@@ -926,7 +932,7 @@
 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 +210,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/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',"Si us plau, estableix &quot;Aplicar descompte addicional en &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',"Si us plau, estableix &quot;Aplicar descompte addicional en &#39;"
 ,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.
@@ -994,9 +1000,9 @@
 DocType: Contact,User ID,ID d'usuari
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Veure Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Earliest
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Fabricació contra ordre de vendes
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Resta del món
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1026,7 +1032,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Petit
 DocType: Employee,Employee Number,Número d'empleat
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Cas No (s) ja en ús. Intenta Cas n {0}
@@ -1045,7 +1051,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Els Productes o Serveis de la teva companyia
 DocType: Mode of Payment,Mode of Payment,Forma de pagament
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Lloc web imatge ha de ser un arxiu públic o URL del lloc web
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Lloc web imatge ha de ser un arxiu públic o URL del lloc web
 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
@@ -1117,6 +1123,7 @@
 DocType: Address,Utilities,Utilitats
 DocType: Purchase Invoice Item,Accounting,Comptabilitat
 DocType: Features Setup,Features Setup,Característiques del programa d'instal·lació
+DocType: Item,Is Service Item,És un servei
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Període d&#39;aplicació no pot ser període d&#39;assignació llicència fos
 DocType: Activity Cost,Projects,Projectes
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Seleccioneu l'any fiscal
@@ -1147,7 +1154,7 @@
 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 +465,cannot be greater than 100,no pot ser major que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Article {0} no és un article d'estoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1207,7 +1214,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Govern
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Variants de l&#39;article
 DocType: Company,Services,Serveis
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centre de Cost de Pares
 DocType: Sales Invoice,Source,Font
 DocType: Leave Type,Is Leave Without Pay,Es llicencia sense sou
@@ -1280,17 +1287,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Torneu a enviar el pagament per correu electrònic
 DocType: Dependent Task,Dependent Task,Tasca dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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&#39;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
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Veure
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Canvi Net en Efectiu
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Canvi Net en Efectiu
 DocType: Salary Structure Deduction,Salary Structure Deduction,Salary Structure Deduction
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Sol·licitud de pagament ja existeix {0}
 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 +182,Quantity must not be more than {0},La quantitat no ha de ser més de {0}
@@ -1352,7 +1359,7 @@
 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: Packed 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
@@ -1361,7 +1368,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Empresa, mes i de l'any fiscal és obligatòri"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Despeses de Màrqueting
 ,Item Shortage Report,Informe d'escassetat d'articles
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","S'esmenta Pes, \n Si us plau, ""Pes UOM"" massa"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","S'esmenta Pes, \n Si us plau, ""Pes UOM"" massa"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Sol·licitud de material utilitzat per fer aquesta entrada Stock
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Unitat individual d'un article
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',S'ha de 'Presentar' el registre de temps {0}
@@ -1372,6 +1379,7 @@
 DocType: Employee,Date Of Retirement,Data de la jubilació
 DocType: Upload Attendance,Get Template,Aconsegueix Plantilla
 DocType: Address,Postal,Postal
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,Configuració ERPNext completa!
 DocType: Item,Weightage,Weightage
 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"
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Seleccioneu {0} primer.
@@ -1400,12 +1408,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Massa columnes. Exporta l'informe i utilitza una aplicació de full de càlcul.
 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&#39;un client Ordre de Compra
-apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Inici
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Inici
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establir prefix de numeracions seriades a les transaccions
 DocType: Employee Attendance Tool,Employees HTML,Els empleats HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,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 +367,Default BOM ({0}) must be active for this item or its template,Per defecte la llista de materials ({0}) ha d&#39;estar actiu per aquest material o la seva plantilla
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Per defecte la llista de materials ({0}) ha d&#39;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
@@ -1430,7 +1438,6 @@
 DocType: Sales Order,To Deliver and Bill,Per Lliurar i Bill
 DocType: GL Entry,Credit Amount in Account Currency,Suma de crèdit en compte Moneda
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Registres de temps per a la seva fabricació.
-DocType: Item,Apply Warehouse-wise Reorder Level,Aplicar Warehouse-savi Nivell de Reabastament
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} ha de ser presentat
 DocType: Authorization Control,Authorization Control,Control d'Autorització
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: Magatzem Rebutjat és obligatori en la partida rebutjada {1}
@@ -1529,6 +1536,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,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ó {1} no s'ha completat per {2} Quantitat de productes acabats en ordre de producció # {3}. Si us plau, actualitzi l'estat de funcionament a través dels registres de temps"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Inversions
 DocType: Issue,Resolution Details,Resolució Detalls
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,les assignacions
 DocType: Quality Inspection Reading,Acceptance Criteria,Criteris d'acceptació
 DocType: Item Attribute,Attribute Name,Nom del Atribut
 DocType: Item Group,Show In Website,Mostra en el lloc web
@@ -1579,7 +1587,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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
 DocType: Leave Block List Allow,Leave Block List Allow,Leave Block List Allow
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr no pot estar en blanc o l&#39;espai
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr no pot estar en blanc o l&#39;espai
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grup de No-Grup
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Esports
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Actual total
@@ -1620,7 +1628,7 @@
 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 **.
 DocType: Opportunity,Customer / Lead Address,Client / Direcció Plom
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Avís: certificat SSL no vàlid en la inclinació {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Avís: certificat SSL no vàlid en la inclinació {0}
 DocType: Production Order Operation,Actual Operation Time,Temps real de funcionament
 DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuari)
 DocType: Purchase Taxes and Charges,Deduct,Deduir
@@ -1769,7 +1777,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Cas No. No pot 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 vostè té equip de vendes i Venda Partners (Socis de canal) que poden ser etiquetats i mantenir la seva contribució en l'activitat de vendes
 DocType: Item,Show a slideshow at the top of the page,Mostra una presentació de diapositives a la part superior de la pàgina
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Botigues
+DocType: Item,"Allow in Sales Order of type ""Service""",Deixi d&#39;ordres de venda de &quot;Servei&quot; Tipus
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Botigues
 DocType: Time Log,Projects Manager,Gerent de Projectes
 DocType: Serial No,Delivery Time,Temps de Lliurament
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Envelliment basat en
@@ -1794,7 +1803,7 @@
 ,Financial Analytics,Comptabilitat analítica
 DocType: Quality Inspection,Verified By,Verified Per
 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 es pot canviar moneda per defecte de l'empresa, perquè hi ha operacions existents. Les transaccions han de ser cancel·lades a canviar la moneda per defecte."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","No es pot canviar moneda per defecte de l'empresa, perquè hi ha operacions existents. Les transaccions han de ser cancel·lades a canviar la moneda per defecte."
 DocType: Quality Inspection,Purchase Receipt No,Número de rebut de compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Diners Earnest
 DocType: Process Payroll,Create Salary Slip,Crear fulla de nòmina
@@ -1842,7 +1851,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Matèries primeres no poden estar en blanc.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","No s&#39;ha pogut actualitzar valors, factura conté els articles de l&#39;enviament de la gota."
 DocType: Newsletter,Test,Prova
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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&#39;accions existents per aquest concepte, \ no pot canviar els valors de &#39;no té de sèrie&#39;, &#39;Té lot n&#39;, &#39;És de la Element &quot;i&quot; Mètode de valoració&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Seient Ràpida
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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
@@ -1951,7 +1960,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,"Si us plau, nota de lliurament primer"
 DocType: Purchase Invoice,Currency and Price List,Moneda i Preus
 DocType: Opportunity,Customer / Lead Name,nom del Client/Client Potencial
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,No s'esmenta l'espai de dates
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,No s'esmenta l'espai de dates
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Producció
 DocType: Item,Allow Production Order,Permetre Ordre de Producció
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Fila {0}: Data d'inici ha de ser anterior Data de finalització
@@ -1961,7 +1970,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
 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 +118,My Addresses,Els meus Direccions
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Els meus Direccions
 DocType: Stock Ledger Entry,Outgoing Rate,Sortint Rate
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Organization branch master.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,o
@@ -2030,7 +2039,7 @@
 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 +302,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 +95,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."
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impostos i despeses deduïdes
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Qüestions
@@ -2047,7 +2056,7 @@
 ,Sales Browser,Analista de Vendes
 DocType: Journal Entry,Total Credit,Crèdit Total
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Hi ha un altre {0} # {1} contra l&#39;entrada de població {2}: Són els
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Local
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Gran
@@ -2066,7 +2075,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Totes les transaccions de venda es poden etiquetar contra múltiples venedors ** ** perquè pugui establir i monitoritzar metes.
 ,S.O. No.,S.O. No.
 DocType: Production Order Operation,Make Time Log,Feu l'hora de registre
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Si us plau ajust la quantitat de comanda
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},"Si us plau, crea Client a partir del client potencial {0}"
 DocType: Price List,Applicable for Countries,Aplicable per als Països
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Ordinadors
@@ -2153,7 +2161,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Obtenir assentaments corresponents
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Entrada Comptabilitat de Stock
 DocType: Sales Invoice,Sales Team1,Equip de Vendes 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Article {0} no existeix
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Article {0} no existeix
 DocType: Sales Invoice,Customer Address,Direcció del client
 DocType: Payment Request,Recipient and Message,Del destinatari i el missatge
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar addicional de descompte en les
@@ -2195,7 +2203,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Tarifa de Valoració
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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
@@ -2233,7 +2241,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Please enter relieving date.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Només es poden presentar les Aplicacions d'absència amb estat ""Aprovat"""
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Títol d'adreça obligatori.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Títol d'adreça obligatori.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Introduïu el nom de la campanya si la font de la investigació és la campanya
 apps/erpnext/erpnext/setup/setup_wizard/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
@@ -2257,6 +2265,7 @@
 DocType: UOM,Must be Whole Number,Ha de ser nombre enter
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Noves Fulles Assignats (en dies)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,El número de sèrie {0} no existeix
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Magatzem al client (opcional)
 DocType: Pricing Rule,Discount Percentage,%Descompte
 DocType: Payment Reconciliation Invoice,Invoice Number,Número de factura
 apps/erpnext/erpnext/hooks.py +55,Orders,Ordres
@@ -2366,7 +2375,7 @@
 DocType: Appraisal,Appraisal,Avaluació
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data repetida
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Signant Autoritzat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,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 +184,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
@@ -2535,7 +2544,7 @@
 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ó
 DocType: Sales Order Item,Supplier delivers to Customer,Proveïdor lliura al Client
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Mostrar impostos ruptura
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Mostrar impostos ruptura
 apps/erpnext/erpnext/accounts/party.py +283,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&#39;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'
@@ -2585,7 +2594,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,"Si us plau, torneu a escriure nom de l&#39;empresa per confirmar"
@@ -2613,9 +2622,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Estructura salarial
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Múltiple Preu Regla existeix amb els mateixos criteris, si us plau resoldre \
- conflicte mitjançant l'assignació de prioritat. Regles Preu: {0}"
 DocType: Account,Bank,Banc
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aerolínia
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Material Issue
@@ -2640,7 +2646,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitat de mesura per defecte per Variant &#39;{0}&#39; ha de ser el mateix que a la plantilla &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitat de mesura per defecte per Variant &#39;{0}&#39; ha de ser el mateix que a la plantilla &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcula a causa del
 DocType: Delivery Note Item,From Warehouse,De Magatzem
 DocType: Purchase Taxes and Charges,Valuation and Total,Valoració i total
@@ -2649,7 +2655,7 @@
 DocType: Account,Purchase User,Usuari de compres
 DocType: Notification Control,Customize the Notification,Personalitza la Notificació
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Flux de caixa operatiu
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,La Plantilla de la direcció predeterminada no es pot eliminar
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,La Plantilla de la direcció predeterminada no es pot eliminar
 DocType: Sales Invoice,Shipping Rule,Regla d'enviament
 DocType: Manufacturer,Limited to 12 characters,Limitat a 12 caràcters
 DocType: Journal Entry,Print Heading,Imprimir Capçalera
@@ -2743,7 +2749,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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&#39;articles
 DocType: Cost Center,Distribution Id,ID de Distribució
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Serveis impressionants
@@ -2762,7 +2768,7 @@
 DocType: Customer,Default Receivable Accounts,Per defecte Comptes per cobrar
 DocType: Tax Rule,Billing State,Estat de facturació
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Transferència
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Fetch exploded BOM (including sub-assemblies)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,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 +95,Due Date is mandatory,Data de venciment és obligatori
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Increment de Atribut {0} no pot ser 0
@@ -2795,7 +2801,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Compte de guanys / pèrdues provisional (Crèdit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Compte de guanys / pèrdues provisional (Crèdit)
 DocType: Sales Invoice,Return Against Sales Invoice,Retorn Contra Vendes Factura
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Tema 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},"Si us plau, estableix el valor per defecte {0} a l'empresa {1}"
@@ -2826,6 +2832,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Afegir Nen
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Paper deixa forjar congelats Comptes i editar les entrades congelades
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"No es pot convertir de centres de cost per al llibre major, ja que té nodes secundaris"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Valor d&#39;obertura
 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,Comissió de Vendes
 DocType: Offer Letter Term,Value / Description,Valor / Descripció
@@ -2859,7 +2866,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Eliminat correctament totes les transaccions relacionades amb aquesta empresa!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Com en la data
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probation
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,El magatzem predeterminat és obligatòria pels articles d'estoc
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},El pagament del salari corresponent al mes {0} i {1} anys
 DocType: Stock Settings,Auto insert Price List rate if missing,Acte inserit taxa Llista de Preus si falta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Suma total de pagament
@@ -2895,7 +2901,7 @@
 DocType: Payment Tool,Set Matching Amounts,Establir sumes a joc
 DocType: Purchase Invoice,Taxes and Charges Added,Impostos i càrregues afegides
 ,Sales Funnel,Sales Funnel
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Abreviatura és obligatori
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Abreviatura és obligatori
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Gràcies pel seu interès en subscriure-vos-hi
 ,Qty to Transfer,Quantitat a Transferir
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotitzacions a clients potencials o a clients.
@@ -2923,7 +2929,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} està aturat
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Barcode {0} ja utilitzat en el punt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Pròxims esdeveniments
@@ -2946,7 +2952,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Seleccioneu l'Any Fiscal ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS perfil requerit per fer l&#39;entrada POS
 DocType: Hub Settings,Name Token,Nom Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Standard Selling
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -3069,7 +3075,7 @@
 DocType: Sales Invoice,Paid Amount,Quantitat pagada
 ,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
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo del compte ja en dèbit, no se li permet establir ""El balanç ha de ser"" com ""crèdit"""
 apps/erpnext/erpnext/setup/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
@@ -3170,7 +3176,7 @@
 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 +19,Shortage Qty,Quantitat escassetat
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Hi ha la variant d&#39;article {0} amb mateixos atributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Hi ha la variant d&#39;article {0} amb mateixos atributs
 DocType: Salary Slip,Salary Slip,Slip Salari
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Per Dóna't' es requereix
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generar albarans paquets que es lliuraran. S'utilitza per notificar el nombre de paquets, el contingut del paquet i el seu pes."
@@ -3181,7 +3187,7 @@
 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 +749,It is needed to fetch Item Details.,Es necessita a cercar Detalls de l&#39;article.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,It is needed to fetch Item Details.,Es necessita a cercar Detalls de l&#39;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
@@ -3207,6 +3213,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&#39;impressió
+DocType: C-Form,Series,Sèrie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,Classificació d'articles
@@ -3293,7 +3300,7 @@
 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 +434,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 +420,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"
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Administraodr principal de compres
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,L'Ordre de Producció {0} ha d'estar Presentada
@@ -3301,7 +3308,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Informes principals
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Fins a la data no pot ser anterior a partir de la data
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc Doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Afegeix / Edita Preus
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Les meves comandes
@@ -3349,7 +3356,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunt de Proveïdors per a l&#39;element {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Lloc web Imatge {0} unit a l&#39;article {1} no es pot trobar
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Lloc web Imatge {0} unit a l&#39;article {1} no es pot trobar
 DocType: Issue,Content Type,Tipus de Contingut
 apps/erpnext/erpnext/setup/setup_wizard/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.
@@ -3363,7 +3370,7 @@
 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 +357,'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 +351,'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
@@ -3389,7 +3396,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Compte {0} Cloenda ha de ser de Responsabilitat / Patrimoni
 DocType: Authorization Rule,Based On,Basat en
 DocType: Sales Order Item,Ordered Qty,Quantitat demanada
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Article {0} està deshabilitat
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +168,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.
@@ -3397,7 +3404,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Compra de comprovar, si es selecciona aplicable Perquè {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Descompte ha de ser inferior a 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Escriu Off Import (Companyia moneda)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Fila # {0}: Configureu la quantitat de comanda
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Fila # {0}: Configureu la quantitat de comanda
 DocType: Landed Cost Voucher,Landed Cost Voucher,Val Landed Cost
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Si us plau, estableix {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Repetiu el Dia del Mes
@@ -3470,7 +3477,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Veure ara
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Seleccioneu el període en què la factura es generarà de forma automàtica
 DocType: BOM,Raw Material Cost,Matèria primera Cost
-DocType: Item,Re-Order Level,Re-Order Nivell
+DocType: Item Reorder,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.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Temps parcial
 DocType: Employee,Applicable Holiday List,Llista de vacances aplicable
@@ -3525,7 +3532,7 @@
 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 +573,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l&#39;atribut {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l&#39;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}
@@ -3604,7 +3611,7 @@
 DocType: Address,Office,Oficina
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Entrades de diari de Comptabilitat.
 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 +226,Please select Employee Record first.,Seleccioneu Employee Record primer.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,Seleccioneu Employee Record primer.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,Si us plau ingressi Compte de Despeses
@@ -3679,7 +3686,7 @@
 DocType: Item Attribute,Numeric Values,Els valors numèrics
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Adjuntar Logo
 DocType: Customer,Commission Rate,Percentatge de comissió
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Fer Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Fer Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Bloquejar sol·licituds d'absències per departament.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,El carret està buit
 DocType: Production Order,Actual Operating Cost,Cost de funcionament real
@@ -3696,15 +3703,14 @@
 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 +380,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 +419,"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&#39;articles"
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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&#39;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 +380, (Half Day),(Mig dia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Obtenir elements de la llista de materials
diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv
index 38b95f8..c814cc4 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% Fakturováno
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Exchange Rate musí být stejná jako {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Jméno zákazníka
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Bankovní účet nemůže být jmenován jako {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Bankovní účet nemůže být jmenován jako {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Vynikající pro {0} nemůže být nižší než nula ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,New Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,New Leave Application
 apps/erpnext/erpnext/setup/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
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log činností vykonávaných uživateli proti úkoly, které mohou být použity pro sledování času, fakturaci."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Nový {0}: # {1}
 ,Sales Partners Commission,Obchodní partneři Komise
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Zkratka nesmí mít více než 5 znaků
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Zkratka nesmí mít více než 5 znaků
 DocType: Payment Request,Payment Request,Platba Poptávka
 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.",Atribut Hodnota {0} nemůže být odstraněn z {1} jako položka Varianty \ existovat tohoto atributu.
@@ -196,6 +196,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,Vyberte Podmínky
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,limitu
 DocType: Production Planning Tool,Sales Orders,Prodejní objednávky
 DocType: Purchase Taxes and Charges,Valuation,Ocenění
 ,Purchase Order Trends,Nákupní objednávka trendy
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televize
 DocType: Production Order Operation,Updated via 'Time Log',"Aktualizováno přes ""Time Log"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Účet {0} nepatří do společnosti {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Množství předem nemůže být větší než {0} {1}
 DocType: Naming Series,Series List for this Transaction,Řada seznam pro tuto transakci
 DocType: Sales Invoice,Is Opening Entry,Je vstupní otvor
 DocType: Customer Group,Mention if non-standard receivable account applicable,Zmínka v případě nestandardní pohledávky účet použitelná
@@ -227,7 +229,7 @@
 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/templates/generators/item.html +30,No description given,No vzhledem k tomu popis
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Žádost o koupi.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/setup_wizard/install_fixtures.py +172,Leaves per Year,Dovolených 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í&gt; Nastavení&gt; Naming Série
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Sklad {0} nepatří ke společnosti {1}
 DocType: Item Website Specification,Item Website Specification,Položka webových stránek Specifikace
 DocType: Payment Tool,Reference No,Referenční číslo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Absence blokována
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Absence blokována
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,Annual,Roční
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Reklamní Odsouhlasení Item
 DocType: Stock Entry,Sales Invoice No,Prodejní faktuře č
@@ -249,7 +251,7 @@
 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 +606,Item {0} is cancelled,Položka {0} je zrušen
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Položka {0} je zrušen
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Požadavek na materiál
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizace Výprodej Datum
 DocType: Item,Purchase Details,Nákup Podrobnosti
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Dodací list
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Nastavení Daně
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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
@@ -329,7 +331,7 @@
 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 +215,Please see attachment,"Prosím, viz příloha"
 DocType: Purchase Order,% Received,% Přijaté
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Setup již dokončen !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Setup již dokončen !!
 ,Finished Goods,Hotové zboží
 DocType: Delivery Note,Instructions,Instrukce
 DocType: Quality Inspection,Inspected By,Zkontrolován
@@ -354,14 +356,13 @@
 ,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 +169,{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 +189,{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/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
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation je uzavřena v následujících dnech podle Prázdninový Seznam: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Příležitosti
 DocType: Employee,Single,Jednolůžkový
-DocType: Issue,Attachment,Příloha
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Rozpočet nelze nastavit pro skupinu nákladového střediska
 DocType: Account,Cost of Goods Sold,Náklady na prodej zboží
 DocType: Purchase Invoice,Yearly,Ročně
@@ -390,7 +391,7 @@
 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 +564,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 +550,Attribute {0} selected multiple times in Attributes Table,Atribut {0} vybraný několikrát v atributech tabulce
 DocType: HR Settings,Employee record is created using selected field. ,Záznam Zaměstnanec je vytvořena pomocí vybrané pole.
 DocType: Sales Order,Not Applicable,Nehodí se
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Holiday master.
@@ -429,7 +430,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"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: Shipping Rule,Net Weight,Hmotnost
 DocType: Employee,Emergency Phone,Nouzový telefon
 ,Serial No Warranty Expiry,Pořadové č záruční lhůty
@@ -440,7 +441,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Správa Subdodávky
 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"
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Účet {0} nepatří k firmě: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Účet {0} nepatří k firmě: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Zkratka již použit pro jinou společnost
 DocType: Selling Settings,Default Customer Group,Výchozí Customer Group
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Je-li zakázat, ""zaokrouhlí celková"" pole nebude viditelný v jakékoli transakce"
 DocType: BOM,Operating Cost,Provozní náklady
@@ -476,6 +478,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Nalezené v tabulce faktury Žádné záznamy
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vyberte první společnost a Party Typ
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Finanční / Účetní rok.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Neuhrazená Hodnoty
 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"
 DocType: Project Task,Project Task,Úkol Project
 ,Lead Id,Id leadu
@@ -497,7 +500,7 @@
 DocType: Quotation,Quotation To,Nabídka 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/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Výchozí měrná jednotka bodu {0} nemůže být změněna přímo, protože jste už nějaké transakce (y) s jiným nerozpuštěných. Budete muset vytvořit novou položku použít jiný výchozí UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Výchozí měrná jednotka bodu {0} nemůže být změněna přímo, protože jste už nějaké transakce (y) s jiným nerozpuštěných. Budete muset vytvořit novou položku použít jiný výchozí UOM."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Přidělená částka nemůže být záporná
 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."
@@ -575,7 +578,7 @@
 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 +543,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -588,6 +591,7 @@
 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 +33,Goods received from Suppliers.,Zboží od dodavatelů.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,v Hodnota
 DocType: Lead,Campaign Name,Název kampaně
 ,Reserved,Rezervováno
 DocType: Purchase Order,Supply Raw Materials,Dodávek surovin
@@ -602,16 +606,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Účet s transakcemi nelze převést na hlavní účetní knihu
 DocType: Delivery Note,Customer's Purchase Order No,Zákazníka Objednávka No
 DocType: Employee,Cell Number,Číslo buňky
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Žádosti Auto materiál vygenerovaný
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Žádosti Auto materiál vygenerovaný
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Ztracený
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,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/setup_wizard/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í.
 DocType: Item Group,Website Specifications,Webových stránek Specifikace
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Tam je chyba v adrese šabloně {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Nový účet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} typu {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Více Cena pravidla existuje u stejných kritérií, prosím vyřešit konflikt tím, že přiřadí prioritu. Cena Pravidla: {0}"
 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.,Účetní Přihlášky lze proti koncové uzly. Záznamy proti skupinám nejsou povoleny.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nelze deaktivovat nebo zrušit BOM, jak to souvisí s ostatními kusovníky"
 DocType: Opportunity,Maintenance,Údržba
@@ -673,7 +679,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,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/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Varování: Neplatná Příloha {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Varování: Neplatná Příloha {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nemáte oprávnění
 DocType: Company,Default Bank Account,Výchozí Bankovní účet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Chcete-li filtrovat na základě Party, vyberte typ Party první"
@@ -703,13 +709,13 @@
 DocType: Production Planning Tool,Select Items,Vyberte položky
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} proti účtence {1} ze dne {2}
 DocType: Maintenance Visit,Completion Status,Dokončení Status
-DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
+DocType: Production Order,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 +50,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/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 +34,Net Profit / Loss,Čistý zisk / ztráta
 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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} je stav {2}
@@ -717,7 +723,7 @@
 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
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Bod Variant {0} již existuje se stejnými vlastnostmi
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Bod Variant {0} již existuje se stejnými vlastnostmi
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Otevření&quot;
 DocType: Notification Control,Delivery Note Message,Delivery Note Message
 DocType: Expense Claim,Expenses,Výdaje
@@ -727,7 +733,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Výzkum a vývoj
 ,Amount to Bill,Částka k Fakturaci
 DocType: Company,Registration Details,Registrace Podrobnosti
-DocType: Item,Re-Order Qty,Re-Order Množství
+DocType: Item Reorder,Re-Order Qty,Re-Order Množství
 DocType: Leave Block List Date,Leave Block List Date,Nechte Block List Datum
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Plánované poslat na {0}
 DocType: Pricing Rule,Price or Discount,Cena nebo Sleva
@@ -770,7 +776,7 @@
 DocType: Bank Reconciliation,Total Amount,Celková částka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Výrobní Objednávky
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Zůstatek Hodnota
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Zůstatek Hodnota
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Prodejní ceník
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikování synchronizovat položky
 DocType: Bank Reconciliation,Account Currency,Měna účtu
@@ -779,7 +785,7 @@
 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 +538,Item Variants {0} updated,Bod Varianty {0} aktualizováno
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -856,7 +862,7 @@
 DocType: POS Profile,Cash/Bank Account,Hotovostní / Bankovní účet
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Atribut tabulka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Sleva
@@ -884,7 +890,7 @@
 DocType: Tax Rule,Shipping State,Přepravní State
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Položka musí být přidány pomocí ""získat předměty z kupní příjmy"" tlačítkem"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Prodejní náklady
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Standardní Nakupování
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Standardní Nakupování
 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
@@ -926,7 +932,7 @@
 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 +210,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/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Prosím nastavte na &quot;Použít dodatečnou slevu On&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Prosím nastavte na &quot;Použít dodatečnou slevu On&quot;
 ,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.
@@ -994,9 +1000,9 @@
 DocType: Contact,User ID,User ID
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,View Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Nejstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Výroba na odběratele
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Zbytek světa
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1026,7 +1032,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Malý
 DocType: Employee,Employee Number,Počet zaměstnanců
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Případ číslo (čísla) již v provozu. Zkuste se věc č {0}
@@ -1045,7 +1051,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Zemědělství
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Vaše Produkty nebo Služby
 DocType: Mode of Payment,Mode of Payment,Způsob platby
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Webové stránky Image by měla být veřejná souboru nebo webové stránky URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Webové stránky Image by měla být veřejná souboru nebo webové stránky URL
 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
@@ -1117,6 +1123,7 @@
 DocType: Address,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,Účetnictví
 DocType: Features Setup,Features Setup,Nastavení Funkcí
+DocType: Item,Is Service Item,Je Service Item
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Období pro podávání žádostí nemůže být alokační období venku volno
 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"
@@ -1147,7 +1154,7 @@
 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 +465,cannot be greater than 100,nemůže být větší než 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Položka {0} není skladem
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1207,7 +1214,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Vláda
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Položka Varianty
 DocType: Company,Services,Služby
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Celkem ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Celkem ({0})
 DocType: Cost Center,Parent Cost Center,Nadřazené Nákladové středisko
 DocType: Sales Invoice,Source,Zdroj
 DocType: Leave Type,Is Leave Without Pay,Je odejít bez Pay
@@ -1280,17 +1287,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Znovu poslat e-mail Payment
 DocType: Dependent Task,Dependent Task,Závislý Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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í
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Zobrazit
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Čistá změna v hotovosti
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Čistá změna v hotovosti
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plat Struktura Odpočet
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Platba Poptávka již existuje {0}
 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 +182,Quantity must not be more than {0},Množství nesmí být větší než {0}
@@ -1352,7 +1359,7 @@
 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: Packed 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í
@@ -1361,7 +1368,7 @@
 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ý"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Marketingové náklady
 ,Item Shortage Report,Položka Nedostatek Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnost je uvedeno, \n uveďte prosím ""váha UOM"" příliš"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnost je uvedeno, \n uveďte prosím ""váha UOM"" příliš"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiál Žádost používá k výrobě této populace Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Single jednotka položky.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',"Time Log Batch {0} musí být ""Odesláno"""
@@ -1372,6 +1379,7 @@
 DocType: Employee,Date Of Retirement,Datum odchodu do důchodu
 DocType: Upload Attendance,Get Template,Získat šablonu
 DocType: Address,Postal,Poštovní
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 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ů"
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,"Prosím, vyberte {0} jako první."
@@ -1400,12 +1408,12 @@
 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,Povolit více Prodejní objednávky proti Zákazníka Objednávky
-apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Hlavní
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Hlavní
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Varianta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
 DocType: Employee Attendance Tool,Employees HTML,zaměstnanci HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,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 +367,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/stock/doctype/item/item.py +361,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?,Dovolená proplacena?
 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
@@ -1430,7 +1438,6 @@
 DocType: Sales Order,To Deliver and Bill,Dodat a Bill
 DocType: GL Entry,Credit Amount in Account Currency,Kreditní Částka v měně účtu
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Čas Protokoly pro výrobu.
-DocType: Item,Apply Warehouse-wise Reorder Level,Použít Skladovací-moudrý Seřadit sezn Level
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} musí být předloženy
 DocType: Authorization Control,Authorization Control,Autorizace Control
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Řádek # {0}: Zamítnutí Warehouse je povinná proti zamítnuté bodu {1}
@@ -1529,6 +1536,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,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/hr/doctype/leave_type/leave_type.js +3,Allocations,alokace
 DocType: Quality Inspection Reading,Acceptance Criteria,Kritéria přijetí
 DocType: Item Attribute,Attribute Name,Název atributu
 DocType: Item Group,Show In Website,Show pro webové stránky
@@ -1579,7 +1587,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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
 DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Zkrácená nemůže být prázdné nebo prostor
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Zkrácená nemůže být prázdné nebo prostor
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Skupina na Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportovní
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Celkem Aktuální
@@ -1620,7 +1628,7 @@
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Varování: Neplatný certifikát SSL na přílohu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Varování: Neplatný certifikát SSL na přílohu {0}
 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
@@ -1769,7 +1777,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Případ č nemůže být 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,"Máte-li prodejní tým a prodej Partners (obchodních partnerů), které mohou být označeny a udržovat svůj příspěvek v prodejní činnosti"
 DocType: Item,Show a slideshow at the top of the page,Ukazují prezentaci v horní části stránky
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Obchody
+DocType: Item,"Allow in Sales Order of type ""Service""",Povolit v prodejní objednávce typu &quot;služby&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Obchody
 DocType: Time Log,Projects Manager,Správce projektů
 DocType: Serial No,Delivery Time,Dodací lhůta
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Stárnutí dle
@@ -1794,7 +1803,7 @@
 ,Financial Analytics,Finanční Analýza
 DocType: Quality Inspection,Verified By,Verified By
 DocType: Address,Subsidiary,Dceřiný
-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.","Nelze změnit výchozí měně společnosti, protože tam jsou stávající transakce. Transakce musí být zrušena, aby změnit výchozí měnu."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nelze změnit výchozí měně společnosti, protože tam jsou stávající transakce. Transakce musí být zrušena, aby změnit výchozí měnu."
 DocType: Quality Inspection,Purchase Receipt No,Číslo příjmky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
 DocType: Process Payroll,Create Salary Slip,Vytvořit výplatní pásce
@@ -1842,7 +1851,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Nelze aktualizovat zásob, faktura obsahuje pokles lodní dopravy zboží."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 &quot;Má sériové číslo&quot;, &quot;má Batch Ne&quot;, &quot;Je skladem&quot; a &quot;ocenění Method&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Rychlý vstup Journal
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
@@ -1951,7 +1960,7 @@
 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
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Výprodej Datum není uvedeno
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Výprodej Datum není uvedeno
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Výroba
 DocType: Item,Allow Production Order,Povolit výrobní objednávky
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,"Row {0}: datum zahájení, musí být před koncem roku Datum"
@@ -1961,7 +1970,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 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 +118,My Addresses,Moje Adresy
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Moje Adresy
 DocType: Stock Ledger Entry,Outgoing Rate,Odchozí Rate
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Organizace větev master.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,nebo
@@ -2030,7 +2039,7 @@
 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 +302,New Cost Center Name,Jméno Nového Nákladového Střediska
 DocType: Leave Control Panel,Leave Control Panel,Ovládací panel dovolených
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,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."
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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
 DocType: Purchase Invoice,Taxes and Charges Deducted,Daně a odečtené
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Problémy
@@ -2047,7 +2056,7 @@
 ,Sales Browser,Sales Browser
 DocType: Journal Entry,Total Credit,Celkový Credit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Upozornění: dalším {0} č. {1} existuje proti pohybu skladu {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Místní
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,Local,Místní
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Úvěry a zálohy (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/setup_wizard/install_fixtures.py +147,Large,Velký
@@ -2066,7 +2075,6 @@
 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/stock/doctype/item/item.py +422,Please set reorder quantity,Prosím nastavte množství objednací
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Prosím vytvořte Zákazník z olova {0}
 DocType: Price List,Applicable for Countries,Pro země
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Počítače
@@ -2153,7 +2161,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Získat příslušné zápisy
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Účetní položka na skladě
 DocType: Sales Invoice,Sales Team1,Sales Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Bod {0} neexistuje
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Bod {0} neexistuje
 DocType: Sales Invoice,Customer Address,Zákazník Address
 DocType: Payment Request,Recipient and Message,Příjemce a zpráv
 DocType: Purchase Invoice,Apply Additional Discount On,Použít dodatečné Sleva na
@@ -2195,7 +2203,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Ocenění Rate
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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
@@ -2233,7 +2241,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Zadejte zmírnění datum.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Nechte pouze aplikace s status ""schváleno"" může být předloženy"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Adresa Název je povinný.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Adresa Název je povinný.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Zadejte název kampaně, pokud zdroj šetření je kampaň"
 apps/erpnext/erpnext/setup/setup_wizard/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
@@ -2257,6 +2265,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: Sales Invoice Item,Customer Warehouse (Optional),Zákazník Warehouse (volitelně)
 DocType: Pricing Rule,Discount Percentage,Sleva v procentech
 DocType: Payment Reconciliation Invoice,Invoice Number,Číslo faktury
 apps/erpnext/erpnext/hooks.py +55,Orders,Objednávky
@@ -2366,7 +2375,7 @@
 DocType: Appraisal,Appraisal,Ocenění
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum se opakuje
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Prokurista
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,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 +184,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
@@ -2535,7 +2544,7 @@
 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
 DocType: Sales Order Item,Supplier delivers to Customer,Dodavatel doručí zákazníkovi
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Show daň break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Show daň break-up
 apps/erpnext/erpnext/accounts/party.py +283,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í"""
@@ -2585,7 +2594,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,Prosím re-typ název společnosti na potvrzení
@@ -2612,9 +2621,6 @@
 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í
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Plat struktura
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Multiple Cena existuje pravidlo se stejnými kritérii, prosím vyřešit \
- konflikt přiřazením prioritu. Cena Pravidla: {0}"
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Letecká linka
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Vydání Material
@@ -2639,7 +2645,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Cenné papíry a komoditních burzách
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Výchozí měrná jednotka varianty &#39;{0}&#39; musí být stejný jako v Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Výchozí měrná jednotka varianty &#39;{0}&#39; musí být stejný jako v Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Vypočítat založené na
 DocType: Delivery Note Item,From Warehouse,Ze skladu
 DocType: Purchase Taxes and Charges,Valuation and Total,Oceňování a Total
@@ -2648,7 +2654,7 @@
 DocType: Account,Purchase User,Nákup Uživatel
 DocType: Notification Control,Customize the Notification,Přizpůsobit oznámení
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Cash flow z provozních činností
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Výchozí šablony adresy nemůže být smazán
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Výchozí šablony adresy nemůže být smazán
 DocType: Sales Invoice,Shipping Rule,Pravidlo dopravy
 DocType: Manufacturer,Limited to 12 characters,Omezeno na 12 znaků
 DocType: Journal Entry,Print Heading,Tisk záhlaví
@@ -2742,7 +2748,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,Obchodní
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Skvělé služby
@@ -2761,7 +2767,7 @@
 DocType: Customer,Default Receivable Accounts,Výchozí pohledávka účty
 DocType: Tax Rule,Billing State,Fakturace State
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Převod
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,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 +642,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 +95,Due Date is mandatory,Datum splatnosti je povinné
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Přírůstek pro atribut {0} nemůže být 0
@@ -2794,7 +2800,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Prozatímní Zisk / ztráta (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Prozatímní Zisk / ztráta (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Návrat proti prodejní faktuře
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Bod 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Prosím nastavte výchozí hodnotu {0} ve společnosti {1}
@@ -2825,6 +2831,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Přidat dítě
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Role povoleno nastavit zmrazené účty a upravit Mražené Příspěvky
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Nelze převést nákladového střediska na knihy, protože má podřízené uzly"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,otevření Value
 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,Provize z prodeje
 DocType: Offer Letter Term,Value / Description,Hodnota / Popis
@@ -2858,7 +2865,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Úspěšně vypouští všechny transakce související s tímto společnosti!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Stejně jako u Date
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Zkouška
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Výchozí Sklad je povinný pro živočišnou položky.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Platba platu za měsíc {0} a rok {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto vložka Ceník sazba, pokud chybí"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Celkem uhrazené částky
@@ -2894,7 +2900,7 @@
 DocType: Payment Tool,Set Matching Amounts,Nastavit Odpovídající Částky
 DocType: Purchase Invoice,Taxes and Charges Added,Daně a poplatky přidané
 ,Sales Funnel,Prodej Nálevka
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Zkratka je povinné
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Zkratka je povinné
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Děkujeme Vám za Váš zájem o přihlášení do našich aktualizací
 ,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
@@ -2922,7 +2928,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} je zastaven
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Připravované akce
@@ -2945,7 +2951,7 @@
 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 +458,POS Profile required to make POS Entry,"POS Profile požadováno, aby POS Vstup"
 DocType: Hub Settings,Name Token,Jméno Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Standardní prodejní
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Standardní prodejní
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -3068,7 +3074,7 @@
 DocType: Sales Invoice,Paid Amount,Uhrazené částky
 ,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í"
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"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/setup_wizard/install_fixtures.py +76,Quality Management,Řízení kvality
 DocType: Production Planning Tool,Filter based on customer,Filtr dle zákazníka
@@ -3169,7 +3175,7 @@
 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 +19,Shortage Qty,Nedostatek Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
 DocType: Salary Slip,Salary Slip,Výplatní páska
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Datum DO"" je povinné"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generování balení pásky pro obaly mají být dodány. Používá se k oznámit číslo balíku, obsah balení a jeho hmotnost."
@@ -3180,7 +3186,7 @@
 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 +749,It is needed to fetch Item Details.,"Je třeba, aby přinesla Detaily položky."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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
@@ -3206,6 +3212,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: C-Form,Series,Série
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,Položka Klasifikace
@@ -3292,7 +3299,7 @@
 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 +434,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 +420,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."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nákup Hlavní manažer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Výrobní zakázka {0} musí být předloženy
@@ -3300,7 +3307,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Hlavní zprávy
 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
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Přidat / Upravit ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Moje objednávky
@@ -3348,7 +3355,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Řádek # {0}: Nastavte Dodavatel pro položku {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Webové stránky Image {0} připojuje k bodu {1} nelze nalézt
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Webové stránky Image {0} připojuje k bodu {1} nelze nalézt
 DocType: Issue,Content Type,Typ obsahu
 apps/erpnext/erpnext/setup/setup_wizard/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.
@@ -3362,7 +3369,7 @@
 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 +357,'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 +351,'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
@@ -3388,7 +3395,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Závěrečný účet {0} musí být typu odpovědnosti / Equity
 DocType: Authorization Rule,Based On,Založeno na
 DocType: Sales Order Item,Ordered Qty,Objednáno Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Položka {0} je zakázána
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +168,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.
@@ -3396,7 +3403,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Nákup musí být zkontrolováno, v případě potřeby pro vybrán jako {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Sleva musí být menší než 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Odepsat Částka (Company měny)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Řádek # {0}: Prosím nastavte množství objednací
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Řádek # {0}: Prosím nastavte množství objednací
 DocType: Landed Cost Voucher,Landed Cost Voucher,Přistálo Náklady Voucher
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Prosím nastavte {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Opakujte na den v měsíci
@@ -3469,7 +3476,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Zobrazit nyní
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Vyberte období, kdy faktura budou generovány automaticky"
 DocType: BOM,Raw Material Cost,Cena surovin
-DocType: Item,Re-Order Level,Re-Order Level
+DocType: Item Reorder,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."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Použitelný Seznam Svátků
@@ -3524,7 +3531,7 @@
 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 +573,Please specify Attribute Value for attribute {0},Uveďte prosím atributu Hodnota atributu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3603,7 +3610,7 @@
 DocType: Address,Office,Kancelář
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Zápisy v účetním deníku.
 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 +226,Please select Employee Record first.,"Prosím, vyberte zaměstnance záznam první."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,"Prosím, vyberte zaměstnance záznam první."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
@@ -3678,7 +3685,7 @@
 DocType: Item Attribute,Numeric Values,Číselné hodnoty
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Připojit Logo
 DocType: Customer,Commission Rate,Výše provize
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Udělat Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Udělat Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Aplikace Block dovolené podle oddělení.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Košík je prázdný
 DocType: Production Order,Actual Operating Cost,Skutečné provozní náklady
@@ -3695,15 +3702,14 @@
 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 +380,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 +419,"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 +408,"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 +380, (Half Day),(půlden)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,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 15ce9fa..b39d166 100644
--- a/erpnext/translations/da-DK.csv
+++ b/erpnext/translations/da-DK.csv
@@ -42,7 +42,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Ny Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Ny Leave Application
 apps/erpnext/erpnext/setup/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
@@ -75,7 +75,7 @@
 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 +129,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
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Forkortelse kan ikke have mere end 5 tegn
 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}
@@ -203,7 +203,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Opretter lønseddel for ovennævnte kriterier.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Ingen beskrivelse
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Anmodning om køb.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/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&gt; Indstillinger&gt; Navngivning Series
@@ -212,8 +212,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Warehouse {0} ikke hører til virksomheden {1}
 DocType: Item Website Specification,Item Website Specification,Item Website Specification
 DocType: Payment Tool,Reference No,Referencenummer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Lad Blokeret
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Lad Blokeret
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,Annual,Årligt
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Afstemning Item
 DocType: Stock Entry,Sales Invoice No,Salg faktura nr
@@ -225,7 +225,7 @@
 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 +606,Item {0} is cancelled,Vare {0} er aflyst
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Vare {0} er aflyst
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Materiale Request
 DocType: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
 DocType: Item,Purchase Details,Køb Detaljer
@@ -266,7 +266,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Følgeseddel
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Opsætning Skatter
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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"
@@ -290,7 +290,7 @@
 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 +215,Please see attachment,Se venligst vedhæftede
 DocType: Purchase Order,% Received,% Modtaget
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Opsætning Allerede Complete !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Opsætning Allerede Complete !!
 ,Finished Goods,Færdigvarer
 DocType: Delivery Note,Instructions,Instruktioner
 DocType: Quality Inspection,Inspected By,Inspiceres af
@@ -314,12 +314,11 @@
 ,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 +169,{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 +189,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), skal have rollen 'Godkendelse af fravær'"
 apps/erpnext/erpnext/setup/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/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
@@ -380,7 +379,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"To merge, following properties must be same for both items","At fusionere, skal følgende egenskaber være ens for begge poster"
 DocType: Shipping Rule,Net Weight,Vægt
 DocType: Employee,Emergency Phone,Emergency Phone
 ,Serial No Warranty Expiry,Seriel Ingen garanti Udløb
@@ -390,7 +389,7 @@
 DocType: Account,Profit and Loss,Resultatopgørelse
 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}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,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, &#39;Afrundet Total&#39; felt, vil ikke være synlig i enhver transaktion"
 DocType: BOM,Operating Cost,Driftsomkostninger
@@ -508,7 +507,7 @@
 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 +543,Item has variants.,Element har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -613,13 +612,13 @@
 DocType: Production Planning Tool,Select Items,Vælg emner
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} mod regning {1} dateret {2}
 DocType: Maintenance Visit,Completion Status,Afslutning status
-DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
+DocType: Production Order,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 +50,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/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/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,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
 DocType: Sales Order Item,Projected Qty,Projiceret Antal
@@ -633,7 +632,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Forskning &amp; Udvikling
 ,Amount to Bill,Beløb til Bill
 DocType: Company,Registration Details,Registrering Detaljer
-DocType: Item,Re-Order Qty,Re-prisen evt
+DocType: Item Reorder,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
@@ -674,7 +673,7 @@
 DocType: Bank Reconciliation,Total Amount,Samlet beløb
 apps/erpnext/erpnext/setup/setup_wizard/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/stock_balance/stock_balance.py +53,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
@@ -682,7 +681,7 @@
 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 +538,Item Variants {0} updated,Item Varianter {0} opdateret
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -774,7 +773,7 @@
 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 &quot;Find varer fra Køb Kvitteringer &#39;knappen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Salgsomkostninger
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Standard Buying
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,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
@@ -875,9 +874,9 @@
 DocType: Contact,User ID,Bruger-id
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Vis Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Fremstilling mod kundeordre
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Resten af verden
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -904,7 +903,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
 apps/erpnext/erpnext/setup/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}"
@@ -987,6 +986,7 @@
 DocType: Address,Utilities,Forsyningsvirksomheder
 DocType: Purchase Invoice Item,Accounting,Regnskab
 DocType: Features Setup,Features Setup,Features Setup
+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}
@@ -1015,7 +1015,7 @@
 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 +465,cannot be greater than 100,må ikke være større end 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1068,7 +1068,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Regeringen
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Item Varianter
 DocType: Company,Services,Tjenester
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),I alt ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,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
@@ -1135,8 +1135,8 @@
 ,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.
 DocType: Dependent Task,Dependent Task,Afhængig Opgave
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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
@@ -1144,7 +1144,7 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrugt Mængde
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Vis
 DocType: Salary Structure Deduction,Salary Structure Deduction,Løn Struktur Fradrag
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/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 +182,Quantity must not be more than {0},Mængde må ikke være mere end {0}
 DocType: Quotation Item,Quotation Item,Citat Vare
@@ -1202,7 +1202,7 @@
 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 +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vægt er nævnt, \ nVenligst nævne &quot;Weight UOM&quot; for"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vægt er nævnt, \ nVenligst nævne &quot;Weight UOM&quot; 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 +217,Time Log Batch {0} must be 'Submitted',Time Log Batch {0} skal være »Tilmeldt &#39;
@@ -1237,11 +1237,11 @@
 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 +139,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Main
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variant
 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 +165,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet ordre kan ikke annulleres. Unstop at annullere.
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,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/stock/doctype/item/item.py +361,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
@@ -1265,7 +1265,6 @@
 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: 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 +425,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.
@@ -1400,7 +1399,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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
 DocType: Leave Block List Allow,Leave Block List Allow,Lad Block List Tillad
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
 apps/erpnext/erpnext/setup/setup_wizard/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/public/js/setup_wizard.js +292,Unit,Enhed
@@ -1572,7 +1571,8 @@
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Butikker
+DocType: Item,"Allow in Sales Order of type ""Service""",Tillad i kundeordre af typen &quot;Service&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,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å
@@ -1594,7 +1594,7 @@
 ,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."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"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: Process Payroll,Create Salary Slip,Opret lønseddel
@@ -1637,7 +1637,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Forsendelse Rule Label
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,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 +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 &quot;Har Serial Nej &#39;,&#39; Har Batch Nej &#39;,&#39; Er Stock Item&quot; og &quot;værdiansættelsesmetode &#39;"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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
@@ -1719,7 +1719,7 @@
 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/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Clearance Dato ikke nævnt
 apps/erpnext/erpnext/setup/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
@@ -1729,7 +1729,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 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 +118,My Addresses,Mine Adresser
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Mine Adresser
 DocType: Stock Ledger Entry,Outgoing Rate,Udgående Rate
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Organisation gren mester.
 DocType: Sales Order,Billing Status,Fakturering status
@@ -1790,7 +1790,7 @@
 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 +302,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 +95,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&gt; Trykning og Branding&gt; Adresse skabelon.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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&gt; Trykning og Branding&gt; 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 +36,Issues,Spørgsmål
@@ -1806,7 +1806,7 @@
 ,Sales Browser,Salg Browser
 DocType: Journal Entry,Total Credit,Total Credit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Lokal
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Large
@@ -1893,7 +1893,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Få relevante oplysninger
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Regnskab Punktet om Stock
 DocType: Sales Invoice,Sales Team1,Salg TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Element {0} eksisterer ikke
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Element {0} eksisterer ikke
 DocType: Sales Invoice,Customer Address,Kunde Adresse
 DocType: Purchase Invoice,Apply Additional Discount On,Påfør Yderligere Rabat på
 DocType: Account,Root Type,Root Type
@@ -1930,7 +1930,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Værdiansættelse Rate
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 &#39;Køb Kvitteringer&#39; bord
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,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 +155,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
@@ -1963,7 +1963,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Indtast lindre dato.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Kun Lad Applikationer med status &quot;Godkendt&quot; kan indsendes
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Adresse Titel er obligatorisk.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,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/setup_wizard/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
@@ -2080,7 +2080,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Åbning Balance Egenkapital
 DocType: Appraisal,Appraisal,Vurdering
 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 +164,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 +184,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
@@ -2276,7 +2276,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,Prøv venligst igen typen firmanavn for at bekræfte
@@ -2302,8 +2302,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Løn Struktur
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"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/setup_wizard/industry_type.py +9,Airline,Flyselskab
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Issue Materiale
@@ -2331,7 +2329,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +59,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 &#39;Ingen Copy &quot;er indstillet"
 DocType: Account,Purchase User,Køb Bruger
 DocType: Notification Control,Customize the Notification,Tilpas Underretning
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard Adresse Skabelon kan ikke slettes
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,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
@@ -2415,7 +2413,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,Kommerciel
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,Commercial,Kommerciel
 DocType: Cost Center,Distribution Id,Distribution Id
 apps/erpnext/erpnext/setup/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.
@@ -2429,7 +2427,7 @@
 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/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,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 +95,Due Date is mandatory,Forfaldsdato er obligatorisk
 DocType: Journal Entry,Pay To / Recd From,Betal Til / RECD Fra
@@ -2457,7 +2455,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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 +33,Provisional Profit / Loss (Credit),Foreløbig Profit / Loss (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,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 +278,Please set default value {0} in Company {1},Indstil standard værdi {0} i Company {1}
@@ -2515,7 +2513,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,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/setup_wizard/install_fixtures.py +58,Probation,Kriminalforsorgen
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lager Item.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,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
@@ -2572,7 +2569,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} er stoppet
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i Item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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
@@ -2591,7 +2588,7 @@
 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 +458,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/setup_wizard/setup_wizard.py +134,Standard Selling,Standard Selling
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -2700,7 +2697,7 @@
 DocType: Sales Invoice,Paid Amount,Betalt Beløb
 ,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/utilities/doctype/address_template/address_template.py +16,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 +113,"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/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
 DocType: Production Planning Tool,Filter based on customer,Filter baseret på kundernes
@@ -2825,6 +2822,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: C-Form,Series,Series
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,Item Klassifikation
@@ -2889,7 +2887,7 @@
 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 +434,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 +420,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."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Indkøb Master manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Produktionsordre {0} skal indsendes
@@ -2897,7 +2895,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Vigtigste Reports
 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 +194,Add / Edit Prices,Tilføj / rediger Priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Mine ordrer
@@ -2954,7 +2952,7 @@
 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 +357,'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 +351,'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
@@ -3046,7 +3044,7 @@
 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: BOM,Raw Material Cost,Raw Material Omkostninger
-DocType: Item,Re-Order Level,Re-Order Level
+DocType: Item Reorder,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."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Deltid
 DocType: Employee,Applicable Holiday List,Gældende Holiday List
@@ -3165,7 +3163,7 @@
 DocType: Employee,Current Address Is,Nuværende adresse er
 DocType: Address,Office,Kontor
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Regnskab journaloptegnelser.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Vælg Medarbejder Record først.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,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 +240,Please enter Expense Account,Indtast venligst udgiftskonto
 DocType: Account,Stock,Lager
@@ -3244,14 +3242,13 @@
 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 +380,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 +380, (Half Day),(Halv dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Få elementer fra BOM
diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index c13f48d..fe7f23e 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -33,7 +33,7 @@
 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
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Bankkonto kan ikke blive navngivet som {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Bankkonto kan ikke blive navngivet som {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre end nul ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Ny Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Ny Leave Application
 apps/erpnext/erpnext/setup/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
@@ -82,7 +82,7 @@
 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 +129,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
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Forkortelse kan ikke have mere end 5 tegn
 DocType: Payment Request,Payment Request,Betaling Request
 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.",Attribut Værdi {0} kan ikke fjernes fra {1} som Item Varianter \ eksisterer med denne attribut.
@@ -195,6 +195,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,Vælg Betingelser
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,Out Value
 DocType: Production Planning Tool,Sales Orders,Salgsordrer
 DocType: Purchase Taxes and Charges,Valuation,Værdiansættelse
 ,Purchase Order Trends,Indkøbsordre Trends
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Fjernsyn
 DocType: Production Order Operation,Updated via 'Time Log',Opdateret via &#39;Time Log&#39;
 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}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Advance beløb kan ikke være større end {0} {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"
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Opretter lønseddel for ovennævnte kriterier.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Ingen beskrivelse
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Anmodning om køb.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/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&gt; Indstillinger&gt; Navngivning Series
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Warehouse {0} ikke hører til virksomheden {1}
 DocType: Item Website Specification,Item Website Specification,Item Website Specification
 DocType: Payment Tool,Reference No,Referencenummer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Lad Blokeret
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Lad Blokeret
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,Annual,Årligt
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Afstemning Item
 DocType: Stock Entry,Sales Invoice No,Salg faktura nr
@@ -248,7 +250,7 @@
 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 +606,Item {0} is cancelled,Vare {0} er aflyst
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Vare {0} er aflyst
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Materiale Request
 DocType: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
 DocType: Item,Purchase Details,Køb Detaljer
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Følgeseddel
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Opsætning Skatter
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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
@@ -327,7 +329,7 @@
 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 +215,Please see attachment,Se venligst vedhæftede
 DocType: Purchase Order,% Received,% Modtaget
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Opsætning Allerede Complete !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Opsætning Allerede Complete !!
 ,Finished Goods,Færdigvarer
 DocType: Delivery Note,Instructions,Instruktioner
 DocType: Quality Inspection,Inspected By,Inspiceres af
@@ -352,14 +354,13 @@
 ,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 +169,{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 +189,{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/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/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}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Muligheder
 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
@@ -388,7 +389,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
 DocType: HR Settings,Employee record is created using selected field. ,Medarbejder rekord er oprettet ved hjælp valgte felt.
 DocType: Sales Order,Not Applicable,Gælder ikke
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Ferie mester.
@@ -427,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"To merge, following properties must be same for both items","At fusionere, skal følgende egenskaber være ens for begge poster"
 DocType: Shipping Rule,Net Weight,Vægt
 DocType: Employee,Emergency Phone,Emergency Phone
 ,Serial No Warranty Expiry,Seriel Ingen garanti Udløb
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Håndtering af underleverancer
 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}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Konto {0} tilhører ikke virksomheden: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Forkortelse allerede brugt til et andet selskab
 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, &#39;Afrundet Total&#39; felt, vil ikke være synlig i enhver transaktion"
 DocType: BOM,Operating Cost,Driftsomkostninger
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +89,Financial / accounting year.,Finansiel / regnskabsår.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Akkumulerede værdier
 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"
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Emne Id
@@ -492,7 +495,7 @@
 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/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Standard måleenhed for Item {0} kan ikke ændres direkte, fordi du allerede har gjort nogle transaktion (er) med en anden UOM. Du bliver nødt til at oprette en ny konto for at bruge en anden Standard UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Standard måleenhed for Item {0} kan ikke ændres direkte, fordi du allerede har gjort nogle transaktion (er) med en anden UOM. Du bliver nødt til at oprette en ny konto for at bruge en anden Standard UOM."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Tildelte beløb kan ikke være negativ
 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.
@@ -570,7 +573,7 @@
 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 +543,Item has variants.,Element har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -583,6 +586,7 @@
 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 +33,Goods received from Suppliers.,Varer modtaget fra leverandører.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,I Value
 DocType: Lead,Campaign Name,Kampagne Navn
 ,Reserved,Reserveret
 DocType: Purchase Order,Supply Raw Materials,Supply råstoffer
@@ -597,16 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,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/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Materiale Anmodning Genereret
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Auto Materiale Anmodning Genereret
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Tabt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke indtaste aktuelle kupon i &quot;Mod Kassekladde &#39;kolonne
 apps/erpnext/erpnext/setup/setup_wizard/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/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Der er en fejl i din adresse Skabelon {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,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 +274,Row {0}: Conversion Factor is mandatory,Række {0}: Konvertering Factor er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flere Pris Regler eksisterer med samme kriterier, skal du løse konflikter ved at tildele prioritet. Pris Regler: {0}"
 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.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,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
@@ -649,7 +655,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,Prisliste ikke valgt
 DocType: Employee,Family Background,Familie Baggrund
 DocType: Process Payroll,Send Email,Send Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Advarsel: Ugyldig Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Advarsel: Ugyldig Attachment {0}
 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"
@@ -679,13 +685,13 @@
 DocType: Production Planning Tool,Select Items,Vælg emner
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} mod regning {1} dateret {2}
 DocType: Maintenance Visit,Completion Status,Afslutning status
-DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
+DocType: Production Order,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 +50,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/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/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status er {2}
@@ -693,7 +699,7 @@
 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/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Item Variant {0} findes allerede med samme attributter
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Item Variant {0} findes allerede med samme attributter
 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
@@ -703,7 +709,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Forskning &amp; Udvikling
 ,Amount to Bill,Beløb til Bill
 DocType: Company,Registration Details,Registrering Detaljer
-DocType: Item,Re-Order Qty,Re-prisen evt
+DocType: Item Reorder,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
@@ -746,7 +752,7 @@
 DocType: Bank Reconciliation,Total Amount,Samlet beløb
 apps/erpnext/erpnext/setup/setup_wizard/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/stock_balance/stock_balance.py +53,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
 DocType: Bank Reconciliation,Account Currency,Konto Valuta
@@ -755,7 +761,7 @@
 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 +538,Item Variants {0} updated,Item Varianter {0} opdateret
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -832,7 +838,7 @@
 DocType: POS Profile,Cash/Bank Account,Kontant / Bankkonto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Attributtabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Rabat
@@ -860,7 +866,7 @@
 DocType: Tax Rule,Shipping State,Forsendelse stat
 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 &quot;Find varer fra Køb Kvitteringer &#39;knappen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Salgsomkostninger
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Standard Buying
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,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
@@ -902,7 +908,7 @@
 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 +210,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/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Venligst sæt &#39;Anvend Ekstra Rabat på&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Venligst sæt &#39;Anvend Ekstra Rabat på&#39;
 ,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.
@@ -970,9 +976,9 @@
 DocType: Contact,User ID,Bruger-id
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Vis Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Fremstilling mod kundeordre
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Resten af verden
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1002,7 +1008,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
 apps/erpnext/erpnext/setup/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}"
@@ -1021,7 +1027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landbrug
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Dine produkter eller tjenester
 DocType: Mode of Payment,Mode of Payment,Mode Betaling
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Website Billede bør være en offentlig fil eller webadresse
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Website Billede bør være en offentlig fil eller webadresse
 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
@@ -1093,6 +1099,7 @@
 DocType: Address,Utilities,Forsyningsvirksomheder
 DocType: Purchase Invoice Item,Accounting,Regnskab
 DocType: Features Setup,Features Setup,Features Setup
+DocType: Item,Is Service Item,Er service Item
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Ansøgningsperiode kan ikke være uden for orlov tildelingsperiode
 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
@@ -1123,7 +1130,7 @@
 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 +465,cannot be greater than 100,må ikke være større end 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1182,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Regeringen
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Item Varianter
 DocType: Company,Services,Tjenester
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),I alt ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,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
@@ -1255,17 +1262,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Gensend Betaling E-mail
 DocType: Dependent Task,Dependent Task,Afhængig Opgave
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Vis
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Netto Ændring i Cash
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Netto Ændring i Cash
 DocType: Salary Structure Deduction,Salary Structure Deduction,Løn Struktur Fradrag
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Betaling Anmodning findes allerede {0}
 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 +182,Quantity must not be more than {0},Mængde må ikke være mere end {0}
@@ -1327,7 +1334,7 @@
 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: Packed 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
@@ -1336,7 +1343,7 @@
 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 +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vægt er nævnt, \ nVenligst nævne &quot;Weight UOM&quot; for"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vægt er nævnt, \ nVenligst nævne &quot;Weight UOM&quot; 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 +217,Time Log Batch {0} must be 'Submitted',Time Log Batch {0} skal være »Tilmeldt &#39;
@@ -1347,6 +1354,7 @@
 DocType: Employee,Date Of Retirement,Dato for pensionering
 DocType: Upload Attendance,Get Template,Få skabelon
 DocType: Address,Postal,Postal
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 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/public/js/pos/pos.js +155,Please select {0} first.,Vælg {0} først.
@@ -1375,12 +1383,12 @@
 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
 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 +139,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Main
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Sæt præfiks for nummerering serie om dine transaktioner
 DocType: Employee Attendance Tool,Employees HTML,Medarbejdere HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet ordre kan ikke annulleres. Unstop at annullere.
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,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/stock/doctype/item/item.py +361,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
@@ -1405,7 +1413,6 @@
 DocType: Sales Order,To Deliver and Bill,At levere og Bill
 DocType: GL Entry,Credit Amount in Account Currency,Credit Beløb i Konto Valuta
 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 +425,BOM {0} must be submitted,BOM {0} skal indsendes
 DocType: Authorization Control,Authorization Control,Authorization Kontrol
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Række # {0}: Afvist Warehouse er obligatorisk mod afvist element {1}
@@ -1503,6 +1510,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,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/hr/doctype/leave_type/leave_type.js +3,Allocations,tildelinger
 DocType: Quality Inspection Reading,Acceptance Criteria,Acceptkriterier
 DocType: Item Attribute,Attribute Name,Attribut Navn
 DocType: Item Group,Show In Website,Vis I Website
@@ -1553,7 +1561,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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
 DocType: Leave Block List Allow,Leave Block List Allow,Lad Block List Tillad
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Gruppe til ikke-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Samlede faktiske
@@ -1594,7 +1602,7 @@
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL certifikat på vedhæftet fil {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL certifikat på vedhæftet fil {0}
 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
@@ -1743,7 +1751,8 @@
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Butikker
+DocType: Item,"Allow in Sales Order of type ""Service""",Tillad i kundeordre af typen &quot;Service&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,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å
@@ -1768,7 +1777,7 @@
 ,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."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"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: Process Payroll,Create Salary Slip,Opret lønseddel
@@ -1816,7 +1825,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Raw Materials kan ikke være tom.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Kunne ikke opdatere lager, faktura indeholder drop shipping element."
 DocType: Newsletter,Test,Prøve
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 &quot;Har Serial Nej &#39;,&#39; Har Batch Nej &#39;,&#39; Er Stock Item&quot; og &quot;værdiansættelsesmetode &#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Hurtig Kassekladde
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Du kan ikke ændre kurs, hvis BOM nævnt agianst ethvert element"
@@ -1905,7 +1914,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Venligst følgeseddel først
 DocType: Purchase Invoice,Currency and Price List,Valuta og prisliste
 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/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Clearance Dato ikke nævnt
 apps/erpnext/erpnext/setup/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
@@ -1915,7 +1924,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 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 +118,My Addresses,Mine Adresser
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Mine Adresser
 DocType: Stock Ledger Entry,Outgoing Rate,Udgående Rate
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Organisation gren mester.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,eller
@@ -1984,7 +1993,7 @@
 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 +302,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 +95,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&gt; Trykning og Branding&gt; Adresse skabelon.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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&gt; Trykning og Branding&gt; 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 +36,Issues,Spørgsmål
@@ -2001,7 +2010,7 @@
 ,Sales Browser,Salg Browser
 DocType: Journal Entry,Total Credit,Total Credit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Lokal
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Large
@@ -2020,7 +2029,6 @@
 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/stock/doctype/item/item.py +422,Please set reorder quantity,Venligst sæt genbestille mængde
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Opret Kunden fra Lead {0}
 DocType: Price List,Applicable for Countries,Gældende for lande
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computere
@@ -2095,7 +2103,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Få relevante oplysninger
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Regnskab Punktet om Stock
 DocType: Sales Invoice,Sales Team1,Salg TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Element {0} eksisterer ikke
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Element {0} eksisterer ikke
 DocType: Sales Invoice,Customer Address,Kunde Adresse
 DocType: Payment Request,Recipient and Message,Modtager og besked
 DocType: Purchase Invoice,Apply Additional Discount On,Påfør Yderligere Rabat på
@@ -2137,7 +2145,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Værdiansættelse Rate
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 &#39;Køb Kvitteringer&#39; bord
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,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 +155,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
@@ -2175,7 +2183,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Indtast lindre dato.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Kun Lad Applikationer med status &quot;Godkendt&quot; kan indsendes
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Adresse Titel er obligatorisk.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,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/setup_wizard/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
@@ -2199,6 +2207,7 @@
 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: Sales Invoice Item,Customer Warehouse (Optional),Customer Warehouse (valgfri)
 DocType: Pricing Rule,Discount Percentage,Discount Procent
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
 apps/erpnext/erpnext/hooks.py +55,Orders,Ordrer
@@ -2308,7 +2317,7 @@
 DocType: Appraisal,Appraisal,Vurdering
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Dato gentages
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Tegningsberettiget
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,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 +184,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
@@ -2477,7 +2486,7 @@
 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
 DocType: Sales Order Item,Supplier delivers to Customer,Leverandøren leverer til Kunden
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Vis skat break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Vis skat break-up
 apps/erpnext/erpnext/accounts/party.py +283,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 &#39;Er Fremstillet&#39;
@@ -2526,7 +2535,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,Prøv venligst igen typen firmanavn for at bekræfte
@@ -2553,8 +2562,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Løn Struktur
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"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/setup_wizard/industry_type.py +9,Airline,Flyselskab
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Issue Materiale
@@ -2579,7 +2586,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Værdipapirer og Commodity Exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard måleenhed for Variant &#39;{0}&#39; skal være samme som i skabelon &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard måleenhed for Variant &#39;{0}&#39; skal være samme som i skabelon &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Beregn baseret på
 DocType: Delivery Note Item,From Warehouse,Fra Warehouse
 DocType: Purchase Taxes and Charges,Valuation and Total,Værdiansættelse og Total
@@ -2588,7 +2595,7 @@
 DocType: Account,Purchase User,Køb Bruger
 DocType: Notification Control,Customize the Notification,Tilpas Underretning
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Pengestrøm fra driften
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard Adresse Skabelon kan ikke slettes
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Standard Adresse Skabelon kan ikke slettes
 DocType: Sales Invoice,Shipping Rule,Forsendelse Rule
 DocType: Manufacturer,Limited to 12 characters,Begrænset til 12 tegn
 DocType: Journal Entry,Print Heading,Print Overskrift
@@ -2681,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,Kommerciel
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
@@ -2700,7 +2707,7 @@
 DocType: Customer,Default Receivable Accounts,Standard kan modtages Konti
 DocType: Tax Rule,Billing State,Fakturering stat
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,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 +95,Due Date is mandatory,Forfaldsdato er obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Tilvækst til Attribut {0} kan ikke være 0
@@ -2733,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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 +33,Provisional Profit / Loss (Credit),Foreløbig Profit / Loss (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,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 +278,Please set default value {0} in Company {1},Indstil standard værdi {0} i Company {1}
@@ -2764,6 +2771,7 @@
 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/report/stock_balance/stock_balance.py +47,Opening Value,åbning Value
 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
@@ -2797,7 +2805,6 @@
 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/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Som på dato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Kriminalforsorgen
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lager Item.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Udbetaling af løn for måneden {0} og år {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto insert Prisliste sats, hvis der mangler"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Samlet indbetalte beløb
@@ -2833,7 +2840,7 @@
 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/setup/doctype/company/company.py +35,Abbreviation is mandatory,Forkortelsen er obligatorisk
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Forkortelsen er obligatorisk
 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.
@@ -2861,7 +2868,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} er stoppet
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i Item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Kommende begivenheder
@@ -2883,7 +2890,7 @@
 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 +458,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/setup_wizard/setup_wizard.py +134,Standard Selling,Standard Selling
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -3006,7 +3013,7 @@
 DocType: Sales Invoice,Paid Amount,Betalt Beløb
 ,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/utilities/doctype/address_template/address_template.py +16,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 +113,"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/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
 DocType: Production Planning Tool,Filter based on customer,Filter baseret på kundernes
@@ -3107,7 +3114,7 @@
 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å &#39;Vælg som standard&#39;"
 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 +19,Shortage Qty,Mangel Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
 DocType: Salary Slip,Salary Slip,Lønseddel
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;Til dato&#39; 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."
@@ -3118,7 +3125,7 @@
 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 &quot;Indsendt&quot;, en e-pop-up automatisk åbnet til at sende en e-mail til den tilknyttede &quot;Kontakt&quot; 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 +749,It is needed to fetch Item Details.,Det er nødvendigt at hente Elementdetaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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
@@ -3144,6 +3151,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: C-Form,Series,Series
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,Item Klassifikation
@@ -3219,7 +3227,7 @@
 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 +434,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 +420,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."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Indkøb Master manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Produktionsordre {0} skal indsendes
@@ -3227,7 +3235,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Vigtigste Reports
 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 +194,Add / Edit Prices,Tilføj / rediger Priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Mine ordrer
@@ -3275,7 +3283,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Række # {0}: Indstil Leverandør for vare {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Website Billede {0} er knyttet til Vare {1} kan ikke findes
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Website Billede {0} er knyttet til Vare {1} kan ikke findes
 DocType: Issue,Content Type,Indholdstype
 apps/erpnext/erpnext/setup/setup_wizard/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.
@@ -3289,7 +3297,7 @@
 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 +357,'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 +351,'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
@@ -3315,7 +3323,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Lukning konto {0} skal være af typen Ansvar / Equity
 DocType: Authorization Rule,Based On,Baseret på
 DocType: Sales Order Item,Ordered Qty,Bestilt Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Konto {0} er deaktiveret
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Konto {0} er deaktiveret
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Op
 apps/erpnext/erpnext/controllers/recurring_document.py +168,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.
@@ -3323,7 +3331,7 @@
 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: Purchase Invoice,Write Off Amount (Company Currency),Skriv Off Beløb (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Række # {0}: Venligst sæt genbestille mængde
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Række # {0}: Venligst sæt genbestille mængde
 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
@@ -3395,7 +3403,7 @@
 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: BOM,Raw Material Cost,Raw Material Omkostninger
-DocType: Item,Re-Order Level,Re-Order Level
+DocType: Item Reorder,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."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Deltid
 DocType: Employee,Applicable Holiday List,Gældende Holiday List
@@ -3450,7 +3458,7 @@
 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 +573,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3529,7 +3537,7 @@
 DocType: Address,Office,Kontor
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Regnskab journaloptegnelser.
 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 +226,Please select Employee Record first.,Vælg Medarbejder Record først.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,Vælg Medarbejder Record først.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,Indtast venligst udgiftskonto
@@ -3604,7 +3612,7 @@
 DocType: Item Attribute,Numeric Values,Numeriske værdier
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Vedhæft Logo
 DocType: Customer,Commission Rate,Kommissionens Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Make Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Make Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Blok orlov ansøgninger fra afdelingen.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Er tom Indkøbskurv
 DocType: Production Order,Actual Operating Cost,Faktiske driftsomkostninger
@@ -3621,15 +3629,14 @@
 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 +380,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 +419,"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 +408,"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 +380, (Half Day),(Halv dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Få elementer fra BOM
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index 05fb4d2..71b3a36 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -33,7 +33,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
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Bankverbindung kann nicht als mit dem Namen {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Bankverbindung kann nicht als mit dem Namen {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Ausstände für {0} können nicht kleiner als Null sein ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Neuer Urlaubsantrag
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Neuer Urlaubsantrag
 apps/erpnext/erpnext/setup/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
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Protokoll der von Benutzern durchgeführten Aktivitäten bei Aufgaben, die zum Protokollieren von Zeit und zur Rechnungslegung verwendet werden."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Neu {0}: #{1}
 ,Sales Partners Commission,Vertriebspartner-Provision
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Abkürzung darf nicht länger als 5 Zeichen sein
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Abkürzung darf nicht länger als 5 Zeichen sein
 DocType: Payment Request,Payment Request,Zahlungsaufforderung
 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.","Attributwert {0} kann nicht von {1} entfernt werden, da es Artikelvarianten mit diesem Attribut gibt."
@@ -195,6 +195,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,Bitte Geschäftsbedingungen auswählen
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,Out Wert
 DocType: Production Planning Tool,Sales Orders,Kundenaufträge
 DocType: Purchase Taxes and Charges,Valuation,Bewertung
 ,Purchase Order Trends,Entwicklung Lieferantenaufträge
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Fernsehen
 DocType: Production Order Operation,Updated via 'Time Log',"Aktualisiert über ""Zeitprotokoll"""
 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}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Voraus Betrag kann nicht größer sein als {0} {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 kein Standard-Forderungskonto verwendbar ist"
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Erstellt eine Gehaltsabrechnung gemäß der oben getroffenen Auswahl.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Keine Beschreibung angegeben
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Lieferantenanfrage
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Nur der ausgewählte Urlaubsgenehmiger kann Urlaubsgenehmigungen übertragen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,Only the selected Leave Approver can submit this Leave Application,Nur der ausgewählte Urlaubsgenehmiger kann Urlaubsgenehmigungen übertragen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Freitstellungsdatum muss nach dem Eintrittsdatum liegen
 apps/erpnext/erpnext/setup/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
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Lager {0} gehört nicht zu Firma {1}
 DocType: Item Website Specification,Item Website Specification,Artikel-Webseitenspezifikation
 DocType: Payment Tool,Reference No,Referenznr.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Urlaub gesperrt
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Urlaub gesperrt
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,Annual,Jährlich
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Bestandsabgleich-Artikel
 DocType: Stock Entry,Sales Invoice No,Ausgangsrechnungs-Nr.
@@ -248,7 +250,7 @@
 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 +606,Item {0} is cancelled,Artikel {0} wird storniert
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Artikel {0} wird storniert
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Materialanfrage
 DocType: Bank Reconciliation,Update Clearance Date,Abwicklungsdatum aktualisieren
 DocType: Item,Purchase Details,Einkaufsdetails
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Lieferschein
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Steuern einrichten
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} in Artikelsteuer doppelt eingegeben
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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
@@ -327,7 +329,7 @@
 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 +215,Please see attachment,Bitte Anhang beachten
 DocType: Purchase Order,% Received,% erhalten
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Einrichtungsvorgang bereits abgeschlossen!!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Einrichtungsvorgang bereits abgeschlossen!!
 ,Finished Goods,Fertigerzeugnisse
 DocType: Delivery Note,Instructions,Anweisungen
 DocType: Quality Inspection,Inspected By,Geprüft von
@@ -352,14 +354,13 @@
 ,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 +169,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) muss die Rolle ""Urlaubsgenehmiger"" haben"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{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/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
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Arbeitsplatz ist an folgenden Tagen gemäß der Urlaubsliste geschlossen: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Chancen
 DocType: Employee,Single,Ledig
-DocType: Issue,Attachment,Anhang
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budget kann nicht für Gruppenkostenstelle eingestellt werden
 DocType: Account,Cost of Goods Sold,Selbstkosten
 DocType: Purchase Invoice,Yearly,Jährlich
@@ -388,7 +389,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
 DocType: HR Settings,Employee record is created using selected field. ,Mitarbeiter-Datensatz wird erstellt anhand des ausgewählten Feldes.
 DocType: Sales Order,Not Applicable,Nicht anwenden
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Stammdaten zum Urlaub
@@ -427,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"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: Shipping Rule,Net Weight,Nettogewicht
 DocType: Employee,Emergency Phone,Notruf
 ,Serial No Warranty Expiry,Ablaufdatum der Garantie zu Seriennummer
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Unteraufträge vergeben
 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"
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konto {0} gehört nicht zu Firma: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Konto {0} gehört nicht zu Firma: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Abkürzung bereits für ein anderes Unternehmen verwendet
 DocType: Selling Settings,Default Customer Group,Standardkundengruppe
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Wenn deaktiviert, wird das Feld ""Gerundeter Gesamtbetrag"" in keiner Transaktion angezeigt"
 DocType: BOM,Operating Cost,Betriebskosten
@@ -473,6 +475,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Keine Datensätze in der Rechnungstabelle gefunden
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Bitte zuerst Firma und Gruppentyp auswählen
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Finanz-/Rechnungsjahr
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Kumulierte Werte
 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,"
 DocType: Project Task,Project Task,Projekt-Teilaufgabe
 ,Lead Id,Lead-ID
@@ -494,7 +497,7 @@
 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),Anfangssstand (Haben)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Die Standard-Maßeinheit für Artikel {0} kann nicht direkt geändert werden, weil Sie bereits einige Transaktionen mit einer anderen Maßeinheit durchgeführt haben. Sie müssen einen neuen Artikel erstellen, um eine andere Standard-Maßeinheit verwenden zukönnen."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Die Standard-Maßeinheit für Artikel {0} kann nicht direkt geändert werden, weil Sie bereits einige Transaktionen mit einer anderen Maßeinheit durchgeführt haben. Sie müssen einen neuen Artikel erstellen, um eine andere Standard-Maßeinheit verwenden zukönnen."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Zugewiesene Menge kann nicht negativ sein
 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.
@@ -572,7 +575,7 @@
 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 +543,Item has variants.,Artikel hat Varianten.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -585,6 +588,7 @@
 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 +33,Goods received from Suppliers.,Von Lieferanten erhaltene Ware
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,Wert bei
 DocType: Lead,Campaign Name,Kampagnenname
 ,Reserved,Reserviert
 DocType: Purchase Order,Supply Raw Materials,Rohmaterial bereitstellen
@@ -599,16 +603,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Ein Konto mit bestehenden Transaktionen kann nicht in ein Kontoblatt umgewandelt werden
 DocType: Delivery Note,Customer's Purchase Order No,Kundenauftragsnr.
 DocType: Employee,Cell Number,Mobiltelefonnummer
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Automatische Materialanfragen generiert
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Automatische Materialanfragen generiert
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Verloren
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,"Momentan können keine Belege in die Spalte ""Zu Buchungssatz"" eingegeben werden"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
 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/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Es ist ein Fehler in der Adressvorlage {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Neues Konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Von {0} vom Typ {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Umrechnungsfaktor ist zwingend erfoderlich
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Mehrere Preisregeln mit gleichen Kriterien vorhanden ist, lösen Sie Konflikte nach Priorität zuweisen. Preis Regeln: {0}"
 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.,Buchungen können zu Unterknoten erfolgen. Buchungen zu Gruppen sind nicht erlaubt.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,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
@@ -670,7 +676,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,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/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Warnung: Ungültige Anlage {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Warnung: Ungültige Anlage {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Keine Berechtigung
 DocType: Company,Default Bank Account,Standardbankkonto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Um auf der Grundlage von Gruppen zu filtern, bitte zuerst den Gruppentyp wählen"
@@ -700,13 +706,13 @@
 DocType: Production Planning Tool,Select Items,Artikel auswählen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} zu Rechnung {1} vom {2}
 DocType: Maintenance Visit,Completion Status,Fertigstellungsstatus
-DocType: Sales Invoice Item,Target Warehouse,Eingangslager
+DocType: Production Order,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 +50,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/setup_wizard/install_fixtures.py +17,All Item Groups,Alle Artikelgruppen
 DocType: Process Payroll,Activity Log,Aktivitätsprotokoll
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Nettogewinn/-verlust
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Nettogewinn/-verlust
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatisch beim Übertragen von Transaktionen Mitteilungen verfassen
 DocType: Production Order,Item To Manufacture,Zu fertigender Artikel
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Status ist {2}
@@ -714,7 +720,7 @@
 DocType: Sales Order Item,Projected Qty,Geplante Menge
 DocType: Sales Invoice,Payment Due Date,Zahlungsstichtag
 DocType: Newsletter,Newsletter Manager,Newsletter-Manager
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert bereits
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert bereits
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',"""Eröffnung"""
 DocType: Notification Control,Delivery Note Message,Lieferschein-Nachricht
 DocType: Expense Claim,Expenses,Ausgaben
@@ -724,7 +730,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Forschung & Entwicklung
 ,Amount to Bill,Rechnungsbetrag
 DocType: Company,Registration Details,Details zur Registrierung
-DocType: Item,Re-Order Qty,Nachbestellmenge
+DocType: Item Reorder,Re-Order Qty,Nachbestellmenge
 DocType: Leave Block List Date,Leave Block List Date,Urlaubssperrenliste Datum
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Geplant zum Versand an {0}
 DocType: Pricing Rule,Price or Discount,Preis oder Rabatt
@@ -767,7 +773,7 @@
 DocType: Bank Reconciliation,Total Amount,Gesamtsumme
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Veröffentlichung im Internet
 DocType: Production Planning Tool,Production Orders,Fertigungsaufträge
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Bilanzwert
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Bilanzwert
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Verkaufspreisliste
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,"Veröffentlichen, um Elemente zu synchronisieren"
 DocType: Bank Reconciliation,Account Currency,Kontenwährung
@@ -776,7 +782,7 @@
 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,Artikelbarcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,Item Variants {0} updated,Artikelvarianten {0} aktualisiert
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,Artikelvarianten {0} aktualisiert
 DocType: Quality Inspection Reading,Reading 6,Ablesewert 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Vorkasse zur Eingangsrechnung
 DocType: Address,Shop,Laden
@@ -853,7 +859,7 @@
 DocType: POS Profile,Cash/Bank Account,Bar-/Bankkonto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Attributtabelle ist zwingend erforderlich
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Rabatt
@@ -881,7 +887,7 @@
 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 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/setup_wizard/setup_wizard.py +134,Standard Buying,Standard-Kauf
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Standard-Kauf
 DocType: GL Entry,Against,Zu
 DocType: Item,Default Selling Cost Center,Standard-Vertriebskostenstelle
 DocType: Sales Partner,Implementation Partner,Umsetzungspartner
@@ -923,7 +929,7 @@
 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 +210,Production Order {0} must be cancelled before cancelling this Sales Order,Fertigungsauftrag {0} muss vor Stornierung dieses Kundenauftages abgebrochen werden
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',"Bitte ""Zusätzlichen Rabatt anwenden auf"" aktivieren"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',"Bitte ""Zusätzlichen Rabatt anwenden auf"" aktivieren"
 ,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 übertragen, um eine neue Ausgangsrechnung zu erstellen."
@@ -991,9 +997,9 @@
 DocType: Contact,User ID,Benutzer-ID
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Hauptbuch anzeigen
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Frühestens
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Auftragsfertigung
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Rest der Welt
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1023,7 +1029,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged",Verzeihung! Firmen können nicht zusammengeführt werden
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged",Verzeihung! Firmen können nicht zusammengeführt werden
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Klein
 DocType: Employee,Employee Number,Mitarbeiternummer
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Fall-Nr. (n) bereits in Verwendung. Versuchen Sie eine Fall-Nr. ab {0}
@@ -1042,7 +1048,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landwirtschaft
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Ihre Produkte oder Dienstleistungen
 DocType: Mode of Payment,Mode of Payment,Zahlungsweise
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Das Webseiten-Bild sollte eine öffentliche Datei oder eine Webseiten-URL sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Das Webseiten-Bild sollte eine öffentliche Datei oder eine Webseiten-URL sein
 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
@@ -1114,6 +1120,7 @@
 DocType: Address,Utilities,Dienstprogramme
 DocType: Purchase Invoice Item,Accounting,Buchhaltung
 DocType: Features Setup,Features Setup,Funktionen einstellen
+DocType: Item,Is Service Item,Ist Dienstleistung
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Beantragter Zeitraum kann nicht außerhalb der beantragten Urlaubszeit liegen
 DocType: Activity Cost,Projects,Projekte
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Bitte Geschäftsjahr auswählen
@@ -1144,7 +1151,7 @@
 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 +465,cannot be greater than 100,Kann nicht größer als 100 sein
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Artikel {0} ist kein Lagerartikel
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1203,7 +1210,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Regierung
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Artikelvarianten
 DocType: Company,Services,Dienstleistungen
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Gesamtsumme ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Gesamtsumme ({0})
 DocType: Cost Center,Parent Cost Center,Übergeordnete Kostenstelle
 DocType: Sales Invoice,Source,Quelle
 DocType: Leave Type,Is Leave Without Pay,Ist unbezahlter Urlaub
@@ -1276,17 +1283,17 @@
 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 Artikelbarcodes können Artikel in einen Lieferschein und eine Ausgangsrechnung eingegeben werden."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Erneut senden Zahlung per E-Mail
 DocType: Dependent Task,Dependent Task,Abhängige Aufgabe
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} anzeigen
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Nettoveränderung der Barmittel
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Nettoveränderung der Barmittel
 DocType: Salary Structure Deduction,Salary Structure Deduction,Gehaltsstruktur-Abzug
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Maßeinheit {0} wurde mehr als einmal in die Umrechnungsfaktor-Tabelle eingetragen
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Maßeinheit {0} wurde mehr als einmal in die Umrechnungsfaktor-Tabelle eingetragen
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Zahlungsanordnung bereits vorhanden ist {0}
 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 +182,Quantity must not be more than {0},Menge darf nicht mehr als {0} sein
@@ -1348,7 +1355,7 @@
 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),Eingangslager (Optional)
+DocType: Packed Item,To Warehouse (Optional),Eingangslager (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
@@ -1357,7 +1364,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Firma, Monat und Geschäftsjahr sind zwingend erforderlich"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Marketingkosten
 ,Item Shortage Report,Artikelengpass-Bericht
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Gewicht ist angegeben, bitte auch ""Gewichts-Maßeinheit"" angeben"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Gewicht ist angegeben, bitte auch ""Gewichts-Maßeinheit"" angeben"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materialanfrage wurde für die Erstellung dieser Lagerbuchung verwendet
 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 +217,Time Log Batch {0} must be 'Submitted',"Zeitprotokollstapel {0} muss ""übertragen"" sein"
@@ -1368,6 +1375,7 @@
 DocType: Employee,Date Of Retirement,Zeitpunkt der Pensionierung
 DocType: Upload Attendance,Get Template,Vorlage aufrufen
 DocType: Address,Postal,Post
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext Setup abgeschlossen!
 DocType: Item,Weightage,Gewichtung
 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
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Bitte zuerst {0} auswählen.
@@ -1396,12 +1404,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Zu viele Spalten. Exportieren Sie den Bericht und drucken Sie ihn mit einem Tabellenkalkulationsprogramm aus.
 DocType: Sales Invoice Item,Batch No,Chargennummer
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Mehrfache Kundenaufträge zu einer Kundenbestellung zulassen
-apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Haupt
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Haupt
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Präfix für die Seriennummerierung Ihrer Transaktionen festlegen
 DocType: Employee Attendance Tool,Employees HTML,Mitarbeiter HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,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 +367,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/stock/doctype/item/item.py +361,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,"Feld ""Opportunity von"" ist zwingend erforderlich"
 DocType: Item,Variants,Varianten
@@ -1426,7 +1434,6 @@
 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 +425,BOM {0} must be submitted,Stückliste {0} muss übertragen werden
 DocType: Authorization Control,Authorization Control,Berechtigungskontrolle
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Abgelehnt Warehouse ist obligatorisch gegen zurückgewiesen Artikel {1}
@@ -1524,6 +1531,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Zeile #{0}: Arbeitsgang {1} ist für {2} die Menge an Fertigerzeugnissen im Produktionsauftrag # {3} abgeschlossen. Bitte den Status des Arbeitsgangs über die Zeitprotokolle aktualisieren
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investitionen
 DocType: Issue,Resolution Details,Details zur Entscheidung
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Zuführungen
 DocType: Quality Inspection Reading,Acceptance Criteria,Akzeptanzkriterien
 DocType: Item Attribute,Attribute Name,Attributname
 DocType: Item Group,Show In Website,Auf der Webseite anzeigen
@@ -1574,7 +1582,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,Aufwandsabrechnung wartet auf Bewilligung. Nur der Ausgabenbewilliger kann den Status aktualisieren.
 DocType: Purchase Invoice,Additional Discount Amount,Zusätzlicher Rabatt
 DocType: Leave Block List Allow,Leave Block List Allow,Urlaubssperrenliste zulassen
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,"""Abbr"" kann nicht leer oder Space sein"
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,"""Abbr"" kann nicht leer oder Space sein"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Gruppe an konzernfremde
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Summe Tatsächlich
@@ -1615,7 +1623,7 @@
 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/Lead-Adresse
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Warnung: Ungültiges SSL-Zertifikat für Anlage {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Warnung: Ungültiges SSL-Zertifikat für Anlage {0}
 DocType: Production Order Operation,Actual Operation Time,Tatsächliche Betriebszeit
 DocType: Authorization Rule,Applicable To (User),Anwenden auf (Benutzer)
 DocType: Purchase Taxes and Charges,Deduct,Abziehen
@@ -1764,7 +1772,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Fall-Nr. kann nicht 0 sein
 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,"Wenn es ein Vertriebsteam und Handelspartner (Partner für Vertriebswege) gibt, können diese in der Übersicht der Vertriebsaktivitäten markiert und ihr Anteil an den Vertriebsaktivitäten eingepflegt werden"
 DocType: Item,Show a slideshow at the top of the page,Diaschau oben auf der Seite anzeigen
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Lagerräume
+DocType: Item,"Allow in Sales Order of type ""Service""","Kundenaufträge des Typs ""Dienstleistung"" zulassen"
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Lagerräume
 DocType: Time Log,Projects Manager,Projektleiter
 DocType: Serial No,Delivery Time,Zeitpunkt der Lieferung
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Alter basierend auf
@@ -1789,7 +1798,7 @@
 ,Financial Analytics,Finanzanalyse
 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."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"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,Kaufbeleg Nr.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Anzahlung
 DocType: Process Payroll,Create Salary Slip,Gehaltsabrechnung erstellen
@@ -1837,7 +1846,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Rohmaterial kann nicht leer sein
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Lager konnte nicht aktualisiert werden, Rechnung enthält Streckenhandel-Artikel."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 +459,Quick Journal Entry,Schnellbuchung
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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"
@@ -1946,7 +1955,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Bitte zuerst den Lieferschein
 DocType: Purchase Invoice,Currency and Price List,Währungs- und Preisliste
 DocType: Opportunity,Customer / Lead Name,Kunden/Lead-Name
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Abwicklungsdatum nicht benannt
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Abwicklungsdatum nicht benannt
 apps/erpnext/erpnext/setup/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,Zeile {0}: Startdatum muss vor dem Enddatum liegen
@@ -1956,7 +1965,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Typ des übergeordneten Elements
 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 +118,My Addresses,Meine Adressen
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Meine Adressen
 DocType: Stock Ledger Entry,Outgoing Rate,Verkaufspreis
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Stammdaten zu Unternehmensfilialen
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,oder
@@ -2025,7 +2034,7 @@
 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 +302,New Cost Center Name,Neuer Kostenstellenname
 DocType: Leave Control Panel,Leave Control Panel,Urlaubsverwaltung
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,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.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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,Nutzer Personalabteilung
 DocType: Purchase Invoice,Taxes and Charges Deducted,Steuern und Gebühren abgezogen
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Fälle
@@ -2042,7 +2051,7 @@
 ,Sales Browser,Vertriebs-Browser
 DocType: Journal Entry,Total Credit,Gesamt-Haben
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Achtung: Zu Lagerbuchung {2} gibt es eine andere Gegenbuchung {0} # {1}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Lokal
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Groß
@@ -2061,7 +2070,6 @@
 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 verschiedene ""Vertriebsmitarbeiter"" markiert werden, so dass Ziele festgelegt und überwacht werden können."
 ,S.O. No.,Nummer der Lieferantenbestellung
 DocType: Production Order Operation,Make Time Log,Zeitprotokoll erstellen
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Bitte Nachbestellmenge einstellen
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Bitte Kunden aus Lead {0} erstellen
 DocType: Price List,Applicable for Countries,Anwenden für Länder
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Rechner
@@ -2148,7 +2156,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Zutreffende Buchungen aufrufen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Lagerbuchung
 DocType: Sales Invoice,Sales Team1,Verkaufsteam1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Artikel {0} existiert nicht
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Artikel {0} existiert nicht
 DocType: Sales Invoice,Customer Address,Kundenadresse
 DocType: Payment Request,Recipient and Message,Empfänger und Message
 DocType: Purchase Invoice,Apply Additional Discount On,Zusätzlichen Rabatt gewähren auf
@@ -2190,7 +2198,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Wertansatz
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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/hr/doctype/leave_application/leave_application.py +155,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,Startdatum des Projekts
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Bis
 DocType: Rename Tool,Rename Log,Protokoll umbenennen
@@ -2228,7 +2236,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Bitte Freistellungsdatum eingeben.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Menge
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Nur Urlaubsanträge mit dem Status ""Genehmigt"" können übertragen werden"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Adressbezeichnung muss zwingend angegeben werden.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Adressbezeichnung muss zwingend angegeben werden.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Namen der Kampagne eingeben, wenn der Ursprung der Anfrage eine Kampagne ist"
 apps/erpnext/erpnext/setup/setup_wizard/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
@@ -2252,6 +2260,7 @@
 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: Sales Invoice Item,Customer Warehouse (Optional),Kundenwarehouse (Optional)
 DocType: Pricing Rule,Discount Percentage,Rabatt in Prozent
 DocType: Payment Reconciliation Invoice,Invoice Number,Rechnungsnummer
 apps/erpnext/erpnext/hooks.py +55,Orders,Bestellungen
@@ -2361,7 +2370,7 @@
 DocType: Appraisal,Appraisal,Bewertung
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Ereignis wiederholen
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Zeichnungsberechtigte/-r
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,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 +184,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
@@ -2530,7 +2539,7 @@
 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
 DocType: Sales Order Item,Supplier delivers to Customer,Lieferant liefert an Kunden
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Steuerverteilung anzeigen
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Steuerverteilung anzeigen
 apps/erpnext/erpnext/accounts/party.py +283,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  Fertigungsaktivitäten, ""Eigenfertigung"" aktivieren."
@@ -2579,7 +2588,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,Bitte zum Bestätigen Firmenname erneut eingeben
@@ -2606,8 +2615,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Gehaltsstruktur
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"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/setup_wizard/industry_type.py +9,Airline,Fluggesellschaft
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Material ausgeben
@@ -2632,7 +2639,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Wertpapier- & Rohstoffbörsen
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard-Maßeinheit für Variante '{0}' muss dieselbe wie in der Vorlage '{1}' sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard-Maßeinheit für Variante '{0}' muss dieselbe wie in der Vorlage '{1}' sein
 DocType: Shipping Rule,Calculate Based On,Berechnen auf Grundlage von
 DocType: Delivery Note Item,From Warehouse,Ab Lager
 DocType: Purchase Taxes and Charges,Valuation and Total,Bewertung und Summe
@@ -2641,7 +2648,7 @@
 DocType: Account,Purchase User,Nutzer Einkauf
 DocType: Notification Control,Customize the Notification,Mitteilungstext anpassen
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Cashflow aus Geschäftstätigkeit
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard-Adressvorlage kann nicht gelöscht werden
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Standard-Adressvorlage kann nicht gelöscht werden
 DocType: Sales Invoice,Shipping Rule,Versandregel
 DocType: Manufacturer,Limited to 12 characters,Limitiert auf 12 Zeichen
 DocType: Journal Entry,Print Heading,Druckkopf
@@ -2734,7 +2741,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,Werbung
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Beeindruckende Dienstleistungen
@@ -2753,7 +2760,7 @@
 DocType: Customer,Default Receivable Accounts,Standard-Forderungskonten
 DocType: Tax Rule,Billing State,Verwaltungsbezirk laut Rechnungsadresse
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Übertragung
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Abruf der aufgelösten Stückliste (einschließlich der Unterbaugruppen)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),Abruf der aufgelösten Stückliste (einschließlich der Unterbaugruppen)
 DocType: Authorization Rule,Applicable To (Employee),Anwenden auf (Mitarbeiter)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,Fälligkeitsdatum wird zwingend vorausgesetzt
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Schrittweite für Attribut {0} kann nicht 0 sein
@@ -2786,7 +2793,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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 +33,Provisional Profit / Loss (Credit),Vorläufiger Gewinn / Verlust (Haben)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,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,Position 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Bitte Standardwert {0} in Firma {1} setzen
@@ -2817,6 +2824,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Unterpunkt hinzufügen
 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/report/stock_balance/stock_balance.py +47,Opening Value,Öffnungswert
 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
@@ -2850,7 +2858,6 @@
 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,Zum
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probezeit
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Standard-Lager ist für Lagerartikel zwingend notwendig.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Zahlung des Gehalts für Monat {0} und Jahr {1}
 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
@@ -2886,7 +2893,7 @@
 DocType: Payment Tool,Set Matching Amounts,Passende Beträge einstellen
 DocType: Purchase Invoice,Taxes and Charges Added,Steuern und Gebühren hinzugefügt
 ,Sales Funnel,Verkaufstrichter
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Abkürzung ist zwingend erforderlich
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Abkürzung ist zwingend erforderlich
 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 Leads oder Kunden
@@ -2914,7 +2921,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} ist beendet
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Barcode {0} wird bereits für Artikel {1} verwendet
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Kommende Veranstaltungen
@@ -2936,7 +2943,7 @@
 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 +458,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/setup_wizard/setup_wizard.py +134,Standard Selling,Standard-Vertrieb
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Standard-Vertrieb
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -3059,7 +3066,7 @@
 DocType: Sales Invoice,Paid Amount,Gezahlter Betrag
 ,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"
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,"Diese Adressvorlage als Standard einstellen, da es keinen anderen Standard gibt"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konto bereits im Soll, es ist nicht mehr möglich das Konto als Habenkonto festzulegen"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Qualitätsmanagement
 DocType: Production Planning Tool,Filter based on customer,Filtern nach Kunden
@@ -3160,7 +3167,7 @@
 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),E-Mail-Adresse für den Support einrichten. (z. B. support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Engpassmenge
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
 DocType: Salary Slip,Salary Slip,Gehaltsabrechnung
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Bis-Datum"" ist erforderlich,"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Packzettel für zu liefernde Pakete generieren. Wird verwendet, um Paketnummer, Packungsinhalt und das Gewicht zu dokumentieren."
@@ -3171,7 +3178,7 @@
 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 ""übertragen"" 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 +749,It is needed to fetch Item Details.,"Wird gebraucht, um Artikeldetails abzurufen"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,It is needed to fetch Item Details.,"Wird gebraucht, um Artikeldetails abzurufen"
 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
@@ -3197,6 +3204,7 @@
 DocType: BOM,Manufacturing User,Nutzer Fertigung
 DocType: Purchase Order,Raw Materials Supplied,Gelieferte Rohmaterialien
 DocType: Purchase Invoice,Recurring Print Format,Wiederkehrendes Druckformat
+DocType: C-Form,Series,Serie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,Voraussichtlicher Liefertermin kann nicht vor dem Datum des Lieferantenauftrags liegen
 DocType: Appraisal,Appraisal Template,Bewertungsvorlage
 DocType: Item Group,Item Classification,Artikeleinteilung
@@ -3283,7 +3291,7 @@
 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 +434,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 +420,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."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Einkaufsstammdaten-Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Fertigungsauftrag {0} muss übertragen werden
@@ -3291,7 +3299,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Hauptberichte
 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,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Preise hinzufügen / bearbeiten
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,Preise hinzufügen / bearbeiten
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Kostenstellenplan
 ,Requested Items To Be Ordered,"Angefragte Artikel, die bestellt werden sollen"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +315,My Orders,Meine Bestellungen
@@ -3339,7 +3347,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Zeile #{0}: Lieferanten für Artikel {1} einstellen
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,"Das Webseiten-Bild {0}, das an Artikel {1} angehängt wurde, kann nicht gefunden werden"
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,"Das Webseiten-Bild {0}, das an Artikel {1} angehängt wurde, kann nicht gefunden werden"
 DocType: Issue,Content Type,Inhaltstyp
 apps/erpnext/erpnext/setup/setup_wizard/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.
@@ -3353,7 +3361,7 @@
 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 +357,'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 +351,'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
@@ -3379,7 +3387,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Abschlußkonto {0} muss vom Typ Verbindlichkeiten/Eigenkapital sein
 DocType: Authorization Rule,Based On,Basiert auf
 DocType: Sales Order Item,Ordered Qty,Bestellte Menge
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Artikel {0} ist deaktiviert
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Artikel {0} ist deaktiviert
 DocType: Stock Settings,Stock Frozen Upto,Bestand gesperrt bis
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},Ab-Zeitraum und Bis-Zeitraum sind zwingend erforderlich für wiederkehrende {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektaktivität/Aufgabe
@@ -3387,7 +3395,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Einkauf muss ausgewählt sein, wenn ""Anwenden auf"" auf {0} gesetzt wurde"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Discount muss kleiner als 100 sein
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Abschreibungs-Betrag (Firmenwährung)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Zeile #{0}: Bitte Nachbestellmenge angeben
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Zeile #{0}: Bitte Nachbestellmenge angeben
 DocType: Landed Cost Voucher,Landed Cost Voucher,Beleg über Einstandskosten
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Bitte {0} setzen
 DocType: Purchase Invoice,Repeat on Day of Month,Wiederholen an Tag des Monats
@@ -3460,7 +3468,7 @@
 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: Item Reorder,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 Fertigungsaufträge erstellen möchten, oder laden Sie die Rohmaterialien für die Analyse herunter."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Teilzeit
 DocType: Employee,Applicable Holiday List,Geltende Urlaubsliste
@@ -3515,7 +3523,7 @@
 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 +573,Please specify Attribute Value for attribute {0},Bitte Attributwert für Attribut {0} angeben
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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
@@ -3594,7 +3602,7 @@
 DocType: Address,Office,Büro
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Buchungssätze
 DocType: Delivery Note Item,Available Qty at From Warehouse,Verfügbare Stückzahl im Ausgangslager
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Bitte zuerst Mitarbeiterdatensatz auswählen.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,Bitte zuerst Mitarbeiterdatensatz auswählen.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Zeile {0}: Gruppe / Konto stimmt nicht mit {1} / {2} in {3} {4} überein
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Um ein Steuerkonto zu erstellen
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Bitte das Aufwandskonto angeben
@@ -3669,7 +3677,7 @@
 DocType: Item Attribute,Numeric Values,Numerische Werte
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Logo anhängen
 DocType: Customer,Commission Rate,Provisionssatz
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Variante erstellen
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Variante erstellen
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Urlaubsanträge pro Abteilung sperren
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Der Warenkorb ist leer
 DocType: Production Order,Actual Operating Cost,Tatsächliche Betriebskosten
@@ -3686,15 +3694,14 @@
 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 +380,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 Materialfrage 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 +419,"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 +408,"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 +380, (Half Day),(Halbtags)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Artikel aus der Stückliste holen
diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv
index f8f93fe..038a839 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% που χρεώθηκε
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Ισοτιμία πρέπει να είναι ίδιο με το {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Όνομα πελάτη
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Ο τραπεζικός λογαριασμός δεν μπορεί να ονομαστεί ως {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Ο τραπεζικός λογαριασμός δεν μπορεί να ονομαστεί ως {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Η εκκρεμότητα για {0} δεν μπορεί να είναι μικρότερη από το μηδέν ( {1} )
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Νέα αίτηση άδειας
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Νέα αίτηση άδειας
 apps/erpnext/erpnext/setup/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,Λογαριασμός τρόπου πληρωμής
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",Αρχείο καταγραφής των δραστηριοτήτων που εκτελούνται από τους χρήστες που μπορούν να χρησιμοποιηθούν για την παρακολούθηση χρόνου και την τιμολόγηση
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Νέο {0}: # {1}
 ,Sales Partners Commission,Προμήθεια συνεργάτη πωλήσεων
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Μια συντομογραφία δεν μπορεί να έχει περισσότερους από 5 χαρακτήρες
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Μια συντομογραφία δεν μπορεί να έχει περισσότερους από 5 χαρακτήρες
 DocType: Payment Request,Payment Request,Αίτημα πληρωμής
 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.",Χαρακτηριστικό Αξία {0} δεν μπορεί να αφαιρεθεί από {1} ως Στοιχείο Παραλλαγές \ υπάρχουν με αυτό το χαρακτηριστικό.
@@ -195,6 +195,7 @@
 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 (%),Έκπτωση στις Τιμοκατάλογος Ποσοστό (%)
 DocType: Offer Letter,Select Terms and Conditions,Επιλέξτε Όροι και Προϋποθέσεις
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,από Αξία
 DocType: Production Planning Tool,Sales Orders,Παραγγελίες πωλήσεων
 DocType: Purchase Taxes and Charges,Valuation,Αποτίμηση
 ,Purchase Order Trends,Τάσεις παραγγελίας αγοράς
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Τηλεόραση
 DocType: Production Order Operation,Updated via 'Time Log',Ενημέρωση μέσω 'αρχείου καταγραφής χρονολογίου'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Ο λογαριασμός {0} δεν ανήκει στη εταιρεία {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},ποσό της προκαταβολής δεν μπορεί να είναι μεγαλύτερη από {0} {1}
 DocType: Naming Series,Series List for this Transaction,Λίστα σειράς για αυτή τη συναλλαγή
 DocType: Sales Invoice,Is Opening Entry,Είναι αρχική καταχώρηση
 DocType: Customer Group,Mention if non-standard receivable account applicable,Αναφέρετε αν μη τυποποιημένα εισπρακτέα λογαριασμό εφαρμόζεται
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Δημιουργεί βεβαίωση αποδοχών για τα προαναφερόμενα κριτήρια.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Δεν έχει δοθεί περιγραφή
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Αίτηση αγοράς.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Μόνο ο επιλεγμένος υπεύθυνος έγκρισης άδειας μπορεί να υποβάλλει αυτήν την αίτηση άδειας
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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} μέσω Ρύθμιση&gt; Ρυθμίσεις&gt; Ονομασία σειράς
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Η αποθήκη {0} δεν ανήκει στην εταιρεία {1}
 DocType: Item Website Specification,Item Website Specification,Προδιαγραφή ιστότοπου για το είδος
 DocType: Payment Tool,Reference No,Αριθμός αναφοράς
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Η άδεια εμποδίστηκε
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,Η άδεια εμποδίστηκε
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Ετήσιος
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Είδος συμφωνίας αποθέματος
 DocType: Stock Entry,Sales Invoice No,Αρ. Τιμολογίου πώλησης
@@ -248,7 +250,7 @@
 DocType: Pricing Rule,Supplier Type,Τύπος προμηθευτή
 DocType: Item,Publish in Hub,Δημοσίευση στο hub
 ,Terretory,Περιοχή
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Αίτηση υλικού
 DocType: Bank Reconciliation,Update Clearance Date,Ενημέρωση ημερομηνίας εκκαθάρισης
 DocType: Item,Purchase Details,Λεπτομέρειες αγοράς
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Δελτίο αποστολής
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Ρύθμιση Φόροι
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Η καταχώηρση πληρωμής έχει τροποποιηθεί μετά την λήψη της. Παρακαλώ επαναλάβετε τη λήψη.
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,Το {0} εισήχθηκε δύο φορές στο φόρο είδους
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,Παρακαλώ επιλέξτε μήνα και έτος
@@ -327,7 +329,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Η διεύθυνση email σας
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,Παρακαλώ δείτε συνημμένο
 DocType: Purchase Order,% Received,% Παραλήφθηκε
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Η εγκατάσταση έχει ήδη ολοκληρωθεί!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Η εγκατάσταση έχει ήδη ολοκληρωθεί!
 ,Finished Goods,Έτοιμα προϊόντα
 DocType: Delivery Note,Instructions,Οδηγίες
 DocType: Quality Inspection,Inspected By,Επιθεωρήθηκε από
@@ -352,14 +354,13 @@
 ,Purchase Register,Ταμείο αγορών
 DocType: Landed Cost Item,Applicable Charges,Ισχύουσες χρεώσεις
 DocType: Workstation,Consumable Cost,Κόστος αναλώσιμων
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) Πρέπει να έχει ρόλο «υπεύθυνος έγκρισης αδειών»
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) Πρέπει να έχει ρόλο «υπεύθυνος έγκρισης αδειών»
 DocType: Purchase Receipt,Vehicle Date,Όχημα Ημερομηνία
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Ιατρικός
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Αιτιολογία απώλειας
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Ο σταθμός εργασίας είναι κλειστός κατά τις ακόλουθες ημερομηνίες σύμφωνα με τη λίστα αργιών: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Ευκαιρίες
 DocType: Employee,Single,Μονό
-DocType: Issue,Attachment,Κατάσχεση
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Ο προϋπολογισμός δεν μπορεί να ρυθμιστεί για την Ομάδα Κέντρου Κόστους
 DocType: Account,Cost of Goods Sold,Κόστος πωληθέντων
 DocType: Purchase Invoice,Yearly,Ετήσια
@@ -388,7 +389,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
 DocType: HR Settings,Employee record is created using selected field. ,Η Εγγραφή υπαλλήλου δημιουργείται χρησιμοποιώντας το επιλεγμένο πεδίο.
 DocType: Sales Order,Not Applicable,Μη εφαρμόσιμο
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Κύρια εγγραφή αργιών.
@@ -427,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Καλλυντικά
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items","Για τη συγχώνευση, οι ακόλουθες ιδιότητες πρέπει να είναι ίδιες για τα δύο είδη"
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Για τη συγχώνευση, οι ακόλουθες ιδιότητες πρέπει να είναι ίδιες για τα δύο είδη"
 DocType: Shipping Rule,Net Weight,Καθαρό βάρος
 DocType: Employee,Emergency Phone,Τηλέφωνο έκτακτης ανάγκης
 ,Serial No Warranty Expiry,Ημερομηνία λήξης της εγγύησης του σειριακού αριθμού
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Διαχείριση της υπεργολαβίας
 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,Ισοτιμία με την οποία το νόμισμα τιμοκαταλόγου μετατρέπεται στο βασικό νόμισμα της εταιρείας
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Ο λογαριασμός {0} δεν ανήκει στην εταιρεία: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Ο λογαριασμός {0} δεν ανήκει στην εταιρεία: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Σύντμηση που χρησιμοποιείται ήδη για μια άλλη εταιρεία
 DocType: Selling Settings,Default Customer Group,Προεπιλεγμένη ομάδα πελατών
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Αν είναι απενεργοποιημένο, το πεδίο στρογγυλοποιημένο σύνολο δεν θα είναι ορατό σε καμμία συναλλαγή"
 DocType: BOM,Operating Cost,Λειτουργικό κόστος
@@ -473,6 +475,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Δεν βρέθηκαν εγγραφές στον πίνακα τιμολογίων
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Παρακαλώ επιλέξτε πρώτα εταιρεία και τύπο συμβαλλόμενου
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Οικονομικό / λογιστικό έτος.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,συσσωρευμένες Αξίες
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Λυπούμαστε, οι σειριακοί αρ. δεν μπορούν να συγχωνευθούν"
 DocType: Project Task,Project Task,Πρόγραμμα εργασιών
 ,Lead Id,ID επαφής
@@ -494,7 +497,7 @@
 DocType: Quotation,Quotation To,Προσφορά προς
 DocType: Lead,Middle Income,Μέσα έσοδα
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Άνοιγμα ( cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Προεπιλεγμένη μονάδα μέτρησης για τη θέση {0} δεν μπορεί να αλλάξει άμεσα, επειδή έχετε ήδη κάνει κάποια συναλλαγή (ες) με μια άλλη UOM. Θα χρειαστεί να δημιουργήσετε ένα νέο σημείο για να χρησιμοποιήσετε ένα διαφορετικό Προεπιλογή UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Προεπιλεγμένη μονάδα μέτρησης για τη θέση {0} δεν μπορεί να αλλάξει άμεσα, επειδή έχετε ήδη κάνει κάποια συναλλαγή (ες) με μια άλλη UOM. Θα χρειαστεί να δημιουργήσετε ένα νέο σημείο για να χρησιμοποιήσετε ένα διαφορετικό Προεπιλογή UOM."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Το χορηγούμενο ποσό δεν μπορεί να είναι αρνητικό
 DocType: Purchase Order Item,Billed Amt,Χρεωμένο ποσό
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Μια λογική αποθήκη στην οποία θα γίνονται οι καταχωρήσεις αποθέματος
@@ -572,7 +575,7 @@
 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 +543,Item has variants.,Στοιχείο έχει παραλλαγές.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,Τύπος δέντρου
@@ -585,6 +588,7 @@
 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 +33,Goods received from Suppliers.,Τα εμπορεύματα παραλήφθηκαν από τους προμηθευτές.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,στην Αξία
 DocType: Lead,Campaign Name,Όνομα εκστρατείας
 ,Reserved,Δεσμευμένη
 DocType: Purchase Order,Supply Raw Materials,Παροχή Πρώτων Υλών
@@ -599,16 +603,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να μετατραπεί σε καθολικό
 DocType: Delivery Note,Customer's Purchase Order No,Αρ. παραγγελίας αγοράς πελάτη
 DocType: Employee,Cell Number,Αριθμός κινητού
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Αυτόματη Υλικό αιτήσεις που δημιουργούνται
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Αυτόματη Υλικό αιτήσεις που δημιουργούνται
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Απολεσθέν
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Δεν μπορείτε να εισάγετε την τρέχουσα εγγυητική στη στήλη 'κατά λογιστική εγγραφή'
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Ενέργεια
 DocType: Opportunity,Opportunity From,Ευκαιρία από
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Μηνιαία κατάσταση μισθοδοσίας.
 DocType: Item Group,Website Specifications,Προδιαγραφές δικτυακού τόπου
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Υπάρχει ένα σφάλμα στο Πρότυπο σας Διεύθυνση {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Νέος λογαριασμός
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Από {0} του τύπου {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Γραμμή {0}: ο συντελεστής μετατροπής είναι υποχρεωτικός
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Πολλαπλές Κανόνες Τιμή υπάρχει με τα ίδια κριτήρια, παρακαλούμε επίλυση των συγκρούσεων με την ανάθεση προτεραιότητα. Κανόνες Τιμή: {0}"
 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.,Οι λογιστικές εγγραφές μπορούν να γίνουν με την κόμβους. Ενδείξεις κατά ομάδες δεν επιτρέπονται.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,Δεν είναι δυνατή η απενεργοποίηση ή ακύρωση της Λ.Υ. γιατί συνδέεται με άλλες Λ.Υ.
 DocType: Opportunity,Maintenance,Συντήρηση
@@ -670,7 +676,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,Ο τιμοκατάλογος δεν έχει επιλεγεί
 DocType: Employee,Family Background,Ιστορικό οικογένειας
 DocType: Process Payroll,Send Email,Αποστολή email
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Προειδοποίηση: Μη έγκυρη Συνημμένο {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Προειδοποίηση: Μη έγκυρη Συνημμένο {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Δεν έχετε άδεια
 DocType: Company,Default Bank Account,Προεπιλεγμένος τραπεζικός λογαριασμός
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Για να φιλτράρετε με βάση Κόμμα, επιλέξτε Τύπος Πάρτυ πρώτα"
@@ -700,13 +706,13 @@
 DocType: Production Planning Tool,Select Items,Επιλέξτε είδη
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} κατά τη χρέωση {1} της {2}
 DocType: Maintenance Visit,Completion Status,Κατάσταση ολοκλήρωσης
-DocType: Sales Invoice Item,Target Warehouse,Αποθήκη προορισμού
+DocType: Production Order,Target Warehouse,Αποθήκη προορισμού
 DocType: Item,Allow over delivery or receipt upto this percent,Επιτρέψτε πάνω από την παράδοση ή την παραλαβή μέχρι αυτή τη τοις εκατό
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,Η αναμενόμενη ημερομηνία παράδοσης δεν μπορεί να είναι προγενέστερη της ημερομηνίας παραγγελίας πωλήσεων
 DocType: Upload Attendance,Import Attendance,Εισαγωγή συμμετοχών
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Όλες οι ομάδες ειδών
 DocType: Process Payroll,Activity Log,Αρχείο καταγραφής δραστηριότητας
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Καθαρά κέρδη / ζημίες
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Καθαρά κέρδη / ζημίες
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Αυτόματη σύνθεση μηνύματος για την υποβολή συναλλαγών .
 DocType: Production Order,Item To Manufacture,Είδος προς κατασκευή
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} κατάσταση είναι {2}
@@ -714,7 +720,7 @@
 DocType: Sales Order Item,Projected Qty,Προβλεπόμενη ποσότητα
 DocType: Sales Invoice,Payment Due Date,Ημερομηνία λήξης προθεσμίας πληρωμής
 DocType: Newsletter,Newsletter Manager,Ενημερωτικό Δελτίο Διευθυντής
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Θέση Παραλλαγή {0} υπάρχει ήδη με ίδια χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Θέση Παραλλαγή {0} υπάρχει ήδη με ίδια χαρακτηριστικά
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',«Άνοιγμα»
 DocType: Notification Control,Delivery Note Message,Μήνυμα δελτίου αποστολής
 DocType: Expense Claim,Expenses,Δαπάνες
@@ -724,7 +730,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Έρευνα & ανάπτυξη
 ,Amount to Bill,Ποσό χρέωσης
 DocType: Company,Registration Details,Στοιχεία εγγραφής
-DocType: Item,Re-Order Qty,Ποσότητα επαναπαραγγελίας
+DocType: Item Reorder,Re-Order Qty,Ποσότητα επαναπαραγγελίας
 DocType: Leave Block List Date,Leave Block List Date,Ημερομηνία λίστας αποκλεισμού ημερών άδειας
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Προγραμματισμένη για να αποσταλεί σε {0}
 DocType: Pricing Rule,Price or Discount,Τιμή ή έκπτωση
@@ -767,7 +773,7 @@
 DocType: Bank Reconciliation,Total Amount,Συνολικό ποσό
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Δημοσίευση στο διαδίκτυο
 DocType: Production Planning Tool,Production Orders,Εντολές παραγωγής
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Αξία ισολογισμού
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Αξία ισολογισμού
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Τιμοκατάλογος πωλήσεων
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Δημοσιεύστε για να συγχρονίσετε τα είδη
 DocType: Bank Reconciliation,Account Currency,Ο λογαριασμός Νόμισμα
@@ -776,7 +782,7 @@
 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 +538,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
 DocType: Quality Inspection Reading,Reading 6,Μέτρηση 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Προκαταβολή τιμολογίου αγοράς
 DocType: Address,Shop,Κατάστημα
@@ -853,7 +859,7 @@
 DocType: POS Profile,Cash/Bank Account,Λογαριασμός μετρητών/τραπέζης
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Που αφαιρούνται χωρίς καμία αλλαγή στην ποσότητα ή την αξία.
 DocType: Delivery Note,Delivery To,Παράδοση προς
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Έκπτωση
@@ -881,7 +887,7 @@
 DocType: Tax Rule,Shipping State,Μέλος αποστολής
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Το στοιχείο πρέπει να προστεθεί με τη χρήση του κουμπιού 'Λήψη ειδών από αποδεικτικά παραλαβής'
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Έξοδα πωλήσεων
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Πρότυπες αγορές
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Πρότυπες αγορές
 DocType: GL Entry,Against,Κατά
 DocType: Item,Default Selling Cost Center,Προεπιλεγμένο κέντρο κόστους πωλήσεων
 DocType: Sales Partner,Implementation Partner,Συνεργάτης υλοποίησης
@@ -923,7 +929,7 @@
 DocType: Sales Partner,Distributor,Διανομέας
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Κανόνες αποστολής καλαθιού αγορών
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,Η εντολή παραγωγής {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Παρακαλούμε να ορίσετε «Εφαρμόστε επιπλέον έκπτωση On»
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Παρακαλούμε να ορίσετε «Εφαρμόστε επιπλέον έκπτωση On»
 ,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.,Επιλέξτε αρχεία καταγραφής χρονολογίου και πατήστε υποβολή για να δημιουργηθεί ένα νέο τιμολόγιο πώλησης
@@ -991,9 +997,9 @@
 DocType: Contact,User ID,ID χρήστη
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Προβολή καθολικού
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Η πιο παλιά
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group","Μια ομάδα ειδών υπάρχει με το ίδιο όνομα, μπορείτε να αλλάξετε το όνομα του είδους ή να μετονομάσετε την ομάδα ειδών"
 DocType: Production Order,Manufacture against Sales Order,Παραγωγή κατά παραγγελία πώλησης
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Τρίτες χώρες
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,Ακαθάριστες αποδοχές
@@ -1023,7 +1029,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Δυστυχώς, οι εταιρείες δεν μπορούν να συγχωνευθούν"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Δυστυχώς, οι εταιρείες δεν μπορούν να συγχωνευθούν"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Μικρό
 DocType: Employee,Employee Number,Αριθμός υπαλλήλων
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Ο αρ. υπόθεσης χρησιμοποιείται ήδη. Δοκιμάστε από τον αρ. υπόθεσης {0}
@@ -1042,7 +1048,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Γεωργία
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Τα προϊόντα ή οι υπηρεσίες σας
 DocType: Mode of Payment,Mode of Payment,Τρόπος πληρωμής
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Ιστοσελίδα εικόνας θα πρέπει να είναι ένα δημόσιο αρχείο ή URL της ιστοσελίδας
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Ιστοσελίδα εικόνας θα πρέπει να είναι ένα δημόσιο αρχείο ή URL της ιστοσελίδας
 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,Πληροφορίες επικοινωνίας για την αποθήκη
@@ -1114,6 +1120,7 @@
 DocType: Address,Utilities,Επιχειρήσεις κοινής ωφέλειας
 DocType: Purchase Invoice Item,Accounting,Λογιστική
 DocType: Features Setup,Features Setup,Χαρακτηριστικά διαμόρφωσης
+DocType: Item,Is Service Item,Είναι υπηρεσία
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Περίοδος υποβολής των αιτήσεων δεν μπορεί να είναι περίοδος κατανομής έξω άδειας
 DocType: Activity Cost,Projects,Έργα
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Παρακαλώ επιλέξτε χρήση
@@ -1144,7 +1151,7 @@
 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 +465,cannot be greater than 100,Δεν μπορεί να είναι μεγαλύτερη από 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
 DocType: Maintenance Visit,Unscheduled,Έκτακτες
 DocType: Employee,Owned,Ανήκουν
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Εξαρτάται από άδειας άνευ αποδοχών
@@ -1203,7 +1210,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Κυβέρνηση
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Παραλλαγές του Είδους
 DocType: Company,Services,Υπηρεσίες
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Σύνολο ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Σύνολο ({0})
 DocType: Cost Center,Parent Cost Center,Γονικό κέντρο κόστους
 DocType: Sales Invoice,Source,Πηγή
 DocType: Leave Type,Is Leave Without Pay,Είναι άδειας άνευ αποδοχών
@@ -1276,17 +1283,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Επανάληψη αποστολής Πληρωμής Email
 DocType: Dependent Task,Dependent Task,Εξαρτημένη Εργασία
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},Η άδεια του τύπου {0} δεν μπορεί να είναι μεγαλύτερη από {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,Ποσό που καταναλώθηκε
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Προβολή
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Καθαρή Αλλαγή σε μετρητά
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Καθαρή Αλλαγή σε μετρητά
 DocType: Salary Structure Deduction,Salary Structure Deduction,Παρακρατήσεις στο μισθολόγιο
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Η μονάδα μέτρησης {0} έχει εισαχθεί περισσότερες από μία φορές στον πίνακας παραγόντων μετατροπής
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Η μονάδα μέτρησης {0} έχει εισαχθεί περισσότερες από μία φορές στον πίνακας παραγόντων μετατροπής
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Αίτηση Πληρωμής υπάρχει ήδη {0}
 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 +182,Quantity must not be more than {0},Η ποσότητα δεν πρέπει να είναι μεγαλύτερη από {0}
@@ -1348,7 +1355,7 @@
 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: Packed Item,To Warehouse (Optional),Για Αποθήκη (Προαιρετικό)
 DocType: Sales Invoice,Paid Amount (Company Currency),Ποσού που καταβλήθηκε (Εταιρεία νομίσματος)
 DocType: Purchase Invoice,Additional Discount,Επιπλέον έκπτωση
 DocType: Selling Settings,Selling Settings,Ρυθμίσεις πώλησης
@@ -1357,7 +1364,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Η εταιρεία, ο μήνας και η χρήση είναι απαραίτητα"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Δαπάνες marketing
 ,Item Shortage Report,Αναφορά έλλειψης είδους
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Το βάρος αναφέρεται, \nπαρακαλώ, αναφέρετε επίσης και τη μονάδα μέτρησης βάρους'"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Το βάρος αναφέρεται, \nπαρακαλώ, αναφέρετε επίσης και τη μονάδα μέτρησης βάρους'"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Αίτηση υλικού που χρησιμοποιείται για να γίνει αυτήν η καταχώρnση αποθέματος
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Μία μονάδα ενός είδους
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Η παρτίδα αρχείων καταγραφής χρονολογίου {0} πρέπει να 'υποβληθεί'
@@ -1368,6 +1375,7 @@
 DocType: Employee,Date Of Retirement,Ημερομηνία συνταξιοδότησης
 DocType: Upload Attendance,Get Template,Βρες πρότυπο
 DocType: Address,Postal,Ταχυδρομικός
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,Ρύθμιση ERPNext Πλήρης!
 DocType: Item,Weightage,Ζύγισμα
 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,Μια ομάδα πελατών υπάρχει με το ίδιο όνομα παρακαλώ να αλλάξετε το όνομα του πελάτη ή να μετονομάσετε την ομάδα πελατών
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Παρακαλώ επιλέξτε {0} πρώτα
@@ -1396,12 +1404,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Πάρα πολλές στήλες. Εξάγετε την έκθεση για να την εκτυπώσετε χρησιμοποιώντας μια εφαρμογή λογιστικών φύλλων.
 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 +139,Main,Κύριο
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Κύριο
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Παραλλαγή
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ορίστε πρόθεμα για τη σειρά αρίθμησης για τις συναλλαγές σας
 DocType: Employee Attendance Tool,Employees HTML,Οι εργαζόμενοι HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,Μια σταματημένη παραγγελία δεν μπορεί να ακυρωθεί. Συνεχίστε την προκειμένου να την ακυρώσετε.
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,Προεπιλογή BOM ({0}) πρέπει να είναι ενεργή για αυτό το στοιχείο ή το πρότυπο της
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,Παραλλαγές
@@ -1426,7 +1434,6 @@
 DocType: Sales Order,To Deliver and Bill,Για να παρέχουν και να τιμολογούν
 DocType: GL Entry,Credit Amount in Account Currency,Πιστωτικές Ποσό σε Νόμισμα Λογαριασμού
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Χρόνος Καταγράφει για την κατασκευή.
-DocType: Item,Apply Warehouse-wise Reorder Level,Εφάρμοσε το επίπεδο αναδιάρθρωσης σε όλη την αποθήκη
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,Η Λ.Υ. {0} πρέπει να υποβληθεί
 DocType: Authorization Control,Authorization Control,Έλεγχος εξουσιοδότησης
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Σειρά # {0}: Απορρίφθηκε Αποθήκη είναι υποχρεωτική κατά στοιχείο που έχει απορριφθεί {1}
@@ -1524,6 +1531,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Γραμμή #{0}:Η λειτουργία {1} δεν έχει ολοκληρωθεί για τη {2} ποσότητα των τελικών προϊόντων στην εντολή παραγωγής # {3}. Σας Παρακαλώ να ενημερώσετε την κατάσταση λειτουργίας μέσω των χρονικών αρχείων καταγραφής
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Επενδύσεις
 DocType: Issue,Resolution Details,Λεπτομέρειες επίλυσης
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,χορηγήσεις
 DocType: Quality Inspection Reading,Acceptance Criteria,Κριτήρια αποδοχής
 DocType: Item Attribute,Attribute Name,Χαρακτηριστικό όνομα
 DocType: Item Group,Show In Website,Εμφάνιση στην ιστοσελίδα
@@ -1574,7 +1582,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,Η αξίωση δαπανών είναι εν αναμονή έγκρισης. Μόνο ο υπεύθυνος έγκρισης δαπανών να ενημερώσει την κατάστασή της.
 DocType: Purchase Invoice,Additional Discount Amount,Πρόσθετες ποσό έκπτωσης
 DocType: Leave Block List Allow,Leave Block List Allow,Επίτρεψε λίστα αποκλεισμού ημερών άδειας
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Συντ δεν μπορεί να είναι κενό ή χώρος
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Συντ δεν μπορεί να είναι κενό ή χώρος
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Ομάδα για να μη Ομάδα
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Αθλητισμός
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Πραγματικό σύνολο
@@ -1615,7 +1623,7 @@
 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**.,** Η χρήση ** αντιπροσωπεύει ένα οικονομικό έτος. Όλες οι λογιστικές εγγραφές και άλλες σημαντικές συναλλαγές παρακολουθούνται ανά ** χρήση **.
 DocType: Opportunity,Customer / Lead Address,Πελάτης / διεύθυνση επαφής
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Προειδοποίηση: Μη έγκυρο πιστοποιητικό SSL στο συνημμένο {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Προειδοποίηση: Μη έγκυρο πιστοποιητικό SSL στο συνημμένο {0}
 DocType: Production Order Operation,Actual Operation Time,Πραγματικός χρόνος λειτουργίας
 DocType: Authorization Rule,Applicable To (User),Εφαρμοστέα σε (user)
 DocType: Purchase Taxes and Charges,Deduct,Αφαίρεσε
@@ -1764,7 +1772,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Ο αρ. Υπόθεσης δεν μπορεί να είναι 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,Αν έχετε ομάδα πωλήσεων και συνεργάτες πωλητών (κανάλια συνεργατών) μπορούν να επισημανθούν και να παρακολουθείται η συμβολή τους στη δραστηριότητα των πωλήσεων
 DocType: Item,Show a slideshow at the top of the page,Δείτε μια παρουσίαση στην κορυφή της σελίδας
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Καταστήματα
+DocType: Item,"Allow in Sales Order of type ""Service""",Επιτρέψτε σε Πωλήσεις Τάξης του τύπου &quot;Υπηρεσία&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Καταστήματα
 DocType: Time Log,Projects Manager,Υπεύθυνος έργων
 DocType: Serial No,Delivery Time,Χρόνος παράδοσης
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Γήρανση με βάση την
@@ -1789,7 +1798,7 @@
 ,Financial Analytics,Χρηματοοικονομικές αναφορές
 DocType: Quality Inspection,Verified By,Πιστοποιημένο από
 DocType: Address,Subsidiary,Θυγατρική
-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.","Δεν μπορεί να αλλάξει προεπιλεγμένο νόμισμα της εταιρείας, επειδή υπάρχουν υφιστάμενες συναλλαγές. Οι συναλλαγές πρέπει να ακυρωθούν για να αλλάξετε το εξ 'ορισμού νόμισμα."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Δεν μπορεί να αλλάξει προεπιλεγμένο νόμισμα της εταιρείας, επειδή υπάρχουν υφιστάμενες συναλλαγές. Οι συναλλαγές πρέπει να ακυρωθούν για να αλλάξετε το εξ 'ορισμού νόμισμα."
 DocType: Quality Inspection,Purchase Receipt No,Αρ. αποδεικτικού παραλαβής αγοράς
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Κερδιζμένα χρήματα
 DocType: Process Payroll,Create Salary Slip,Δημιουργία βεβαίωσης αποδοχών
@@ -1837,7 +1846,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Το πεδίο πρώτων ύλών δεν μπορεί να είναι κενό.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Δεν ήταν δυνατή η ενημέρωση των αποθεμάτων, τιμολόγιο περιέχει πτώση στέλνοντας στοιχείο."
 DocType: Newsletter,Test,Δοκιμή
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 +459,Quick Journal Entry,Γρήγορη Εφημερίδα Είσοδος
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Δεν μπορείτε να αλλάξετε τιμοκατάλογο, αν η λίστα υλικών αναφέρεται σε οποιουδήποτε είδος"
@@ -1946,7 +1955,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Παρακαλώ πρώτα το δελτίο αποστολής
 DocType: Purchase Invoice,Currency and Price List,Νόμισμα και τιμοκατάλογος
 DocType: Opportunity,Customer / Lead Name,Πελάτης / όνομα επαφής
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Δεν αναφέρεται ημερομηνία εκκαθάρισης
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Δεν αναφέρεται ημερομηνία εκκαθάρισης
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Παραγωγή
 DocType: Item,Allow Production Order,Επίτρεψε εντολής παραγωγής
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Γραμμή {0} : η ημερομηνία έναρξης πρέπει να είναι προγενέστερη της ημερομηνίας λήξης
@@ -1956,7 +1965,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Γονικός τύπος
 DocType: Salary Structure,Total Earning,Σύνολο κέρδους
 DocType: Purchase Receipt,Time at which materials were received,Η χρονική στιγμή κατά την οποία παρελήφθησαν τα υλικά
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,Διευθύνσεις μου
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Διευθύνσεις μου
 DocType: Stock Ledger Entry,Outgoing Rate,Ο απερχόμενος Τιμή
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Κύρια εγγραφή κλάδου οργανισμού.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,ή
@@ -2025,7 +2034,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Διαχειριστείτε το δέντρο ομάδας πελατών.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Νέο όνομα κέντρου κόστους
 DocType: Leave Control Panel,Leave Control Panel,Πίνακας ελέγχου άδειας
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Δεν βρέθηκε προεπιλεγμένο πρότυπο διεύθυνσης. Παρακαλώ να δημιουργήσετε ένα νέο από το μενού εγκατάσταση > εκτύπωση και σηματοποίηση > πρότυπο διεύθυνσης
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Δεν βρέθηκε προεπιλεγμένο πρότυπο διεύθυνσης. Παρακαλώ να δημιουργήσετε ένα νέο από το μενού εγκατάσταση > εκτύπωση και σηματοποίηση > πρότυπο διεύθυνσης
 DocType: Appraisal,HR User,Χρήστης ανθρωπίνου δυναμικού
 DocType: Purchase Invoice,Taxes and Charges Deducted,Φόροι και επιβαρύνσεις που παρακρατήθηκαν
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Θέματα
@@ -2042,7 +2051,7 @@
 ,Sales Browser,Περιηγητής πωλήσεων
 DocType: Journal Entry,Total Credit,Συνολική πίστωση
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Προειδοποίηση: Ένας άλλος {0} # {1} υπάρχει κατά την έναρξη αποθέματος {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Τοπικός
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Μεγάλο
@@ -2061,7 +2070,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Όλες οι συναλλαγές πωλήσεων μπορούν να σημανθούν κατά πολλαπλούς ** πωλητές ** έτσι ώστε να μπορείτε να ρυθμίσετε και να παρακολουθήσετε στόχους.
 ,S.O. No.,Αρ. Παρ. Πώλησης
 DocType: Production Order Operation,Make Time Log,Δημιούργησε αρχείο καταγραφής χρόνου
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Παρακαλούμε να ορίσετε την ποσότητα αναπαραγγελίας
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Παρακαλώ δημιουργήστε πελάτη από επαφή {0}
 DocType: Price List,Applicable for Countries,Ισχύει για χώρες
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Υπολογιστές
@@ -2148,7 +2156,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Βρες σχετικές καταχωρήσεις
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Λογιστική εγγραφή για απόθεμα
 DocType: Sales Invoice,Sales Team1,Ομάδα πωλήσεων 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Το είδος {0} δεν υπάρχει
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Το είδος {0} δεν υπάρχει
 DocType: Sales Invoice,Customer Address,Διεύθυνση πελάτη
 DocType: Payment Request,Recipient and Message,Παραλήπτη και το μήνυμα
 DocType: Purchase Invoice,Apply Additional Discount On,Εφαρμόστε επιπλέον έκπτωση On
@@ -2190,7 +2198,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Ποσοστό αποτίμησης
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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,Αρχείο καταγραφής μετονομασίας
@@ -2228,7 +2236,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Παρακαλώ εισάγετε την ημερομηνία απαλλαγής
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Ποσό
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Μόνο αιτήσεις άδειας με κατάσταση 'εγκρίθηκε' μπορούν να υποβληθούν
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Ο τίτλος της διεύθυνσης είναι υποχρεωτικός.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Ο τίτλος της διεύθυνσης είναι υποχρεωτικός.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Πληκτρολογήστε το όνομα της εκστρατείας εάν η πηγή της έρευνας είναι εκστρατεία
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Εκδότες εφημερίδων
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Επιλέξτε οικονομικό έτος
@@ -2252,6 +2260,7 @@
 DocType: UOM,Must be Whole Number,Πρέπει να είναι ακέραιος αριθμός
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Νέες άδειες που κατανεμήθηκαν (σε ημέρες)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Ο σειριακός αριθμός {0} δεν υπάρχει
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Αποθήκη Πελατών (Προαιρετικό)
 DocType: Pricing Rule,Discount Percentage,Ποσοστό έκπτωσης
 DocType: Payment Reconciliation Invoice,Invoice Number,Αριθμός τιμολογίου
 apps/erpnext/erpnext/hooks.py +55,Orders,Παραγγελίες
@@ -2361,7 +2370,7 @@
 DocType: Appraisal,Appraisal,Εκτίμηση
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Η ημερομηνία επαναλαμβάνεται
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Εξουσιοδοτημένο υπογράφοντα
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},Ο υπεύθυνος έγκρισης άδειας πρέπει να είναι ένας από {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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,Ώρα έναρξης
@@ -2530,7 +2539,7 @@
 DocType: BOM Replace Tool,BOM Replace Tool,Εργαλείο αντικατάστασης Λ.Υ.
 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 +733,Show tax break-up,Εμφάνιση φόρου διάλυση
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Εμφάνιση φόρου διάλυση
 apps/erpnext/erpnext/accounts/party.py +283,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',"Αν δραστηριοποιείστε σε μεταποιητικές δραστηριότητες, επιτρέπει την επιλογή 'κατασκευάζεται '"
@@ -2579,7 +2588,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,Παρακαλώ πληκτρολογήστε ξανά το όνομα της εταιρείας για να επιβεβαιώσετε
@@ -2606,8 +2615,6 @@
 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,"Η ημερομηνία της πρόσληψης πρέπει να είναι μεταγενέστερη από ό, τι η ημερομηνία γέννησης"
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Μισθολόγιο
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Πολλαπλοί κανόνας τιμής υπάρχουν με τα ίδια κριτήρια, παρακαλώ να επιλύσετε την διένεξη \ σύγκρουση με τον ορισμό προτεραιότητας. Κανόνες τιμής: {0}"""
 DocType: Account,Bank,Τράπεζα
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Αερογραμμή
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Υλικό έκδοσης
@@ -2632,7 +2639,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Κινητές αξίες & χρηματιστήρια εμπορευμάτων
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Προεπιλεγμένη μονάδα μέτρησης για την παραλλαγή &#39;{0}&#39; πρέπει να είναι ίδιο με το πρότυπο &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Προεπιλεγμένη μονάδα μέτρησης για την παραλλαγή &#39;{0}&#39; πρέπει να είναι ίδιο με το πρότυπο &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Υπολογισμός με βάση:
 DocType: Delivery Note Item,From Warehouse,Από Αποθήκης
 DocType: Purchase Taxes and Charges,Valuation and Total,Αποτίμηση και σύνολο
@@ -2641,7 +2648,7 @@
 DocType: Account,Purchase User,Χρήστης αγορών
 DocType: Notification Control,Customize the Notification,Προσαρμόστε την ενημέρωση
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Ταμειακές ροές από εργασίες
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Το προεπιλεγμένο πρότυπο διεύθυνσης δεν μπορεί να διαγραφεί
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Το προεπιλεγμένο πρότυπο διεύθυνσης δεν μπορεί να διαγραφεί
 DocType: Sales Invoice,Shipping Rule,Κανόνας αποστολής
 DocType: Manufacturer,Limited to 12 characters,Περιορίζεται σε 12 χαρακτήρες
 DocType: Journal Entry,Print Heading,Εκτύπωση κεφαλίδας
@@ -2734,7 +2741,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,Τα στοιχεία με βάση το έργο δεν είναι διαθέσιμα στοιχεία για προσφορά
 DocType: Project,Expected End Date,Αναμενόμενη ημερομηνία λήξης
 DocType: Appraisal Template,Appraisal Template Title,Τίτλος προτύπου αξιολόγησης
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,Εμπορικός
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Εκπληκτικές υπηρεσίες
@@ -2753,7 +2760,7 @@
 DocType: Customer,Default Receivable Accounts,Προεπιλεγμένοι λογαριασμοί εισπρακτέων
 DocType: Tax Rule,Billing State,Μέλος χρέωσης
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Μεταφορά
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Φέρε αναλυτική Λ.Υ. ( Συμπεριλαμβανομένων των υποσυνόλων )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),Φέρε αναλυτική Λ.Υ. ( Συμπεριλαμβανομένων των υποσυνόλων )
 DocType: Authorization Rule,Applicable To (Employee),Εφαρμοστέα σε (υπάλληλος)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,Due Date είναι υποχρεωτική
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Προσαύξηση για Χαρακτηριστικό {0} δεν μπορεί να είναι 0
@@ -2786,7 +2793,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Δεν επιτρέπεται αρνητική τιμή αποτίμησης
 DocType: Holiday List,Weekly Off,Εβδομαδιαίες αργίες
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Για παράδειγμα το 2012, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Προσωρινά κέρδη / ζημιές (πίστωση)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Προσωρινά κέρδη / ζημιές (πίστωση)
 DocType: Sales Invoice,Return Against Sales Invoice,Επιστροφή Ενάντια Τιμολόγιο Πώλησης
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Στοιχείο 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Παρακαλώ ορίστε προεπιλεγμένη τιμή {0} στην εταιρεία {1}
@@ -2817,6 +2824,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Προσθήκη παιδιού
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Ο ρόλος επιτρέπεται να καθορίζει παγωμένους λογαριασμούς & να επεξεργάζετε παγωμένες καταχωρήσεις
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Δεν είναι δυνατή η μετατροπή του κέντρου κόστους σε καθολικό, όπως έχει κόμβους-παιδιά"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Αξία ανοίγματος
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Σειριακός αριθμός #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Προμήθεια επί των πωλήσεων
 DocType: Offer Letter Term,Value / Description,Αξία / Περιγραφή
@@ -2850,7 +2858,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Διαγράφηκε επιτυχώς όλες τις συναλλαγές που σχετίζονται με αυτή την εταιρεία!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Ως ημερομηνία για
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Επιτήρηση
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Η προεπιλεγμένη αποθήκη είναι απαραίτητη για αποθηκεύσιμα είδη.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Πληρωμή του μισθού για τον μήνα {0} και έτος {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Αυτόματη ένθετο ποσοστό Τιμοκατάλογος αν λείπει
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Συνολικό καταβεβλημένο ποσό
@@ -2886,7 +2893,7 @@
 DocType: Payment Tool,Set Matching Amounts,Ορισμός Matching Ποσά
 DocType: Purchase Invoice,Taxes and Charges Added,Φόροι και επιβαρύνσεις που προστέθηκαν
 ,Sales Funnel,Χοάνη πωλήσεων
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Σύντμηση είναι υποχρεωτική
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Σύντμηση είναι υποχρεωτική
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Σας ευχαριστούμε για το ενδιαφέρον σας για την εγγραφή στις ενημερώσεις μας
 ,Qty to Transfer,Ποσότητα για μεταφορά
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Προσφορές σε επαφές ή πελάτες.
@@ -2914,7 +2921,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,Προσφορά προμηθευτή
 DocType: Quotation,In Words will be visible once you save the Quotation.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε το πρόσημο.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} Είναι σταματημένο
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Το barcode {0} έχει ήδη χρησιμοποιηθεί στο είδος {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Ανερχόμενες εκδηλώσεις
@@ -2937,7 +2944,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Επιλέξτε οικονομικό έτος...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS Προφίλ απαιτούνται για να κάνουν POS Έναρξη
 DocType: Hub Settings,Name Token,Name Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Πρότυπες πωλήσεις
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Πρότυπες πωλήσεις
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Τουλάχιστον μια αποθήκη είναι απαραίτητη
 DocType: Serial No,Out of Warranty,Εκτός εγγύησης
 DocType: BOM Replace Tool,Replace,Αντικατάσταση
@@ -3060,7 +3067,7 @@
 DocType: Sales Invoice,Paid Amount,Καταβληθέν ποσό
 ,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,"Αυτό το πρότυπο διεύθυνσης ορίστηκε ως προεπιλογή, καθώς δεν υπάρχει άλλη προεπιλογή."
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,"Αυτό το πρότυπο διεύθυνσης ορίστηκε ως προεπιλογή, καθώς δεν υπάρχει άλλη προεπιλογή."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Το υπόλοιπο του λογαριασμού είναι ήδη χρεωστικό, δεν μπορείτε να ορίσετε την επιλογή το υπόλοιπο πρέπει να είναι 'πιστωτικό'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Διαχείριση ποιότητας
 DocType: Production Planning Tool,Filter based on customer,Φιλτράρισμα με βάση τον πελάτη
@@ -3161,7 +3168,7 @@
 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 +19,Shortage Qty,Έλλειψη ποσότητας
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
 DocType: Salary Slip,Salary Slip,Βεβαίωση αποδοχών
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,Το πεδίο 'έως ημερομηνία' είναι απαραίτητο.
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Δημιουργία δελτίων συσκευασίας για τα πακέτα που είναι να παραδοθούν. Χρησιμοποιείται για να ενημερώσει τον αριθμό πακέτου, το περιεχόμενο του πακέτου και το βάρος του."
@@ -3172,7 +3179,7 @@
 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 +749,It is needed to fetch Item Details.,Είναι απαραίτητη για να φέρω Λεπτομέρειες αντικειμένου.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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} έχει ήδη ληφθεί
@@ -3198,6 +3205,7 @@
 DocType: BOM,Manufacturing User,Χρήστης παραγωγής
 DocType: Purchase Order,Raw Materials Supplied,Πρώτες ύλες που προμηθεύτηκαν
 DocType: Purchase Invoice,Recurring Print Format,Επαναλαμβανόμενες έντυπη μορφή
+DocType: C-Form,Series,Σειρά
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,Η αναμενόμενη ημερομηνία παράδοσης δεν μπορεί να είναι προγενέστερη της ημερομηνίας παραγγελίας αγοράς
 DocType: Appraisal,Appraisal Template,Πρότυπο αξιολόγησης
 DocType: Item Group,Item Classification,Ταξινόμηση είδους
@@ -3284,7 +3292,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},Γραμμή {0}: μια καταχώρηση αναδιάταξης υπάρχει ήδη για αυτή την αποθήκη {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.","Δεν μπορεί να δηλώθει ως απολεσθέν, επειδή έχει γίνει προσφορά."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Κύρια εγγραφή υπευθύνου αγορών
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Η εντολή παραγωγής {0} πρέπει να υποβληθεί
@@ -3292,7 +3300,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Κύριες εκθέσεις
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Το πεδίο έως ημερομηνία δεν μπορεί να είναι προγενέστερο από το πεδίο από ημερομηνία
 DocType: Purchase Receipt Item,Prevdoc DocType,Τύπος εγγράφου του προηγούμενου εγγράφου
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Προσθήκη / επεξεργασία τιμών
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Οι παραγγελίες μου
@@ -3340,7 +3348,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Σειρά # {0}: Ορισμός Προμηθευτή για το στοιχείο {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Ιστοσελίδα Εικόνα {0} επισυνάπτεται στη θέση {1} δεν μπορεί να βρεθεί
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Ιστοσελίδα Εικόνα {0} επισυνάπτεται στη θέση {1} δεν μπορεί να βρεθεί
 DocType: Issue,Content Type,Τύπος περιεχομένου
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Ηλεκτρονικός υπολογιστής
 DocType: Item,List this Item in multiple groups on the website.,Εμφάνισε το είδος σε πολλαπλές ομάδες στην ιστοσελίδα.
@@ -3354,7 +3362,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,"Το πεδίο ""Έχει Σειριακό Αριθμό"" δεν μπορεί να είναι ""Ναι"" για μη αποθηκεύσιμα είδη."
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'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,Κύρια εγγραφή λογαριασμού
@@ -3380,7 +3388,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Κλείσιμο του λογαριασμού {0} πρέπει να είναι τύπου Ευθύνης / Ίδια Κεφάλαια
 DocType: Authorization Rule,Based On,Με βάση την
 DocType: Sales Order Item,Ordered Qty,Παραγγελθείσα ποσότητα
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
 DocType: Stock Settings,Stock Frozen Upto,Παγωμένο απόθεμα μέχρι
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},Περίοδος Από και χρονική περίοδος ημερομηνίες υποχρεωτική για τις επαναλαμβανόμενες {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Δραστηριότητες / εργασίες έργου
@@ -3388,7 +3396,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",Η επιλογή αγορά πρέπει να οριστεί αν είναι επιλεγμένο το πεδίο 'εφαρμοστέο σε' ως {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Η έκπτωση πρέπει να είναι μικρότερη από 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Γράψτε εφάπαξ ποσό (Εταιρεία νομίσματος)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Σειρά # {0}: Παρακαλούμε ρυθμίστε την ποσότητα αναπαραγγελίας
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Σειρά # {0}: Παρακαλούμε ρυθμίστε την ποσότητα αναπαραγγελίας
 DocType: Landed Cost Voucher,Landed Cost Voucher,Αποδεικτικό κόστους αποστολής εμπορευμάτων
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Παρακαλώ να ορίσετε {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Επανάληψη την ημέρα του μήνα
@@ -3460,7 +3468,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Δείτε τώρα
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Επιλογή της χρονικής περιόδου που το τιμολόγιο θα δημιουργηθεί αυτόματα
 DocType: BOM,Raw Material Cost,Κόστος πρώτων υλών
-DocType: Item,Re-Order Level,Επίπεδο επαναπαραγγελίας
+DocType: Item Reorder,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.,Εισάγετε τα είδη και την προγραμματισμένη ποσότητα για την οποία θέλετε να δημιουργηθούν οι εντολές παραγωγής ή να κατεβάσετε τις πρώτες ύλες για την ανάλυση.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Μερικής απασχόλησης
 DocType: Employee,Applicable Holiday List,Εφαρμοστέος κατάλογος διακοπών
@@ -3515,7 +3523,7 @@
 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 +573,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3594,7 +3602,7 @@
 DocType: Address,Office,Γραφείο
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Λογιστικές ημερολογιακές εγγραφές.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Διαθέσιμο Ποσότητα σε από την αποθήκη
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Παρακαλώ επιλέξτε πρώτα Εγγραφή Εργαζομένων.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,Παρακαλώ επιλέξτε πρώτα Εγγραφή Εργαζομένων.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,Παρακαλώ εισάγετε λογαριασμό δαπανών
@@ -3669,7 +3677,7 @@
 DocType: Item Attribute,Numeric Values,Αριθμητικές τιμές
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Επισύναψη logo
 DocType: Customer,Commission Rate,Ποσό προμήθειας
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Κάντε Παραλλαγή
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Κάντε Παραλλαγή
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Αποκλεισμός αιτήσεων άδειας από το τμήμα
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Το καλάθι είναι άδειο
 DocType: Production Order,Actual Operating Cost,Πραγματικό κόστος λειτουργίας
@@ -3686,15 +3694,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Για να ορίσετε το επίπεδο αναπαραγγελίας, στοιχείο πρέπει να είναι ένα στοιχείο αγοράς ή κατασκευής του Είδους"
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),(Μισή ημέρα)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(Μισή ημέρα)
 DocType: Supplier,Credit Days,Ημέρες πίστωσης
 DocType: Leave Type,Is Carry Forward,Είναι μεταφορά σε άλλη χρήση
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Λήψη ειδών από Λ.Υ.
diff --git a/erpnext/translations/es-PE.csv b/erpnext/translations/es-PE.csv
index 00145b2..ad5c340 100644
--- a/erpnext/translations/es-PE.csv
+++ b/erpnext/translations/es-PE.csv
@@ -42,7 +42,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Nueva Aplicación de Permiso
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Nueva Aplicación de Permiso
 apps/erpnext/erpnext/setup/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
@@ -75,7 +75,7 @@
 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 +129,New {0}: #{1},Nuevo {0}: # {1}
 ,Sales Partners Commission,Comisiones 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/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Abreviatura no puede tener más de 5 caracteres
 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}
@@ -204,7 +204,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea nómina para los criterios antes mencionados.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Ninguna descripción definida
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Solicitudes de compra.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/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&gt; Configuración&gt; Serie Naming"
@@ -213,8 +213,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Almacén {0} no pertenece a la empresa {1}
 DocType: Item Website Specification,Item Website Specification,Especificación del producto en la WEB
 DocType: Payment Tool,Reference No,Referencia No.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Vacaciones Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Vacaciones Bloqueadas
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,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
@@ -226,7 +226,7 @@
 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 +606,Item {0} is cancelled,El producto {0} esta cancelado
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,El producto {0} esta cancelado
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Solicitud de Materiales
 DocType: Bank Reconciliation,Update Clearance Date,Actualizar fecha de liquidación
 DocType: Item,Purchase Details,Detalles de Compra
@@ -267,7 +267,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Notas de Entrega
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configuración de Impuestos
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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"
@@ -291,7 +291,7 @@
 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 +215,Please see attachment,"Por favor, revise el documento adjunto"
 DocType: Purchase Order,% Received,% Recibido
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Configuración completa !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Configuración completa !
 ,Finished Goods,Productos terminados
 DocType: Delivery Note,Instructions,Instrucciones
 DocType: Quality Inspection,Inspected By,Inspección realizada por
@@ -315,12 +315,11 @@
 ,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 +169,{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 +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) debe tener la función 'Supervisor de Ausencias'
 apps/erpnext/erpnext/setup/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/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 vacaciones: {0}
 DocType: Employee,Single,solo
-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 de las Ventas
 DocType: Purchase Invoice,Yearly,Anual
@@ -381,7 +380,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Productos Cosméticos
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
 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
@@ -391,7 +390,7 @@
 DocType: Account,Profit and Loss,Pérdidas y Ganancias
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Muebles y Fixture
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Grado en el que la lista de precios en moneda se convierte en la moneda 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}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,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
@@ -509,7 +508,7 @@
 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 +543,Item has variants.,El producto tiene variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -633,13 +632,13 @@
 DocType: Production Planning Tool,Select Items,Seleccione Artículos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} contra Factura {1} de fecha {2}
 DocType: Maintenance Visit,Completion Status,Estado de finalización
-DocType: Sales Invoice Item,Target Warehouse,Inventario Objetivo
+DocType: Production Order,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 +50,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/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 +34,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: Sales Order Item,Projected Qty,Cant. Proyectada
@@ -653,7 +652,7 @@
 apps/erpnext/erpnext/setup/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
-DocType: Item,Re-Order Qty,Reordenar Cantidad
+DocType: Item Reorder,Re-Order Qty,Reordenar Cantidad
 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
@@ -694,7 +693,7 @@
 DocType: Bank Reconciliation,Total Amount,Importe total
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publicación por internet
 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/stock_balance/stock_balance.py +53,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: Bank Reconciliation,Account Currency,Moneda de la Cuenta
@@ -703,7 +702,7 @@
 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 +538,Item Variants {0} updated,{0} variantes actualizadas del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -795,7 +794,7 @@
 DocType: Lead,Organization Name,Nombre de la Organización
 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 Ventas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Compra estándar
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Compra estándar
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Centros de coste por defecto
 DocType: Sales Partner,Implementation Partner,Socio de implementación
@@ -896,9 +895,9 @@
 DocType: Contact,User ID,ID de usuario
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Mostrar libro mayor
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Primeras
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Fabricación contra Pedido de Ventas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Resto del mundo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -926,7 +925,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Lo sentimos , las empresas no se pueden combinar"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Lo sentimos , las empresas no se pueden combinar"
 apps/erpnext/erpnext/setup/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}
@@ -1009,6 +1008,7 @@
 DocType: Address,Utilities,Utilidades
 DocType: Purchase Invoice Item,Accounting,Contabilidad
 DocType: Features Setup,Features Setup,Características del programa de instalación
+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}
@@ -1037,7 +1037,7 @@
 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 +465,cannot be greater than 100,No puede ser mayor que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,El producto {0} no es un producto de stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1091,7 +1091,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Gobierno
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Variantes del producto
 DocType: Company,Services,Servicios
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centro de Costo Principal
 DocType: Sales Invoice,Source,Referencia
 DocType: Leave Type,Is Leave Without Pay,Es una ausencia sin goce de salario
@@ -1158,8 +1158,8 @@
 ,Material Requests for which Supplier Quotations are not created,Solicitudes de Productos sin Cotizaciones Creadas
 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.
 DocType: Dependent Task,Dependent Task,Tarea dependiente
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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
@@ -1167,7 +1167,7 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Cantidad Consumida
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Ver
 DocType: Salary Structure Deduction,Salary Structure Deduction,Estructura Salarial Deducción
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/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 +182,Quantity must not be more than {0},La cantidad no debe ser más de {0}
 DocType: Quotation Item,Quotation Item,Cotización del artículo
@@ -1225,7 +1225,7 @@
 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 Comercialización
 ,Item Shortage Report,Reportar carencia de producto
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"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,Solicitud de Material utilizado para hacer esta Entrada 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 +217,Time Log Batch {0} must be 'Submitted',El Registro de Horas {0} tiene que ser ' Enviado '
@@ -1260,11 +1260,11 @@
 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.
-apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variante
 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 +165,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 +367,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/stock/doctype/item/item.py +361,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
@@ -1288,7 +1288,6 @@
 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: Sales Order,To Deliver and Bill,Para Entregar y Bill
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Registros de tiempo para su fabricación.
-DocType: Item,Apply Warehouse-wise Reorder Level,Aplicar Inventario para  Nivel de Reordemaniento
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,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.
@@ -1426,7 +1425,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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
 DocType: Leave Block List Allow,Leave Block List Allow,Permitir Lista de Bloqueo de Vacaciones
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
 apps/erpnext/erpnext/setup/setup_wizard/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/public/js/setup_wizard.js +292,Unit,Unidad
@@ -1598,7 +1597,8 @@
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Tiendas
+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 +86,Stores,Tiendas
 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
@@ -1620,7 +1620,7 @@
 ,Financial Analytics,Análisis Financieros
 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 moneda por defecto de la compañía, porque existen transacciones, estas deben ser canceladas para cambiar la moneda por defecto."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"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 moneda por defecto de la compañía, porque existen transacciones, estas deben ser canceladas para cambiar la moneda por defecto."
 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,Dinero Ganado
 DocType: Process Payroll,Create Salary Slip,Crear Nómina
@@ -1663,7 +1663,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Regla Etiqueta de envío
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Materias primas no pueden estar en blanco.
 DocType: Newsletter,Test,Prueba
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 +100,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
@@ -1766,7 +1766,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Primero la nota de entrega
 DocType: Purchase Invoice,Currency and Price List,Divisa y Lista 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/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Fecha de liquidación no definida
 apps/erpnext/erpnext/setup/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,Fila {0}: Fecha de inicio debe ser anterior Fecha de finalización
@@ -1776,7 +1776,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 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 +118,My Addresses,Mis direcciones
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Mis direcciones
 DocType: Stock Ledger Entry,Outgoing Rate,Tasa saliente
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,División principal de la organización.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,o
@@ -1839,7 +1839,7 @@
 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 +302,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 +95,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.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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: Purchase Invoice,Taxes and Charges Deducted,Impuestos y Gastos Deducidos
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Problemas
@@ -1855,7 +1855,7 @@
 ,Sales Browser,Navegador de Ventas
 DocType: Journal Entry,Total Credit,Crédito Total
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,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/setup_wizard/setup_wizard.py +392,Local,Local
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Grande
@@ -1954,7 +1954,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Obtener registros relevantes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Asiento contable de inventario
 DocType: Sales Invoice,Sales Team1,Team1 Ventas
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,El elemento {0} no existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,El elemento {0} no existe
 DocType: Sales Invoice,Customer Address,Dirección del cliente
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar descuento adicional en
 DocType: Account,Root Type,Tipo Root
@@ -1991,7 +1991,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Tasa de Valoración
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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
@@ -2024,7 +2024,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Por favor, introduzca la fecha de recepción."
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Monto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Sólo Solicitudes de Vacaciones con estado ""Aprobado"" puede ser enviadas"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,La dirección principal es obligatoria
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,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 el origen de la encuesta es una campaña
 apps/erpnext/erpnext/setup/setup_wizard/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
@@ -2141,7 +2141,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Apertura de saldos de capital
 DocType: Appraisal,Appraisal,Evaluación
 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 +164,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 +184,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
@@ -2337,7 +2337,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,"Por favor, vuelva a escribir nombre de la empresa para confirmar"
@@ -2363,9 +2363,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Estructura Salarial
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"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/setup_wizard/industry_type.py +9,Airline,Línea Aérea
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Distribuir materiales
@@ -2393,7 +2390,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +59,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
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Plantilla de la Direcciones Predeterminadas no puede eliminarse
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Plantilla de la Direcciones Predeterminadas no puede eliminarse
 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
@@ -2478,7 +2475,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,Commercial,Comercial
 DocType: Cost Center,Distribution Id,Id de Distribución
 apps/erpnext/erpnext/setup/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.
@@ -2492,7 +2489,7 @@
 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/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Transferencia
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,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 +95,Due Date is mandatory,La fecha de vencimiento es obligatorio
 DocType: Journal Entry,Pay To / Recd From,Pagar a / Recibido de
@@ -2520,7 +2517,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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 +33,Provisional Profit / Loss (Credit),Beneficio / Pérdida (Crédito) Provisional
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Beneficio / Pérdida (Crédito) Provisional
 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 +278,Please set default value {0} in Company {1},"Por favor, establezca el valor predeterminado  {0} en la compañía {1}"
@@ -2579,7 +2576,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,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/setup/setup_wizard/install_fixtures.py +58,Probation,Período de prueba
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Almacén por defecto es obligatorio para un elemento en stock.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} y {1} años
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Importe total pagado
 ,Transferred Qty,Cantidad Transferida
@@ -2637,7 +2633,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} esta detenido
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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
@@ -2656,7 +2652,7 @@
 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 +458,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/setup_wizard/setup_wizard.py +134,Standard Selling,Venta estándar
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Venta estándar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -2766,7 +2762,7 @@
 DocType: Sales Invoice,Paid Amount,Cantidad pagada
 ,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 +16,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/accounts/doctype/account/account.py +113,"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/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
@@ -2892,6 +2888,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: C-Form,Series,Secuencia
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,Clasificación de producto
@@ -2967,7 +2964,7 @@
 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 +434,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 +420,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."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Director de compras
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,La orden de producción {0} debe ser enviada
@@ -2975,7 +2972,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Informes Generales
 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
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Añadir / Editar Precios
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Mis pedidos
@@ -3032,7 +3029,7 @@
 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 +357,'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 +351,'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
@@ -3125,7 +3122,7 @@
 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,Reordenar Nivel
+DocType: Item Reorder,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.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Tiempo Parcial
 DocType: Employee,Applicable Holiday List,Lista de Días Feriados Aplicable
@@ -3244,7 +3241,7 @@
 DocType: Employee,Current Address Is,La Dirección Actual es
 DocType: Address,Office,Oficina
 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 +226,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,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 +240,Please enter Expense Account,"Por favor, ingrese la Cuenta de Gastos"
 DocType: Account,Stock,Existencias
@@ -3324,14 +3321,13 @@
 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 +380,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
 ,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 +380, (Half Day),(Medio día)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index 9685d20..b610abb 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -33,7 +33,7 @@
 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
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Cuenta bancaria no puede ser nombrado como {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Cuenta bancaria no puede ser nombrado como {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),El pago pendiente para {0} no puede ser menor que cero ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Nueva solicitud de ausencia
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Nueva solicitud de ausencia
 apps/erpnext/erpnext/setup/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
@@ -82,7 +82,7 @@
 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 +129,New {0}: #{1},Nuevo/a {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/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Abreviatura no puede tener más de 5 caracteres
 DocType: Payment Request,Payment Request,Solicitud de pago
 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.
@@ -157,7 +157,7 @@
 apps/erpnext/erpnext/setup/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,Gastos sobre existencias
-DocType: Newsletter,Email Sent?,Enviar Email?
+DocType: Newsletter,Email Sent?,Email enviado?
 DocType: Journal Entry,Contra Entry,Entrada contra
 DocType: Production Order Operation,Show Time Logs,Mostrar gestión de tiempos
 DocType: Journal Entry Account,Credit in Company Currency,Divisa por defecto de la cuenta de credito
@@ -196,6 +196,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,Seleccione términos y condiciones
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,Valor fuera
 DocType: Production Planning Tool,Sales Orders,Ordenes de venta
 DocType: Purchase Taxes and Charges,Valuation,Valuación
 ,Purchase Order Trends,Tendencias de ordenes de compra
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisión
 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}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},cantidad de avance no puede ser mayor que {0} {1}
 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
@@ -227,7 +229,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crear la nómina salarial con los criterios antes seleccionados.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Ninguna descripción definida
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Solicitudes de compra.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/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"
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},El almacén {0} no pertenece a la compañía {1}
 DocType: Item Website Specification,Item Website Specification,Especificación del producto en la WEB
 DocType: Payment Tool,Reference No,Referencia No.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Vacaciones Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Vacaciones Bloqueadas
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Elemento de reconciliación de inventarios
 DocType: Stock Entry,Sales Invoice No,Factura de venta No.
@@ -249,7 +251,7 @@
 DocType: Pricing Rule,Supplier Type,Tipo de proveedor
 DocType: Item,Publish in Hub,Publicar en el Hub
 ,Terretory,Territorio
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,El producto {0} esta cancelado
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,El producto {0} esta cancelado
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Solicitud de materiales
 DocType: Bank Reconciliation,Update Clearance Date,Actualizar fecha de liquidación
 DocType: Item,Purchase Details,Detalles de compra
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Nota de entrega
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configuración de Impuestos
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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
@@ -328,7 +330,7 @@
 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 +215,Please see attachment,"Por favor, revise el documento adjunto"
 DocType: Purchase Order,% Received,% Recibido
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,La configuración ya se ha completado!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,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
@@ -353,14 +355,13 @@
 ,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 +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) debe tener el rol de 'Supervisor de ausencias'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) debe tener el rol de 'Supervisor de ausencias'
 DocType: Purchase Receipt,Vehicle Date,Fecha de Vehículos
 apps/erpnext/erpnext/setup/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/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}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Oportunidades
 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
@@ -389,7 +390,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,Atributo {0} seleccionado varias veces en la tabla Atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Atributo {0} seleccionado varias veces en la tabla Atributos
 DocType: HR Settings,Employee record is created using selected field. ,El registro del empleado se crea utilizando el campo seleccionado.
 DocType: Sales Order,Not Applicable,No aplicable
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Master de vacaciones .
@@ -428,7 +429,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Productos cosméticos
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items","Para fusionar, la siguientes propiedades deben ser las mismas en ambos productos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Para fusionar, la siguientes propiedades deben ser las mismas en ambos productos"
 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
@@ -439,7 +440,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Gestión de sub-contrataciones
 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}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Cuenta {0} no pertenece a la compañía: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Abreviatura ya utilizado por otra empresa
 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 operacion
@@ -472,6 +474,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +89,Financial / accounting year.,Finanzas / Ejercicio contable.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Los valores acumulados
 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"
 DocType: Project Task,Project Task,Tareas del proyecto
 ,Lead Id,ID de iniciativa
@@ -493,7 +496,7 @@
 DocType: Quotation,Quotation To,Cotización para
 DocType: Lead,Middle Income,Ingreso medio
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Apertura (Cred)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidad de medida predeterminada para el artículo {0} no se puede cambiar directamente porque ya ha realizado alguna transacción (s) con otra UOM. Usted tendrá que crear un nuevo elemento a utilizar un UOM predeterminado diferente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidad de medida predeterminada para el artículo {0} no se puede cambiar directamente porque ya ha realizado alguna transacción (s) con otra UOM. Usted tendrá que crear un nuevo elemento a utilizar un UOM predeterminado diferente.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Monto asignado no puede ser negativo
 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.
@@ -571,7 +574,7 @@
 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 +543,Item has variants.,El producto tiene variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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 Inventarios
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tipo de árbol
@@ -584,6 +587,7 @@
 DocType: Journal Entry,Credit Card Entry,Ingreso de tarjeta de crédito
 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.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,En valor
 DocType: Lead,Campaign Name,Nombre de la campaña
 ,Reserved,Reservado
 DocType: Purchase Order,Supply Raw Materials,Suministro de materia prima
@@ -598,16 +602,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,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/stock/reorder_item.py +171,Auto Material Requests Generated,Las solicitudes de material auto generada
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Las solicitudes de material auto generada
 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 +126,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/setup_wizard/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.
 DocType: Item Group,Website Specifications,Especificaciones del sitio web
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Hay un error en su plantilla de dirección {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,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 +274,Row {0}: Conversion Factor is mandatory,Línea {0}: El factor de conversión es obligatorio
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Reglas Precio múltiples existe con el mismo criterio, por favor, resolver los conflictos mediante la asignación de prioridad. Reglas de precios: {0}"
 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.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,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
@@ -669,7 +675,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,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/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Advertencia! archivo adjunto no valido: {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Advertencia! archivo adjunto no valido: {0}
 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"
@@ -684,7 +690,7 @@
 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.,Subir el balance de existencias a través de un archivo .csv
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Enviar ahora.
+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 para el sitio web
 DocType: Payment Reconciliation,Minimum Invoice Amount,Volumen mínimo Factura
@@ -699,13 +705,13 @@
 DocType: Production Planning Tool,Select Items,Seleccionar productos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} contra factura {1} de fecha {2}
 DocType: Maintenance Visit,Completion Status,Estado de finalización
-DocType: Sales Invoice Item,Target Warehouse,Inventario estimado
+DocType: Production Order,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 +50,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/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 +34,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,Producto para manufactura
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} el estado es {2}
@@ -713,7 +719,7 @@
 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 +247,Item Variant {0} already exists with same attributes,Artículo Variant {0} ya existe con los mismos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,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',&#39;Apertura&#39;
 DocType: Notification Control,Delivery Note Message,Mensaje en nota de entrega
 DocType: Expense Claim,Expenses,Gastos
@@ -723,7 +729,7 @@
 apps/erpnext/erpnext/setup/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
-DocType: Item,Re-Order Qty,Cantidad mínima para ordenar
+DocType: Item Reorder,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
@@ -766,7 +772,7 @@
 DocType: Bank Reconciliation,Total Amount,Importe total
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publicación por internet
 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/stock_balance/stock_balance.py +53,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: Bank Reconciliation,Account Currency,Divisa de cuenta
@@ -775,7 +781,7 @@
 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 +538,Item Variants {0} updated,{0} variantes actualizadas del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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.
@@ -852,7 +858,7 @@
 DocType: POS Profile,Cash/Bank Account,Cuenta de caja / banco
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Tabla de atributos es obligatorio
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Descuento
@@ -880,7 +886,7 @@
 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/setup_wizard/setup_wizard.py +134,Standard Buying,Compra estándar
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,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
@@ -922,7 +928,7 @@
 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 +210,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/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',"Por favor, establece &quot;Aplicar descuento adicional en &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',"Por favor, establece &quot;Aplicar descuento adicional en &#39;"
 ,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.
@@ -990,9 +996,9 @@
 DocType: Contact,User ID,ID de usuario
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Mostrar libro mayor
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Primeras
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Manufacturar para pedido de ventas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Resto del mundo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1022,7 +1028,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Lamentablemente, las compañías no se pueden combinar"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Lamentablemente, las compañías no se pueden combinar"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Pequeño
 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}
@@ -1041,7 +1047,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Los productos o servicios
 DocType: Mode of Payment,Mode of Payment,Método de pago
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Sitio web imagen debe ser un archivo público o URL del sitio web
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Sitio web imagen debe ser un archivo público o URL del sitio web
 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
@@ -1113,6 +1119,7 @@
 DocType: Address,Utilities,Utilidades
 DocType: Purchase Invoice Item,Accounting,Contabilidad
 DocType: Features Setup,Features Setup,Características del programa de instalación
+DocType: Item,Is Service Item,Es un servicio
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Período de aplicación no puede ser período de asignación licencia fuera
 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"
@@ -1143,7 +1150,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plan de cuentas
 DocType: Material Request,Terms and Conditions Content,Contenido de los términos y condiciones
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +465,cannot be greater than 100,No puede ser mayor de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,El producto {0} no es un producto de stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1202,7 +1209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Gubernamental
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Variantes del producto
 DocType: Company,Services,Servicios
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centro de costos principal
 DocType: Sales Invoice,Source,Referencia
 DocType: Leave Type,Is Leave Without Pay,Es una ausencia sin goce de salario
@@ -1275,17 +1282,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Vuelva a enviar el pago por correo electrónico
 DocType: Dependent Task,Dependent Task,Tarea dependiente
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},Ausencia del tipo {0} no puede tener más de {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,Ver {0}
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Cambio Neto en Efectivo
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Cambio Neto en Efectivo
 DocType: Salary Structure Deduction,Salary Structure Deduction,Deducciones de la estructura salarial
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Solicitud de pago ya existe {0}
 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 +182,Quantity must not be more than {0},La cantidad no debe ser más de {0}
@@ -1347,7 +1354,7 @@
 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: Packed 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
@@ -1356,7 +1363,7 @@
 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,Reporte de productos con stock bajo
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","El peso está definido,\nPor favor indique ""UDM Peso"" también"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","El peso está definido,\nPor favor indique ""UDM Peso"" 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.,Elemento de producto
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',El lote de gestión de tiempos {0} debe estar validado
@@ -1367,6 +1374,7 @@
 DocType: Employee,Date Of Retirement,Fecha de jubilación
 DocType: Upload Attendance,Get Template,Obtener plantilla
 DocType: Address,Postal,Postal
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,Configuración ERPNext completa!
 DocType: Item,Weightage,Asignación
 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"
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,"Por favor, seleccione primero {0}."
@@ -1395,17 +1403,17 @@
 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.
 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 +139,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establezca los prefijos de las numeraciones en sus transacciones
 DocType: Employee Attendance Tool,Employees HTML,Empleados HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,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 +367,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/stock/doctype/item/item.py +361,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/selling/doctype/sales_order/sales_order.js +769,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 +129,There is not enough leave balance for Leave Type {0},No hay suficiente días para las ausencias del tipo: {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Monto asignado
 DocType: Sales Team,Contribution to Net Total,Contribución neta total
@@ -1425,7 +1433,6 @@
 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
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser validada
 DocType: Authorization Control,Authorization Control,Control de Autorización
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: Almacén Rechazado es obligatorio en la partida rechazada {1}
@@ -1523,6 +1530,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,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/hr/doctype/leave_type/leave_type.js +3,Allocations,Las asignaciones
 DocType: Quality Inspection Reading,Acceptance Criteria,Criterios de Aceptación
 DocType: Item Attribute,Attribute Name,Nombre del Atributo
 DocType: Item Group,Show In Website,Mostrar en el sitio web
@@ -1573,7 +1581,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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
 DocType: Leave Block List Allow,Leave Block List Allow,Permitir Lista de Bloqueo de Vacaciones
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grupo de No-Grupo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Deportes
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total Actual
@@ -1614,7 +1622,7 @@
 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,Dirección de cliente / oportunidad
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Advertencia: certificado SSL no válido en el apego {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Advertencia: certificado SSL no válido en el apego {0}
 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
@@ -1763,7 +1771,8 @@
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Sucursales
+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 +86,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
@@ -1788,7 +1797,7 @@
 ,Financial Analytics,Análisis financiero
 DocType: Quality Inspection,Verified By,Verificado por
 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"
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"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
 DocType: Process Payroll,Create Salary Slip,Crear nómina salarial
@@ -1836,7 +1845,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,'Materias primas' no puede estar en blanco.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","No se pudo actualizar valores, factura contiene los artículos del envío de la gota."
 DocType: Newsletter,Test,Prueba
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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: 'Posee numero de serie', 'Posee numero de lote', 'Es un producto en stock' y 'Método de valoración'"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Asiento Rápida
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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
@@ -1945,7 +1954,7 @@
 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/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Fecha de liquidación no definida
 apps/erpnext/erpnext/setup/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,Línea {0}: La fecha de inicio debe ser anterior fecha de finalización
@@ -1955,7 +1964,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,Ganancia Total
 DocType: Purchase Receipt,Time at which materials were received,Hora en que se recibieron los materiales
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,Mis direcciones
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Mis direcciones
 DocType: Stock Ledger Entry,Outgoing Rate,Tasa saliente
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Sucursal principal de la organización.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,ó
@@ -2024,7 +2033,7 @@
 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 +302,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 +95,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.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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 cargos deducidos
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Incidencias
@@ -2041,7 +2050,7 @@
 ,Sales Browser,Explorar ventas
 DocType: Journal Entry,Total Credit,Crédito Total
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Advertencia: Existe otra {0} # {1} para la entrada de inventario {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Local
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Grande
@@ -2060,7 +2069,6 @@
 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.,OV No.
 DocType: Production Order Operation,Make Time Log,Crear gestión de tiempos
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Por favor ajuste la cantidad de pedido
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,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
@@ -2147,7 +2155,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Obtener registros relevantes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Asiento contable de inventario
 DocType: Sales Invoice,Sales Team1,Equipo de ventas 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,El elemento {0} no existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,El elemento {0} no existe
 DocType: Sales Invoice,Customer Address,Dirección del cliente
 DocType: Payment Request,Recipient and Message,Del destinatario y el mensaje
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar descuento adicional en
@@ -2189,7 +2197,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Tasa de Valoración
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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
@@ -2227,7 +2235,7 @@
 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 +138,Amt,Monto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,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 +24,Address Title is mandatory.,La dirección principal es obligatoria
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,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/setup_wizard/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.
@@ -2251,6 +2259,7 @@
 DocType: UOM,Must be Whole Number,Debe ser un número entero
 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: Sales Invoice Item,Customer Warehouse (Optional),Almacén al cliente (opcional)
 DocType: Pricing Rule,Discount Percentage,Porcentaje de descuento
 DocType: Payment Reconciliation Invoice,Invoice Number,Número de factura
 apps/erpnext/erpnext/hooks.py +55,Orders,Órdenes
@@ -2360,7 +2369,7 @@
 DocType: Appraisal,Appraisal,Evaluación
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Repetir fecha
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Firmante autorizado
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},El supervisor de ausencias debe ser uno de {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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
@@ -2529,7 +2538,7 @@
 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
 DocType: Sales Order Item,Supplier delivers to Customer,Proveedor entrega al Cliente
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Mostrar impuesto fragmentado
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Mostrar impuesto fragmentado
 apps/erpnext/erpnext/accounts/party.py +283,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'"
@@ -2578,7 +2587,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,"Por favor, vuelva a escribir nombre de la empresa para confirmar"
@@ -2605,9 +2614,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Estructura salarial
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"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/setup_wizard/industry_type.py +9,Airline,Línea aérea
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Distribuir materiales
@@ -2632,7 +2638,7 @@
 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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Cambios de valores y bienes
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidad de medida predeterminada para Variant &#39;{0}&#39; debe ser el mismo que en la plantilla &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidad de medida predeterminada para Variant &#39;{0}&#39; debe ser el mismo que en la plantilla &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calculo basado en
 DocType: Delivery Note Item,From Warehouse,De Almacén
 DocType: Purchase Taxes and Charges,Valuation and Total,Valuación y total
@@ -2641,7 +2647,7 @@
 DocType: Account,Purchase User,Usuario de compras
 DocType: Notification Control,Customize the Notification,Personalizar notificación
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Flujo de caja operativo
-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
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,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: Manufacturer,Limited to 12 characters,Limitado a 12 caracteres
 DocType: Journal Entry,Print Heading,Imprimir encabezado
@@ -2734,7 +2740,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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 de evaluación
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicios Impresionantes
@@ -2753,7 +2759,7 @@
 DocType: Customer,Default Receivable Accounts,Cuentas por cobrar predeterminadas
 DocType: Tax Rule,Billing State,Región de facturación
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Transferencia
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Buscar lista de materiales (LdM) incluyendo subconjuntos
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),Buscar lista de materiales (LdM) incluyendo subconjuntos
 DocType: Authorization Rule,Applicable To (Employee),Aplicable a ( Empleado )
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,La fecha de vencimiento es obligatoria
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Incremento de Atributo {0} no puede ser 0
@@ -2786,7 +2792,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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 +33,Provisional Profit / Loss (Credit),Beneficio provisional / pérdida (Crédito)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,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 +278,Please set default value {0} in Company {1},"Por favor, establezca el valor predeterminado  {0} en la compañía {1}"
@@ -2817,6 +2823,7 @@
 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 sub-grupos"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Valor de apertura
 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,Comisiones sobre ventas
 DocType: Offer Letter Term,Value / Description,Valor / Descripción
@@ -2850,7 +2857,6 @@
 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/setup_wizard/install_fixtures.py +58,Probation,Período de prueba
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Almacén por defecto es obligatorio para un elemento en stock.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,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
@@ -2886,7 +2892,7 @@
 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/setup/doctype/company/company.py +41,Abbreviation is mandatory,La abreviatura es obligatoria
 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 enviadas a los clientes u oportunidades de venta.
@@ -2914,7 +2920,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} esta detenido
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Próximos eventos
@@ -2936,7 +2942,7 @@
 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 +458,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/setup_wizard/setup_wizard.py +134,Standard Selling,Venta estándar
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Venta estándar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -3059,7 +3065,7 @@
 DocType: Sales Invoice,Paid Amount,Cantidad pagada
 ,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
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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 +113,"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/setup_wizard/install_fixtures.py +76,Quality Management,Gestión de calidad
 DocType: Production Planning Tool,Filter based on customer,Filtro basado en cliente
@@ -3160,7 +3166,7 @@
 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 +578,Item variant {0} exists with same attributes,Existe la variante de artículo {0} con mismos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'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,"
@@ -3171,7 +3177,7 @@
 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 +749,It is needed to fetch Item Details.,Se necesita a buscar Detalles del artículo.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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
@@ -3197,6 +3203,7 @@
 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: C-Form,Series,Secuencia
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,Clasificación de producto
@@ -3283,7 +3290,7 @@
 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 +434,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 +420,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."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Director de compras
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,La orden de producción {0} debe ser validada
@@ -3291,7 +3298,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Informes Generales
 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 +194,Add / Edit Prices,Añadir / Editar Precios
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Mis pedidos
@@ -3339,7 +3346,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunto de Proveedores para el elemento {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Sitio web Imagen {0} unido al artículo {1} no se puede encontrar
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Sitio web Imagen {0} unido al artículo {1} no se puede encontrar
 DocType: Issue,Content Type,Tipo de contenido
 apps/erpnext/erpnext/setup/setup_wizard/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.
@@ -3353,7 +3360,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,"'Posee numero de serie' no puede ser ""Sí"" para los productos que NO son de stock"
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,"'Posee numero de serie' no puede ser ""Sí"" para los productos que NO son de stock"
 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
@@ -3379,7 +3386,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Cuenta {0} Clausura tiene que ser de Responsabilidad / Patrimonio
 DocType: Authorization Rule,Based On,Basado en
 DocType: Sales Order Item,Ordered Qty,Cantidad ordenada
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Artículo {0} está deshabilitado
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +168,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.
@@ -3387,7 +3394,7 @@
 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: Purchase Invoice,Write Off Amount (Company Currency),Saldo de perdidas y ganancias (Divisa por defecto)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Fila # {0}: Configure la cantidad de pedido
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Fila # {0}: Configure la cantidad de pedido
 DocType: Landed Cost Voucher,Landed Cost Voucher,Comprobante de costos de destino estimados
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Por favor, configure {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Repetir un día al mes
@@ -3460,7 +3467,7 @@
 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 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: Item Reorder,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.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Tiempo parcial
 DocType: Employee,Applicable Holiday List,Lista de días festivos
@@ -3515,7 +3522,7 @@
 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 +573,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3594,7 +3601,7 @@
 DocType: Address,Office,Oficina
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Entradas en el diario de contabilidad.
 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 +226,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,"Por favor, ingrese la Cuenta de Gastos"
@@ -3669,7 +3676,7 @@
 DocType: Item Attribute,Numeric Values,Valores numéricos
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Adjuntar logo
 DocType: Customer,Commission Rate,Comisión de ventas
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Crear variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Crear variante
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Bloquear solicitudes de ausencias por departamento.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,El carrito esta vacío.
 DocType: Production Order,Actual Operating Cost,Costo de operación actual
@@ -3686,15 +3693,14 @@
 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 +380,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 +419,"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"
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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.,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 +380, (Half Day),(Medio día)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Obtener productos desde lista de materiales (LdM)
diff --git a/erpnext/translations/et.csv b/erpnext/translations/et.csv
index 94aecd7..a2e9a27 100644
--- a/erpnext/translations/et.csv
+++ b/erpnext/translations/et.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% Maksustatakse
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),"Vahetuskurss peab olema sama, {0} {1} ({2})"
 DocType: Sales Invoice,Customer Name,Kliendi nimi
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Pangakonto ei saa nimeks {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Pangakonto ei saa nimeks {0}
 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.","Kõik ekspordiga seotud valdkondades nagu valuuta, ümberarvestuskurss, eksport kokku, ekspordi grand kokku jne on saadaval saateleht, POS, tsitaat, müügiarve, Sales Order jms"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (või rühmad), mille vastu raamatupidamiskanded tehakse ja tasakaalu säilimine."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +173,Outstanding for {0} cannot be less than zero ({1}),Maksmata {0} ei saa olla väiksem kui null ({1})
@@ -47,7 +47,7 @@
 DocType: Quality Inspection Reading,Parameter,Parameeter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Oodatud End Date saa olla oodatust väiksem Start Date
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Row # {0}: Rate peab olema sama, {1} {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,New Leave Application,New Jäta ostusoov
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,New Jäta ostusoov
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Pangaveksel
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Et säilitada kliendi tark objekti kood ning need otsingumootoriga põhineb nende koodi kasutavad seda võimalust
 DocType: Mode of Payment Account,Mode of Payment Account,Makseviis konto
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Logi tegevustel kasutajate vastu Ülesanded, mida saab kasutada jälgimise ajal arve."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},New {0}: # {1}
 ,Sales Partners Commission,Müük Partnerid Komisjon
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Lühend ei saa olla rohkem kui 5 tähemärki
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Lühend ei saa olla rohkem kui 5 tähemärki
 DocType: Payment Request,Payment Request,Maksenõudekäsule
 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.",Omadus Value {0} ei saa eemaldada {1} kui toode variandid \ olemas selle Oskus.
@@ -195,6 +195,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Paigaldamise kuupäev ei saa olla enne tarnekuupäev Punkt {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Soodustused Hinnakiri Rate (%)
 DocType: Offer Letter,Select Terms and Conditions,Vali Tingimused
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,välja väärtus
 DocType: Production Planning Tool,Sales Orders,Müügitellimuste
 DocType: Purchase Taxes and Charges,Valuation,Väärtustamine
 ,Purchase Order Trends,Ostutellimuse Trends
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televiisor
 DocType: Production Order Operation,Updated via 'Time Log',Uuendatud kaudu &quot;Aeg Logi &#39;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konto {0} ei kuulu Company {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Advance summa ei saa olla suurem kui {0} {1}
 DocType: Naming Series,Series List for this Transaction,Seeria nimekiri selle Tehing
 DocType: Sales Invoice,Is Opening Entry,Avab Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Nimetatakse mittestandardsete saadaoleva arvesse kohaldatavat
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Loob palgaleht eespool nimetatud kriteeriume.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,No kirjeldusest
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Küsi osta.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Ainult valitud Jäta Approver võib esitada selle Jäta ostusoov
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,Only the selected Leave Approver can submit this Leave Application,Ainult valitud Jäta Approver võib esitada selle Jäta ostusoov
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Leevendab kuupäev peab olema suurem kui Liitumis
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Lehed aastas
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Palun määra nimetamine Series {0} Setup&gt; Seaded&gt; nimetamine Series
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Ladu {0} ei kuulu firma {1}
 DocType: Item Website Specification,Item Website Specification,Punkt Koduleht spetsifikatsioon
 DocType: Payment Tool,Reference No,Viitenumber
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Jäta blokeeritud
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},Punkt {0} on jõudnud oma elu lõppu kohta {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,Jäta blokeeritud
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Punkt {0} on jõudnud oma elu lõppu kohta {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Aastane
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock leppimise toode
 DocType: Stock Entry,Sales Invoice No,Müügiarve pole
@@ -248,7 +250,7 @@
 DocType: Pricing Rule,Supplier Type,Tarnija Type
 DocType: Item,Publish in Hub,Avaldab Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,Punkt {0} on tühistatud
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Punkt {0} on tühistatud
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Materjal taotlus
 DocType: Bank Reconciliation,Update Clearance Date,Värskenda Kliirens kuupäev
 DocType: Item,Purchase Details,Ostu üksikasjad
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Toimetaja märkus
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Seadistamine maksud
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Makse Entry on muudetud pärast seda, kui tõmbasin. Palun tõmmake uuesti."
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} sisestatud kaks korda Punkt Maksu-
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} sisestatud kaks korda Punkt Maksu-
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Kokkuvõte sel nädalal ja kuni tegevusi
 DocType: Workstation,Rent Cost,Üürile Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Palun valige kuu ja aasta
@@ -327,7 +329,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Sinu e-maili aadress
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,Palun vt lisa
 DocType: Purchase Order,% Received,% Vastatud
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Setup juba valmis !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Setup juba valmis !!
 ,Finished Goods,Valmistoodang
 DocType: Delivery Note,Instructions,Juhised
 DocType: Quality Inspection,Inspected By,Kontrollima
@@ -352,14 +354,13 @@
 ,Purchase Register,Ostu Registreeri
 DocType: Landed Cost Item,Applicable Charges,Kohaldatavate tasudega
 DocType: Workstation,Consumable Cost,Tarbekaubad Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) peab olema roll &quot;Leave Approver&quot;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) peab olema roll &quot;Leave Approver&quot;
 DocType: Purchase Receipt,Vehicle Date,Sõidukite kuupäev
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medical
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Põhjus kaotada
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation on suletud järgmistel kuupäevadel kohta Holiday nimekiri: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Võimalused
 DocType: Employee,Single,Single
-DocType: Issue,Attachment,Attachment
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Eelarve ei saa seada Group Cost Center
 DocType: Account,Cost of Goods Sold,Müüdud kaupade maksumus
 DocType: Purchase Invoice,Yearly,Iga-aastane
@@ -388,7 +389,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Global seaded kõik tootmisprotsessid.
 DocType: Accounts Settings,Accounts Frozen Upto,Kontod Külmutatud Upto
 DocType: SMS Log,Sent On,Saadetud
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Attribute {0} selected multiple times in Attributes Table,Oskus {0} valitakse mitu korda atribuudid Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Oskus {0} valitakse mitu korda atribuudid Table
 DocType: HR Settings,Employee record is created using selected field. ,"Töötaja rekord on loodud, kasutades valitud valdkonnas."
 DocType: Sales Order,Not Applicable,Ei kasuta
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Holiday kapten.
@@ -427,7 +428,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Palun sisestage Warehouse, mille materjal taotlus tõstetakse"
 DocType: Production Order,Additional Operating Cost,Täiendav töökulud
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmeetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items","Ühendamine, järgmised omadused peavad olema ühesugused teemad"
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Ühendamine, järgmised omadused peavad olema ühesugused teemad"
 DocType: Shipping Rule,Net Weight,Netokaal
 DocType: Employee,Emergency Phone,Emergency Phone
 ,Serial No Warranty Expiry,Serial No Garantii lõppemine
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Tegevjuht Alltöövõtt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mööblitööstuse
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Hinda kus Hinnakiri valuuta konverteeritakse ettevõtte baasvaluuta
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konto {0} ei kuulu firma: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Konto {0} ei kuulu firma: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Lühend kasutatakse juba teise firma
 DocType: Selling Settings,Default Customer Group,Vaikimisi Kliendi Group
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Kui keelata, &quot;Ümardatud Kokku väljale ei ole nähtav ühegi tehinguga"
 DocType: BOM,Operating Cost,Töökulud
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Salvestusi ei leitud Arvel tabelis
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Palun valige Company Pidu ja Type esimene
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Financial / eelarveaastal.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,kogunenud väärtused
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Vabandame, Serial nr saa liita"
 DocType: Project Task,Project Task,Projekti töörühma
 ,Lead Id,Plii Id
@@ -492,7 +495,7 @@
 DocType: Quotation,Quotation To,Tsitaat
 DocType: Lead,Middle Income,Keskmise sissetulekuga
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Avamine (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Vaikimisi mõõtühik Punkt {0} ei saa muuta otse, sest teil on juba mõned tehingu (te) teise UOM. Te peate looma uue Punkt kasutada erinevaid vaikimisi UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Vaikimisi mõõtühik Punkt {0} ei saa muuta otse, sest teil on juba mõned tehingu (te) teise UOM. Te peate looma uue Punkt kasutada erinevaid vaikimisi UOM."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Eraldatud summa ei saa olla negatiivne
 DocType: Purchase Order Item,Billed Amt,Arve Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Loogiline Warehouse mille vastu laos tehakse kandeid.
@@ -570,7 +573,7 @@
 DocType: Hub Settings,Seller City,Müüja City
 DocType: Email Digest,Next email will be sent on:,Järgmine email saadetakse edasi:
 DocType: Offer Letter Term,Offer Letter Term,Paku kiri Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item has variants.,Punkt on variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item has variants.,Punkt on variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Punkt {0} ei leitud
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -583,6 +586,7 @@
 DocType: Journal Entry,Credit Card Entry,Krediitkaart Entry
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Task Teema
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Tarnijatelt saadud kaupade.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,väärtuse
 DocType: Lead,Campaign Name,Kampaania nimi
 ,Reserved,Reserveeritud
 DocType: Purchase Order,Supply Raw Materials,Supply tooraine
@@ -597,16 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Konto olemasolevate tehing ei ole ümber arvestusraamatust
 DocType: Delivery Note,Customer's Purchase Order No,Kliendi ostutellimuse pole
 DocType: Employee,Cell Number,Mobiilinumber
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Material Taotlused Loodud
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Auto Material Taotlused Loodud
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Kaotsi läinud
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Sa ei saa sisestada praegune voucher in &quot;Against päevikusissekanne veerus
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Opportunity From
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Kuupalga avalduse.
 DocType: Item Group,Website Specifications,Koduleht erisused
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Seal on viga teie Aadress malli {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,New Account
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: From {0} tüüpi {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor on kohustuslik
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Mitu Hind reeglid olemas samad kriteeriumid, palun lahendada konflikte, määrates prioriteet. Hind Reeglid: {0}"
 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.,Raamatupidamise kanded saab teha peale tipud. Sissekanded vastu grupid ei ole lubatud.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Ei saa deaktiveerida või tühistada Bom, sest see on seotud teiste BOMs"
 DocType: Opportunity,Maintenance,Hooldus
@@ -649,7 +655,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,Hinnakiri ole valitud
 DocType: Employee,Family Background,Perekondlik taust
 DocType: Process Payroll,Send Email,Saada E-
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Hoiatus: Vigane Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Hoiatus: Vigane Attachment {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ei Luba
 DocType: Company,Default Bank Account,Vaikimisi Bank Account
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Filtreerida põhineb Party, Party Tüüp esimene"
@@ -679,13 +685,13 @@
 DocType: Production Planning Tool,Select Items,Vali kaubad
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} vastu Bill {1} dateeritud {2}
 DocType: Maintenance Visit,Completion Status,Lõpetamine staatus
-DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
+DocType: Production Order,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Laske üle väljasaatmisel või vastuvõtmisel upto see protsenti
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,Oodatud Toimetaja kuupäev ei saa olla enne Sales Order Date
 DocType: Upload Attendance,Import Attendance,Import Osavõtt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Kõik Punkt Groups
 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,Neto kasum / kahjum
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Neto kasum / kahjum
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automaatselt kirjutada sõnumi esitamise tehingud.
 DocType: Production Order,Item To Manufacture,Punkt toota
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} olek on {2}
@@ -693,7 +699,7 @@
 DocType: Sales Order Item,Projected Qty,Kavandatav Kogus
 DocType: Sales Invoice,Payment Due Date,Maksetähtpäevast
 DocType: Newsletter,Newsletter Manager,Uudiskiri Manager
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Punkt Variant {0} on juba olemas sama atribuute
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Punkt Variant {0} on juba olemas sama atribuute
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Avamine&quot;
 DocType: Notification Control,Delivery Note Message,Toimetaja märkus Message
 DocType: Expense Claim,Expenses,Kulud
@@ -703,7 +709,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Teadus- ja arendustegevus
 ,Amount to Bill,Summa Bill
 DocType: Company,Registration Details,Registreerimine Üksikasjad
-DocType: Item,Re-Order Qty,Re-Order Kogus
+DocType: Item Reorder,Re-Order Qty,Re-Order Kogus
 DocType: Leave Block List Date,Leave Block List Date,Jäta Block loetelu kuupäev
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planeeritud saata {0}
 DocType: Pricing Rule,Price or Discount,Hind või Soodus
@@ -746,7 +752,7 @@
 DocType: Bank Reconciliation,Total Amount,Kogu summa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet kirjastamine
 DocType: Production Planning Tool,Production Orders,Tootmine Tellimused
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Bilansilise väärtuse
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Bilansilise väärtuse
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Müük Hinnakiri
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Avalda sünkroonida esemed
 DocType: Bank Reconciliation,Account Currency,Konto Valuuta
@@ -755,7 +761,7 @@
 DocType: Supplier,Default Payable Accounts,Vaikimisi on tasulised kontod
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Töötaja {0} ei ole aktiivne või ei ole olemas
 DocType: Features Setup,Item Barcode,Punkt Triipkood
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,Item Variants {0} updated,Punkt variandid {0} uuendatud
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,Punkt variandid {0} uuendatud
 DocType: Quality Inspection Reading,Reading 6,Lugemine 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Ostuarve Advance
 DocType: Address,Shop,Kauplus
@@ -832,7 +838,7 @@
 DocType: POS Profile,Cash/Bank Account,Raha / Bank Account
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Eemaldatud esemed ei muutu kogus või väärtus.
 DocType: Delivery Note,Delivery To,Toimetaja
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,Oskus tabelis on kohustuslik
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,Attribute table is mandatory,Oskus tabelis on kohustuslik
 DocType: Production Planning Tool,Get Sales Orders,Võta müügitellimuste
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ei tohi olla negatiivne
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Soodus
@@ -860,7 +866,7 @@
 DocType: Tax Rule,Shipping State,Kohaletoimetamine riik
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Punkt tuleb lisada, kasutades &quot;Võta Kirjed Ostutšekid&quot; nuppu"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Müügikulud
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Standard ostmine
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Standard ostmine
 DocType: GL Entry,Against,Vastu
 DocType: Item,Default Selling Cost Center,Vaikimisi müügikulude Center
 DocType: Sales Partner,Implementation Partner,Rakendamine Partner
@@ -902,7 +908,7 @@
 DocType: Sales Partner,Distributor,Edasimüüja
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Ostukorv kohaletoimetamine reegel
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,Tootmine Tellimus {0} tuleb tühistada enne tühistades selle Sales Order
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Palun määra &quot;Rakenda Täiendav soodustust&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Palun määra &quot;Rakenda Täiendav soodustust&quot;
 ,Ordered Items To Be Billed,Tellitud esemed arve
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Siit Range peab olema väiksem kui levikuala
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Vali aeg kajakad ja esitab loo uus müügiarve.
@@ -970,9 +976,9 @@
 DocType: Contact,User ID,kasutaja ID
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Vaata Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Esimesed
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"An Item Group exists with same name, please change the item name or rename the item group","Elemendi Group olemas sama nimega, siis muuda objekti nimi või ümber nimetada elemendi grupp"
+apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Elemendi Group olemas sama nimega, siis muuda objekti nimi või ümber nimetada elemendi grupp"
 DocType: Production Order,Manufacture against Sales Order,Tootmine vastu Sales Order
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Ülejäänud maailm
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,Rest Of The World,Ülejäänud maailm
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Artiklite {0} ei ole partii
 ,Budget Variance Report,Eelarve Dispersioon aruanne
 DocType: Salary Slip,Gross Pay,Gross Pay
@@ -1002,7 +1008,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,Not authorized to edit frozen Account {0},Ei ole lubatud muuta külmutatud Konto {0}
 DocType: Journal Entry,Get Outstanding Invoices,Võta Tasumata arved
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} ei ole kehtiv
-apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Vabandame, ettevõtted ei saa liita"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Vabandame, ettevõtted ei saa liita"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Väike
 DocType: Employee,Employee Number,Töötaja number
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Case (te) juba kasutusel. Proovige kohtuasjas No {0}
@@ -1021,7 +1027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Põllumajandus
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Oma tooteid või teenuseid
 DocType: Mode of Payment,Mode of Payment,Makseviis
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Koduleht Pilt peaks olema avalik faili või veebilehe URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Koduleht Pilt peaks olema avalik faili või veebilehe URL
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,See on ülemelemendile rühma ja seda ei saa muuta.
 DocType: Journal Entry Account,Purchase Order,Ostutellimuse
 DocType: Warehouse,Warehouse Contact Info,Ladu Kontakt
@@ -1093,6 +1099,7 @@
 DocType: Address,Utilities,Kommunaalteenused
 DocType: Purchase Invoice Item,Accounting,Raamatupidamine
 DocType: Features Setup,Features Setup,Omadused Setup
+DocType: Item,Is Service Item,Kas Service toode
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Taotlemise tähtaeg ei tohi olla väljaspool puhkuse eraldamise ajavahemikul
 DocType: Activity Cost,Projects,Projektid
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Palun valige Fiscal Year
@@ -1123,7 +1130,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontoplaan
 DocType: Material Request,Terms and Conditions Content,Tingimused sisu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +465,cannot be greater than 100,ei saa olla üle 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Punkt {0} ei ole laos toode
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Punkt {0} ei ole laos toode
 DocType: Maintenance Visit,Unscheduled,Plaaniväline
 DocType: Employee,Owned,Omanik
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Oleneb palgata puhkust
@@ -1182,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Valitsus
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Punkt variandid
 DocType: Company,Services,Teenused
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Kokku ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Kokku ({0})
 DocType: Cost Center,Parent Cost Center,Parent Cost Center
 DocType: Sales Invoice,Source,Allikas
 DocType: Leave Type,Is Leave Without Pay,Kas palgata puhkust
@@ -1255,17 +1262,17 @@
 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.,Kui soovite jälgida objekte kasutades vöötkoodi. Sul on võimalik siseneda punkte saateleht ja müügiarve skaneerimine vöötkoodi punkti.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Saada uuesti Makse Email
 DocType: Dependent Task,Dependent Task,Sõltub Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,Conversion factor for default Unit of Measure must be 1 in row {0},Muundustegurit Vaikemõõtühik peab olema 1 rida {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Leave of type {0} cannot be longer than {1},Jäta tüüpi {0} ei saa olla pikem kui {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Muundustegurit Vaikemõõtühik peab olema 1 rida {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Leave of type {0} cannot be longer than {1},Jäta tüüpi {0} ei saa olla pikem kui {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Proovige plaanis operatsioonide X päeva ette.
 DocType: HR Settings,Stop Birthday Reminders,Stopp Sünnipäev meeldetuletused
 DocType: SMS Center,Receiver List,Vastuvõtja loetelu
 DocType: Payment Tool Detail,Payment Amount,Makse summa
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Tarbitud
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Vaata
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Net muutus Cash
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Net muutus Cash
 DocType: Salary Structure Deduction,Salary Structure Deduction,Palgastruktuur mahaarvamine
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mõõtühik {0} on kantud rohkem kui üks kord Conversion Factor tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mõõtühik {0} on kantud rohkem kui üks kord Conversion Factor tabel
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Maksenõudekäsule juba olemas {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kulud Väljastatud Esemed
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Quantity must not be more than {0},Kogus ei tohi olla rohkem kui {0}
@@ -1327,7 +1334,7 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Palun valige objekti kood
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Vähendada mahaarvamine eest palgata puhkust (LWP)
 DocType: Territory,Territory Manager,Territoorium Manager
-DocType: Delivery Note Item,To Warehouse (Optional),Et Warehouse (valikuline)
+DocType: Packed Item,To Warehouse (Optional),Et Warehouse (valikuline)
 DocType: Sales Invoice,Paid Amount (Company Currency),Paide summa (firma Valuuta)
 DocType: Purchase Invoice,Additional Discount,Täiendav Soodus
 DocType: Selling Settings,Selling Settings,Müük Seaded
@@ -1336,7 +1343,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Ettevõte, Kuu ja majandusaasta on kohustuslik"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Turundus kulud
 ,Item Shortage Report,Punkt Puuduse aruanne
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Kaal on mainitud, \ nKui mainida &quot;Kaal UOM&quot; liiga"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Kaal on mainitud, \ nKui mainida &quot;Kaal UOM&quot; liiga"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materjal taotlus kasutatakse selle Stock Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Single üksuse objekt.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Aeg Logi Partii {0} tuleb &quot;Esitatud&quot;
@@ -1347,6 +1354,7 @@
 DocType: Employee,Date Of Retirement,Kuupäev pensionile
 DocType: Upload Attendance,Get Template,Võta Mall
 DocType: Address,Postal,Posti-
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 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,Kliendi Group olemas sama nimega siis muuta kliendi nimi või ümber Kliendi Group
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Palun valige {0} esimene.
@@ -1375,12 +1383,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Liiga palju veerge. Eksport aruande ja printida tabelarvutuse rakenduse.
 DocType: Sales Invoice Item,Batch No,Partii ei
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Laske mitu müügitellimuste vastu Kliendi ostutellimuse
-apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Main
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Määra eesliide numeratsiooni seeria oma tehingute
 DocType: Employee Attendance Tool,Employees HTML,Töötajad HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,Tasuda tellimust ei ole võimalik tühistada. Ummistust tühistada.
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,Vaikimisi Bom ({0}) peab olema aktiivne selle objekt või selle malli
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Vaikimisi Bom ({0}) peab olema aktiivne selle objekt või selle malli
 DocType: Employee,Leave Encashed?,Jäta realiseeritakse?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity From väli on kohustuslik
 DocType: Item,Variants,Variante
@@ -1405,7 +1413,6 @@
 DocType: Sales Order,To Deliver and Bill,Pakkuda ja Bill
 DocType: GL Entry,Credit Amount in Account Currency,Krediidi Summa konto Valuuta
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Aeg kajakad tootmine.
-DocType: Item,Apply Warehouse-wise Reorder Level,Rakenda Warehouse tark Reorder Level
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,Bom {0} tuleb esitada
 DocType: Authorization Control,Authorization Control,Autoriseerimiskontroll
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: lükata Warehouse on kohustuslik vastu rahuldamata Punkt {1}
@@ -1503,6 +1510,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,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} ei ole lõpule {2} tk valmistoodangu tootmine Tellimus {3}. Palun uuendage töö staatusest kaudu Time Palgid
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investeeringud
 DocType: Issue,Resolution Details,Resolutsioon Üksikasjad
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,eraldised
 DocType: Quality Inspection Reading,Acceptance Criteria,Vastuvõetavuse kriteeriumid
 DocType: Item Attribute,Attribute Name,Atribuudi nimi
 DocType: Item Group,Show In Website,Show Website
@@ -1553,7 +1561,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,Kuluhüvitussüsteeme kinnituse ootel. Ainult Kulu Approver saab uuendada staatus.
 DocType: Purchase Invoice,Additional Discount Amount,Täiendav Allahindluse summa
 DocType: Leave Block List Allow,Leave Block List Allow,Jäta Block loetelu Laske
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Lühend ei saa olla tühi või ruumi
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Lühend ei saa olla tühi või ruumi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grupi Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Spordi-
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Kokku Tegelik
@@ -1594,7 +1602,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Punkt {0} on juba tagasi
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiscal Year ** esindab majandusaastal. Kõik raamatupidamiskanded ja teiste suuremate tehingute jälgitakse vastu ** Fiscal Year **.
 DocType: Opportunity,Customer / Lead Address,Klienditeenindus / Plii Aadress
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Hoiatus: Vigane SSL sertifikaat kinnitus {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Hoiatus: Vigane SSL sertifikaat kinnitus {0}
 DocType: Production Order Operation,Actual Operation Time,Tegelik tööaeg
 DocType: Authorization Rule,Applicable To (User),Suhtes kohaldatava (Kasutaja)
 DocType: Purchase Taxes and Charges,Deduct,Maha arvama
@@ -1743,7 +1751,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Juhtum nr saa olla 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,Kui teil on meeskond ja müük Partners (Kanal Partnerid) neid saab kodeeritud ja säilitada oma panuse müügitegevus
 DocType: Item,Show a slideshow at the top of the page,Näita slaidiseansi ülaosas lehele
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Kauplused
+DocType: Item,"Allow in Sales Order of type ""Service""",Luba Sales Order of type &quot;Service&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Kauplused
 DocType: Time Log,Projects Manager,Projektijuhina
 DocType: Serial No,Delivery Time,Tarne aeg
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Vananemine Põhineb
@@ -1768,7 +1777,7 @@
 ,Financial Analytics,Financial Analytics
 DocType: Quality Inspection,Verified By,Kontrollitud
 DocType: Address,Subsidiary,Tütarettevõte
-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.","Ei saa muuta ettevõtte default valuutat, sest seal on olemasolevate tehingud. Tehingud tuleb tühistada muuta default valuutat."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Ei saa muuta ettevõtte default valuutat, sest seal on olemasolevate tehingud. Tehingud tuleb tühistada muuta default valuutat."
 DocType: Quality Inspection,Purchase Receipt No,Ostutšekk pole
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Käsiraha
 DocType: Process Payroll,Create Salary Slip,Loo palgatõend
@@ -1816,7 +1825,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Tooraine ei saa olla tühi.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Ei uuendada laos, arve sisaldab tilk laevandus objekt."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'","Nagu on olemasolevate varude tehingute selle objekt, \ sa ei saa muuta väärtused &quot;Kas Serial No&quot;, &quot;Kas Partii ei&quot;, &quot;Kas Stock toode&quot; ja &quot;hindamismeetod&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick päevikusissekanne
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Sa ei saa muuta kiirust kui Bom mainitud agianst tahes kirje
@@ -1905,7 +1914,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Palun saateleht esimene
 DocType: Purchase Invoice,Currency and Price List,Valuuta ja hinnakiri
 DocType: Opportunity,Customer / Lead Name,Klienditeenindus / Plii nimi
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Kliirens kuupäev ei ole nimetatud
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Kliirens kuupäev ei ole nimetatud
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Toodang
 DocType: Item,Allow Production Order,Laske Production Telli
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Start Date tuleb enne End Date
@@ -1915,7 +1924,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,Kokku teenimine
 DocType: Purchase Receipt,Time at which materials were received,"Aeg, mil materjale ei laekunud"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,Minu aadressid
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Minu aadressid
 DocType: Stock Ledger Entry,Outgoing Rate,Väljuv Rate
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Organisatsiooni haru meister.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,või
@@ -1984,7 +1993,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Hallata klientide Group Tree.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,New Cost Center nimi
 DocType: Leave Control Panel,Leave Control Panel,Jäta Control Panel
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,No default Aadress Mall leitud. Palun loo uus Setup&gt; Trükkimine ja Branding&gt; Aadress Mall.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,No default Aadress Mall leitud. Palun loo uus Setup&gt; Trükkimine ja Branding&gt; Aadress Mall.
 DocType: Appraisal,HR User,HR Kasutaja
 DocType: Purchase Invoice,Taxes and Charges Deducted,Maksude ja tasude maha
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Issues
@@ -2001,7 +2010,7 @@
 ,Sales Browser,Müük Browser
 DocType: Journal Entry,Total Credit,Kokku Credit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Hoiatus: Teine {0} # {1} on olemas vastu laos kirje {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Kohalik
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,Local,Kohalik
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Laenud ja ettemaksed (vara)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Võlgnikud
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Suur
@@ -2020,7 +2029,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Kõik müügitehingud saab kodeeritud vastu mitu ** Sales Isikud ** nii et saate määrata ja jälgida eesmärgid.
 ,S.O. No.,SO No.
 DocType: Production Order Operation,Make Time Log,Tee Time Logi
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Palun määra reorganiseerima kogusest
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Palun luua Klienti Lead {0}
 DocType: Price List,Applicable for Countries,Rakendatav Riigid
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Arvutid
@@ -2095,7 +2103,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Võta Vastavad kanded
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Raamatupidamine kirjet Stock
 DocType: Sales Invoice,Sales Team1,Müük Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Punkt {0} ei ole olemas
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Punkt {0} ei ole olemas
 DocType: Sales Invoice,Customer Address,Kliendi aadress
 DocType: Payment Request,Recipient and Message,Saaja ja Message
 DocType: Purchase Invoice,Apply Additional Discount On,Rakendada täiendavaid soodustust
@@ -2137,7 +2145,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Hindamine Rate
 apps/erpnext/erpnext/stock/get_item_details.py +274,Price List Currency not selected,Hinnakiri Valuuta ole valitud
 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,Punkt Row {0}: ostutšekk {1} ei eksisteeri üle &quot;Ostutšekid&quot; tabelis
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Employee {0} has already applied for {1} between {2} and {3},Töötaja {0} on juba taotlenud {1} vahel {2} ja {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Employee {0} has already applied for {1} between {2} and {3},Töötaja {0} on juba taotlenud {1} vahel {2} ja {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekti alguskuupäev
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Kuni
 DocType: Rename Tool,Rename Log,Nimeta Logi
@@ -2175,7 +2183,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Palun sisestage leevendab kuupäeva.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Ainult Jäta rakendusi staatuse &quot;Kinnitatud&quot; saab esitada
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Aadress Pealkiri on kohustuslik.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Aadress Pealkiri on kohustuslik.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Sisesta nimi kampaania kui allikas uurimine on kampaania
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Ajaleht Publishers
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vali Fiscal Year
@@ -2199,6 +2207,7 @@
 DocType: UOM,Must be Whole Number,Peab olema täisarv
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Uus Lehed Eraldatud (päevades)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial No {0} ei ole olemas
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Kliendi Warehouse (valikuline)
 DocType: Pricing Rule,Discount Percentage,Allahindlusprotsendi
 DocType: Payment Reconciliation Invoice,Invoice Number,Arve number
 apps/erpnext/erpnext/hooks.py +55,Orders,Tellimused
@@ -2308,7 +2317,7 @@
 DocType: Appraisal,Appraisal,Hinnang
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Kuupäev korratakse
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Allkirjaõiguslik
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},Jäta heakskiitja peab olema üks {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,Leave approver must be one of {0},Jäta heakskiitja peab olema üks {0}
 DocType: Hub Settings,Seller Email,Müüja Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Kokku ostukulud (via ostuarve)
 DocType: Workstation Working Hour,Start Time,Algusaeg
@@ -2477,7 +2486,7 @@
 DocType: BOM Replace Tool,BOM Replace Tool,Bom Vahetage Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Riik tark default Aadress Templates
 DocType: Sales Order Item,Supplier delivers to Customer,Tarnija tarnib Tellija
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Näita maksu break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Näita maksu break-up
 apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Tänu / Viitekuupäev ei saa pärast {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Andmete impordi ja ekspordi
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Kui teil kaasata tootmistegevus. Võimaldab Punkt &quot;toodetakse&quot;
@@ -2526,7 +2535,7 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Enne leppimist
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Maksude ja tasude lisatud (firma Valuuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +384,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Punkt Maksu- Row {0} peab olema konto tüüpi Tax või tulu või kuluna või tasuline
+apps/erpnext/erpnext/stock/doctype/item/item.py +378,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Punkt Maksu- Row {0} peab olema konto tüüpi Tax või tulu või kuluna või tasuline
 DocType: Sales Order,Partly Billed,Osaliselt Maksustatakse
 DocType: Item,Default BOM,Vaikimisi Bom
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Palun ümber kirjutada firma nime kinnitamiseks
@@ -2553,8 +2562,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Viitenumber on kohustuslik, kui sisestatud Viitekuupäev"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Liitumis peab olema suurem kui Sünniaeg
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Palgastruktuur
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Mitu Hind reegel olemas samad kriteeriumid, palun lahendada \ konflikti esmatähtsad. Hind Reeglid: {0}"
 DocType: Account,Bank,Pank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Lennukompanii
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Väljaanne Material
@@ -2579,7 +2586,7 @@
 DocType: Issue,Opening Time,Avamine aeg
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Ja sealt soovitud vaja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Väärtpaberite ja kaubabörsil
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Vaikimisi mõõtühik Variant &quot;{0}&quot; peab olema sama, Mall &quot;{1}&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Vaikimisi mõõtühik Variant &quot;{0}&quot; peab olema sama, Mall &quot;{1}&quot;"
 DocType: Shipping Rule,Calculate Based On,Arvuta põhineb
 DocType: Delivery Note Item,From Warehouse,Siit Warehouse
 DocType: Purchase Taxes and Charges,Valuation and Total,Hindamine ja kokku
@@ -2588,7 +2595,7 @@
 DocType: Account,Purchase User,Ostu Kasutaja
 DocType: Notification Control,Customize the Notification,Kohanda teatamine
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Rahavoog äritegevusest
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Vaikimisi Aadress Mall ei saa kustutada
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Vaikimisi Aadress Mall ei saa kustutada
 DocType: Sales Invoice,Shipping Rule,Kohaletoimetamine reegel
 DocType: Manufacturer,Limited to 12 characters,Üksnes 12 tähemärki
 DocType: Journal Entry,Print Heading,Prindi Rubriik
@@ -2681,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,Projekti tark andmed ei ole kättesaadavad Tsitaat
 DocType: Project,Expected End Date,Oodatud End Date
 DocType: Appraisal Template,Appraisal Template Title,Hinnang Mall Pealkiri
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,Kaubanduslik
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,Commercial,Kaubanduslik
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Punkt {0} ei tohi olla laoartikkel
 DocType: Cost Center,Distribution Id,Distribution Id
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Teenused
@@ -2700,7 +2707,7 @@
 DocType: Customer,Default Receivable Accounts,Vaikimisi võlgnevus konto
 DocType: Tax Rule,Billing State,Arved riik
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Tõmba plahvatas Bom (sh sõlmed)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),Tõmba plahvatas Bom (sh sõlmed)
 DocType: Authorization Rule,Applicable To (Employee),Suhtes kohaldatava (töötaja)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,Tähtaeg on kohustuslik
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Juurdekasv Oskus {0} ei saa olla 0
@@ -2733,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negatiivne Hindamine Rate ei ole lubatud
 DocType: Holiday List,Weekly Off,Weekly Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",Sest näiteks 2012. 2012-13
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Ajutine kasum / kahjum (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Ajutine kasum / kahjum (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Tagasi Against müügiarve
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Punkt 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Palun määra vaikeväärtus {0} Company {1}
@@ -2764,6 +2771,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Lisa Child
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Role lubatud kehtestada külmutatud kontode ja Edit Külmutatud kanded
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Ei saa teisendada Cost Center pearaamatu, sest see on tütartippu"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Seis
 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,Müügiprovisjon
 DocType: Offer Letter Term,Value / Description,Väärtus / Kirjeldus
@@ -2797,7 +2805,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,"Edukalt kustutatud kõik tehingud, mis on seotud selle firma!"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kuupäeva järgi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Karistusest
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Vaikimisi Warehouse on kohustuslik laos Punkt.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Palga kuu {0} ja aasta {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto sisestada Hinnakiri määra, kui puuduvad"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Kokku Paide summa
@@ -2833,7 +2840,7 @@
 DocType: Payment Tool,Set Matching Amounts,Määra Matching summad
 DocType: Purchase Invoice,Taxes and Charges Added,Maksude ja tasude lisatud
 ,Sales Funnel,Müügi lehtri
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Lühend on kohustuslik
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Lühend on kohustuslik
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Täname huvi tellides meie uuendused
 ,Qty to Transfer,Kogus Transfer
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Hinnapakkumisi Leads või klientidele.
@@ -2861,7 +2868,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,Tarnija Tsitaat
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Sõnades on nähtav, kui salvestate pakkumise."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} on peatunud
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Lugu {0} on juba kasutatud Punkt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Lugu {0} on juba kasutatud Punkt {1}
 DocType: Lead,Add to calendar on this date,Lisa kalendrisse selle kuupäeva
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Reeglid lisamiseks postikulud.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Sündmused
@@ -2883,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Vali Fiscal Year ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS Profile vaja teha POS Entry
 DocType: Hub Settings,Name Token,Nimi Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Standard Selling
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Atleast üks ladu on kohustuslik
 DocType: Serial No,Out of Warranty,Out of Garantii
 DocType: BOM Replace Tool,Replace,Vahetage
@@ -3006,7 +3013,7 @@
 DocType: Sales Invoice,Paid Amount,Paide summa
 ,Available Stock for Packing Items,Saadaval Stock jaoks asjade pakkimist
 DocType: Item Variant,Item Variant,Punkt Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Kui määrata Aadress Mall vaikimisi kuna puudub muu default
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,Kui määrata Aadress Mall vaikimisi kuna puudub muu default
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konto jääk juba Deebetkaart, sa ei tohi seada &quot;Balance tuleb&quot; nagu &quot;Credit&quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Kvaliteedijuhtimine
 DocType: Production Planning Tool,Filter based on customer,Filter põhineb kliendi
@@ -3107,7 +3114,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Et määrata selle Fiscal Year as Default, kliki &quot;Set as Default&quot;"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup sissetuleva serveri tuge e-posti id. (nt support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Puuduse Kogus
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Punkt variant {0} on olemas sama atribuute
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Punkt variant {0} on olemas sama atribuute
 DocType: Salary Slip,Salary Slip,Palgatõend
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"&quot;Selleks, et kuupäev&quot; on vajalik"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Loo pakkimine libiseb paketid saadetakse. Kasutatud teatama paketi number, pakendi sisu ning selle kaalu."
@@ -3118,7 +3125,7 @@
 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.","Kui mõni kontrollida tehinguid &quot;Esitatud&quot;, talle pop-up automaatselt avada saata e-kiri seotud &quot;kontakt&quot;, et tehing, mille tehing manusena. Kasutaja ei pruugi saata e."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Global Settings
 DocType: Employee Education,Employee Education,Töötajate haridus
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,"See on vajalik, et tõmbad Punkt Details."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,It is needed to fetch Item Details.,"See on vajalik, et tõmbad Punkt Details."
 DocType: Salary Slip,Net Pay,Netopalk
 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} on juba saanud
@@ -3144,6 +3151,7 @@
 DocType: BOM,Manufacturing User,Tootmine Kasutaja
 DocType: Purchase Order,Raw Materials Supplied,Tarnitud tooraine
 DocType: Purchase Invoice,Recurring Print Format,Korduvad Prindi Formaat
+DocType: C-Form,Series,Sari
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,Oodatud Toimetaja kuupäev ei saa olla enne Ostutellimuse kuupäev
 DocType: Appraisal,Appraisal Template,Hinnang Mall
 DocType: Item Group,Item Classification,Punkt klassifitseerimine
@@ -3219,7 +3227,7 @@
 DocType: Workstation,Operating Costs,Tegevuskulud
 DocType: Employee Leave Approver,Employee Leave Approver,Töötaja Jäta Approver
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} on edukalt lisatud meie uudiskiri nimekirja.
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: an Reorder kirje on juba olemas selle lao {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: an Reorder kirje on juba olemas selle lao {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Ei saa kuulutada kadunud, sest Tsitaat on tehtud."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Ostu Master Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Tootmine Tellimus {0} tuleb esitada
@@ -3227,7 +3235,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Peamised aruanded
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Praeguseks ei saa enne kuupäevast alates
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Klienditeenindus Lisa / uuenda Hinnad
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,Klienditeenindus Lisa / uuenda Hinnad
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Graafik kulukeskuste
 ,Requested Items To Be Ordered,Taotlenud objekte tuleb tellida
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +315,My Orders,Minu Tellimused
@@ -3275,7 +3283,7 @@
 DocType: Employee,Date of Issue,Väljastamise kuupäev
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: From {0} ja {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Row # {0}: Vali Tarnija kirje {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Koduleht Pilt {0} juurde Punkt {1} ei leitud
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Koduleht Pilt {0} juurde Punkt {1} ei leitud
 DocType: Issue,Content Type,Sisu tüüp
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Arvuti
 DocType: Item,List this Item in multiple groups on the website.,Nimekiri see toode mitmes rühmade kodulehel.
@@ -3289,7 +3297,7 @@
 DocType: Delivery Note,To Warehouse,Et 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} on kantud rohkem kui üks kord majandusaasta {1}
 ,Average Commission Rate,Keskmine Komisjoni Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Kas Serial No&quot; ei saa olla &quot;Jah&quot; mitte-laoartikkel
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Kas Serial No&quot; ei saa olla &quot;Jah&quot; mitte-laoartikkel
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Osavõtt märkida ei saa tulevikus kuupäev
 DocType: Pricing Rule,Pricing Rule Help,Hinnakujundus Reegel Abi
 DocType: Purchase Taxes and Charges,Account Head,Konto Head
@@ -3315,7 +3323,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Konto sulgemise {0} tüüp peab olema vastutus / Equity
 DocType: Authorization Rule,Based On,Põhineb
 DocType: Sales Order Item,Ordered Qty,Tellitud Kogus
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Punkt {0} on keelatud
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Punkt {0} on keelatud
 DocType: Stock Settings,Stock Frozen Upto,Stock Külmutatud Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},Ajavahemikul ja periood soovitud kohustuslik korduvad {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekti tegevus / ülesanne.
@@ -3323,7 +3331,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Ostmine tuleb kontrollida, kui need on kohaldatavad valitakse {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Soodustus peab olema väiksem kui 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Kirjutage Off summa (firma Valuuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Row # {0}: määrake reorganiseerima kogusest
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Row # {0}: määrake reorganiseerima kogusest
 DocType: Landed Cost Voucher,Landed Cost Voucher,Maandus Cost Voucher
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Palun määra {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Korda päev kuus
@@ -3395,7 +3403,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Vaata nüüd
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Vali mil arve genereeritakse automaatselt
 DocType: BOM,Raw Material Cost,Tooraine hind
-DocType: Item,Re-Order Level,Re-Order Level
+DocType: Item Reorder,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.,"Sisesta esemed ja planeeritud Kogus, mille soovite tõsta tootmise tellimuste või laadida tooraine analüüsi."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Poole kohaga
 DocType: Employee,Applicable Holiday List,Rakendatav Holiday nimekiri
@@ -3450,7 +3458,7 @@
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Kogus punkti saadi pärast tootmise / pakkimise etteantud tooraine kogused
 DocType: Payment Reconciliation,Receivable / Payable Account,Laekumata / maksmata konto
 DocType: Delivery Note Item,Against Sales Order Item,Vastu Sales Order toode
-apps/erpnext/erpnext/stock/doctype/item/item.py +573,Please specify Attribute Value for attribute {0},Palun täpsustage omadus Väärtus atribuut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Please specify Attribute Value for attribute {0},Palun täpsustage omadus Väärtus atribuut {0}
 DocType: Item,Default Warehouse,Vaikimisi Warehouse
 DocType: Task,Actual End Date (via Time Logs),Tegelik End Date (via aeg kajakad)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Eelarve ei saa liigitada vastu Group Konto {0}
@@ -3529,7 +3537,7 @@
 DocType: Address,Office,Kontor
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Raamatupidamine päevikukirjete.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Saadaval Kogus kell laost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Palun valige Töötaja Record esimene.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,Palun valige Töötaja Record esimene.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Pidu / konto ei ühti {1} / {2} on {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Et luua Maksu- konto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Palun sisestage ärikohtumisteks
@@ -3604,7 +3612,7 @@
 DocType: Item Attribute,Numeric Values,Arvväärtuste
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Kinnita Logo
 DocType: Customer,Commission Rate,Komisjonitasu määr
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Tee Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Tee Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Block puhkuse taotluste osakonda.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Ostukorv on tühi
 DocType: Production Order,Actual Operating Cost,Tegelik töökulud
@@ -3621,15 +3629,14 @@
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Tingimused Mall
 DocType: Serial No,Delivery Details,Toimetaja detailid
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},Cost Center on vaja järjest {0} maksude tabel tüüp {1}
-DocType: Item,Automatically create Material Request if quantity falls below this level,"Automaatselt luua Material taotluse, kui kogus langeb alla selle taseme"
 ,Item-wise Purchase Register,Punkt tark Ostu Registreeri
 DocType: Batch,Expiry Date,Aegumisaja
-apps/erpnext/erpnext/stock/doctype/item/item.py +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Et valida reorganiseerima tasandil, objekt peab olema Ostu toode või tootmine Punkt"
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Et valida reorganiseerima tasandil, objekt peab olema Ostu toode või tootmine Punkt"
 ,Supplier Addresses and Contacts,Tarnija aadressid ja kontaktid
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Palun valige kategooria esimene
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekti kapten.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ära näita tahes sümbol nagu $ jne kõrval valuutades.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Pool päeva)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(Pool päeva)
 DocType: Supplier,Credit Days,Krediidi päeva
 DocType: Leave Type,Is Carry Forward,Kas kanda
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Võta Kirjed Bom
diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv
index 99b4bf4..79bfd5c 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,٪ صورتحساب
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),نرخ ارز باید به همان صورت {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,نام مشتری
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},حساب بانکی می تواند به عنوان نمی شود به نام {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},حساب بانکی می تواند به عنوان نمی شود به نام {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),برجسته برای {0} نمی تواند کمتر از صفر ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,جدید مرخصی استفاده
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,جدید مرخصی استفاده
 apps/erpnext/erpnext/setup/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,نحوه حساب پرداخت
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",ورود از فعالیت های انجام شده توسط کاربران در برابر وظایف است که می تواند برای ردیابی زمان، صدور صورت حساب استفاده می شود.
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},جدید {0}: # {1}
 ,Sales Partners Commission,کمیسیون همکاران فروش
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,مخفف می توانید بیش از 5 کاراکتر ندارد
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,مخفف می توانید بیش از 5 کاراکتر ندارد
 DocType: Payment Request,Payment Request,درخواست پرداخت
 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.",موجودیت مقدار {0} نمی تواند از {1} به عنوان مورد انواع \ برداشته شود با این ویژگی وجود دارد.
@@ -195,6 +195,7 @@
 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 (%),تخفیف در لیست قیمت نرخ (٪)
 DocType: Offer Letter,Select Terms and Conditions,انتخاب شرایط و ضوابط
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,ارزش از
 DocType: Production Planning Tool,Sales Orders,سفارشات فروش
 DocType: Purchase Taxes and Charges,Valuation,ارزیابی
 ,Purchase Order Trends,خرید سفارش روند
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,تلویزیون
 DocType: Production Order Operation,Updated via 'Time Log',به روز شده از طریق &#39;زمان ورود &quot;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},حساب {0} به شرکت تعلق ندارد {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},مقدار پیش نمی تواند بیشتر از {0} {1}
 DocType: Naming Series,Series List for this Transaction,فهرست سری ها برای این تراکنش
 DocType: Sales Invoice,Is Opening Entry,باز ورودی
 DocType: Customer Group,Mention if non-standard receivable account applicable,اگر حساب دریافتنی ذکر غیر استاندارد قابل اجرا
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,ایجاد لغزش حقوق و دستمزد برای معیارهای ذکر شده در بالا.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,بدون شرح داده می شود
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,درخواست برای خرید.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,فقط تصویب مرخصی انتخاب می توانید از این مرخصی استفاده کنید
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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} از طریق راه اندازی&gt; تنظیمات&gt; نامگذاری سری مجموعه
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},انبار {0} به شرکت تعلق ندارد {1}
 DocType: Item Website Specification,Item Website Specification,مشخصات مورد وب سایت
 DocType: Payment Tool,Reference No,مرجع بدون
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,ترک مسدود
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,ترک مسدود
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,سالیانه
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,مورد سهام آشتی
 DocType: Stock Entry,Sales Invoice No,فاکتور فروش بدون
@@ -248,7 +250,7 @@
 DocType: Pricing Rule,Supplier Type,نوع منبع
 DocType: Item,Publish in Hub,انتشار در توپی
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,مورد {0} لغو شود
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,مورد {0} لغو شود
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,درخواست مواد
 DocType: Bank Reconciliation,Update Clearance Date,به روز رسانی ترخیص کالا از تاریخ
 DocType: Item,Purchase Details,جزئیات خرید
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,رسید
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,راه اندازی مالیات
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,ورود پرداخت اصلاح شده است پس از آن کشیده شده است. لطفا آن را دوباره بکشید.
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} دو بار در مالیات وارد شده است
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,لطفا ماه و سال را انتخاب کنید
@@ -327,7 +329,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,آدرس ایمیل شما
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,لطفا پیوست را ببینید
 DocType: Purchase Order,% Received,٪ دریافتی
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,راه اندازی در حال حاضر کامل!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,راه اندازی در حال حاضر کامل!
 ,Finished Goods,محصولات تمام شده
 DocType: Delivery Note,Instructions,دستورالعمل
 DocType: Quality Inspection,Inspected By,بازرسی توسط
@@ -352,14 +354,13 @@
 ,Purchase Register,خرید ثبت نام
 DocType: Landed Cost Item,Applicable Charges,اتهامات قابل اجرا
 DocType: Workstation,Consumable Cost,هزینه مصرفی
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) باید اجازه 'تایید و امضا مرخصی' را داشته باشید
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) باید اجازه 'تایید و امضا مرخصی' را داشته باشید
 DocType: Purchase Receipt,Vehicle Date,خودرو تاریخ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,پزشکی
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,دلیل برای از دست دادن
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},ایستگاه های کاری در تاریخ زیر را به عنوان در هر فهرست تعطیلات بسته است: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,فرصت ها
 DocType: Employee,Single,تک
-DocType: Issue,Attachment,دلبستگی
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,بودجه می تواند برای مرکز هزینه گروه تواند تنظیم شود
 DocType: Account,Cost of Goods Sold,هزینه کالاهای فروخته شده
 DocType: Purchase Invoice,Yearly,سالیانه
@@ -388,7 +389,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,ویژگی {0} چند بار در صفات جدول انتخاب
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,ویژگی {0} چند بار در صفات جدول انتخاب
 DocType: HR Settings,Employee record is created using selected field. ,رکورد کارمند با استفاده از درست انتخاب شده ایجاد می شود.
 DocType: Sales Order,Not Applicable,قابل اجرا نیست
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,کارشناسی ارشد تعطیلات.
@@ -427,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,آرایشی و بهداشتی
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items",به ادغام، خواص زیر باید همین کار را برای هر دو مورد می شود
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items",به ادغام، خواص زیر باید همین کار را برای هر دو مورد می شود
 DocType: Shipping Rule,Net Weight,وزن خالص
 DocType: Employee,Emergency Phone,تلفن اضطراری
 ,Serial No Warranty Expiry,سریال بدون گارانتی انقضاء
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,مدیریت مقاطعه کاری فرعی
 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,سرعت که در آن لیست قیمت ارز به ارز پایه شرکت تبدیل
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},حساب {0} به شرکت تعلق ندارد: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},حساب {0} به شرکت تعلق ندارد: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,مخفف در حال حاضر برای یک شرکت دیگر مورد استفاده قرار گیرد
 DocType: Selling Settings,Default Customer Group,به طور پیش فرض مشتری گروه
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",اگر غیر فعال کردن، درست &quot;گرد مجموع خواهد در هر معامله قابل نمایش باشد
 DocType: BOM,Operating Cost,هزینه های عملیاتی
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,هیچ ثبتی یافت نشد در جدول فاکتور
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,لطفا ابتدا شرکت و حزب نوع را انتخاب کنید
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,مالی سال / حسابداری.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,ارزش انباشته
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",با عرض پوزش، سریال شماره نمی تواند با هم ادغام شدند
 DocType: Project Task,Project Task,وظیفه پروژه
 ,Lead Id,کد شناسایی راهبر
@@ -492,7 +495,7 @@
 DocType: Quotation,Quotation To,نقل قول برای
 DocType: Lead,Middle Income,با درآمد متوسط
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),افتتاح (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,واحد اندازه گیری پیش فرض برای مورد {0} می توانید به طور مستقیم نمی توان تغییر چون در حال حاضر ساخته شده برخی از معامله (ها) با UOM است. شما نیاز به ایجاد یک آیتم جدید به استفاده از پیش فرض UOM متفاوت است.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,واحد اندازه گیری پیش فرض برای مورد {0} می توانید به طور مستقیم نمی توان تغییر چون در حال حاضر ساخته شده برخی از معامله (ها) با UOM است. شما نیاز به ایجاد یک آیتم جدید به استفاده از پیش فرض UOM متفاوت است.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,مقدار اختصاص داده شده نمی تونه منفی
 DocType: Purchase Order Item,Billed Amt,صورتحساب AMT
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,انبار منطقی که در برابر نوشته های سهام ساخته شده است.
@@ -570,7 +573,7 @@
 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 +543,Item has variants.,فقره انواع.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,نوع درخت
@@ -583,6 +586,7 @@
 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 +33,Goods received from Suppliers.,محصولات از تولید کنندگان دریافت کرد.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,با ارزش
 DocType: Lead,Campaign Name,نام کمپین
 ,Reserved,رزرو شده
 DocType: Purchase Order,Supply Raw Materials,تامین مواد اولیه
@@ -597,16 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,حساب با معامله های موجود را نمی توان تبدیل به لجر
 DocType: Delivery Note,Customer's Purchase Order No,مشتری سفارش خرید بدون
 DocType: Employee,Cell Number,شماره همراه
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,درخواست مواد تولید خودکار
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,درخواست مواد تولید خودکار
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,از دست رفته
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,"شما نمی توانید سند هزینه جاری را  در ستون""علیه مجله "" وارد کنید"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,انرژی
 DocType: Opportunity,Opportunity From,فرصت از
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,بیانیه حقوق ماهانه.
 DocType: Item Group,Website Specifications,مشخصات وب سایت
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},یک خطا در آدرس الگو شما وجود دارد {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,حساب جدید
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: از {0} از نوع {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,ردیف {0}: عامل تبدیل الزامی است
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",قوانین هزینه های متعدد را با معیارهای همان وجود دارد، لطفا حل و فصل درگیری با اختصاص اولویت است. قوانین قیمت: {0}
 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.,مطالب حسابداری می تواند در مقابل برگ ساخته شده است. مطالب در برابر گروه امکان پذیر نیست.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,نمی توانید غیر فعال کردن یا لغو BOM به عنوان آن را با دیگر BOMs مرتبط
 DocType: Opportunity,Maintenance,نگهداری
@@ -649,7 +655,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,لیست قیمت انتخاب نشده
 DocType: Employee,Family Background,سابقه خانواده
 DocType: Process Payroll,Send Email,ارسال ایمیل
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},هشدار: پیوست معتبر {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},هشدار: پیوست معتبر {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,بدون اجازه
 DocType: Company,Default Bank Account,به طور پیش فرض حساب بانکی
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",برای فیلتر کردن بر اساس حزب، حزب انتخاب نوع اول
@@ -679,13 +685,13 @@
 DocType: Production Planning Tool,Select Items,انتخاب آیتم ها
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} در صورت حساب {1} تاریخ گذاری شده است به {2}
 DocType: Maintenance Visit,Completion Status,وضعیت تکمیل
-DocType: Sales Invoice Item,Target Warehouse,هدف انبار
+DocType: Production Order,Target Warehouse,هدف انبار
 DocType: Item,Allow over delivery or receipt upto this percent,اجازه می دهد بیش از تحویل یا دریافت تا این درصد
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,انتظار می رود تاریخ تحویل نمی تواند قبل از سفارش فروش تاریخ است
 DocType: Upload Attendance,Import Attendance,واردات حضور و غیاب
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,همه گروه مورد
 DocType: Process Payroll,Activity Log,گزارش فعالیت
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,سود خالص / از دست دادن
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,سود خالص / از دست دادن
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,به طور خودکار نگارش پیام در ارائه معاملات.
 DocType: Production Order,Item To Manufacture,آیتم را ساخت
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} وضعیت {2}
@@ -693,7 +699,7 @@
 DocType: Sales Order Item,Projected Qty,پیش بینی تعداد
 DocType: Sales Invoice,Payment Due Date,پرداخت با توجه تاریخ
 DocType: Newsletter,Newsletter Manager,مدیر خبرنامه
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,مورد متغیر {0} در حال حاضر با ویژگی های همان وجود دارد
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,مورد متغیر {0} در حال حاضر با ویژگی های همان وجود دارد
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;افتتاح&#39;
 DocType: Notification Control,Delivery Note Message,تحویل توجه داشته باشید پیام
 DocType: Expense Claim,Expenses,مخارج
@@ -703,7 +709,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,تحقیق و توسعه
 ,Amount to Bill,مقدار به بیل
 DocType: Company,Registration Details,جزییات ثبت نام
-DocType: Item,Re-Order Qty,تعداد نقطه سفارش
+DocType: Item Reorder,Re-Order Qty,تعداد نقطه سفارش
 DocType: Leave Block List Date,Leave Block List Date,ترک فهرست بلوک عضویت
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},برنامه ریزی برای ارسال به {0}
 DocType: Pricing Rule,Price or Discount,قیمت و یا تخفیف
@@ -746,7 +752,7 @@
 DocType: Bank Reconciliation,Total Amount,مقدار کل
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,انتشارات اینترنت
 DocType: Production Planning Tool,Production Orders,سفارشات تولید
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,ارزش موجودی
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,ارزش موجودی
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,فهرست قیمت فروش
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,انتشار همگام موارد
 DocType: Bank Reconciliation,Account Currency,حساب ارز
@@ -755,7 +761,7 @@
 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 +538,Item Variants {0} updated,مورد انواع {0} به روز شده
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,مورد انواع {0} به روز شده
 DocType: Quality Inspection Reading,Reading 6,خواندن 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,خرید فاکتور پیشرفته
 DocType: Address,Shop,فروشگاه
@@ -832,7 +838,7 @@
 DocType: POS Profile,Cash/Bank Account,نقد / حساب بانکی
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,موارد حذف شده بدون تغییر در مقدار یا ارزش.
 DocType: Delivery Note,Delivery To,تحویل به
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,جدول ویژگی الزامی است
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,تخفیف
@@ -860,7 +866,7 @@
 DocType: Tax Rule,Shipping State,حمل و نقل دولت
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,مورد باید با استفاده از &#39;گرفتن اقلام از خرید رسید&#39; را فشار دهید اضافه شود
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,هزینه فروش
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,خرید استاندارد
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,خرید استاندارد
 DocType: GL Entry,Against,در برابر
 DocType: Item,Default Selling Cost Center,به طور پیش فرض مرکز فروش هزینه
 DocType: Sales Partner,Implementation Partner,شریک اجرای
@@ -902,7 +908,7 @@
 DocType: Sales Partner,Distributor,توزیع کننده
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,سبد خرید قانون حمل و نقل
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,سفارش تولید {0} باید قبل از لغو این سفارش فروش لغو
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',لطفا &#39;درخواست تخفیف اضافی بر روی&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',لطفا &#39;درخواست تخفیف اضافی بر روی&#39;
 ,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.,زمان ثبت را انتخاب کرده و ثبت برای ایجاد یک فاکتور فروش جدید.
@@ -970,9 +976,9 @@
 DocType: Contact,User ID,ID کاربر
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,مشخصات لجر
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,قدیمیترین
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group",گروه مورد با همین نام وجود دارد، لطفا نام مورد تغییر یا تغییر نام گروه مورد
 DocType: Production Order,Manufacture against Sales Order,ساخت در برابر سفارش فروش
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,بقیه دنیا
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,پرداخت ناخالص
@@ -1002,7 +1008,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged",با عرض پوزش، شرکت ها نمی توانند با هم ادغام شدند
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged",با عرض پوزش، شرکت ها نمی توانند با هم ادغام شدند
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,کوچک
 DocType: Employee,Employee Number,شماره کارمند
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},مورد هیچ (بازدید کنندگان) در حال حاضر در حال استفاده است. سعی کنید از مورد هیچ {0}
@@ -1021,7 +1027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,کشاورزی
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,محصولات  یا خدمات شما
 DocType: Mode of Payment,Mode of Payment,نحوه پرداخت
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,وب سایت تصویر باید یک فایل عمومی و یا آدرس وب سایت می باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,وب سایت تصویر باید یک فایل عمومی و یا آدرس وب سایت می باشد
 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,انبار اطلاعات تماس
@@ -1093,6 +1099,7 @@
 DocType: Address,Utilities,نرم افزار
 DocType: Purchase Invoice Item,Accounting,حسابداری
 DocType: Features Setup,Features Setup,ویژگی های راه اندازی
+DocType: Item,Is Service Item,آیا مورد خدمات
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,دوره نرم افزار می تواند دوره تخصیص مرخصی در خارج نیست
 DocType: Activity Cost,Projects,پروژه
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,لطفا سال مالی انتخاب کنید
@@ -1123,7 +1130,7 @@
 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 +465,cannot be greater than 100,نمی تواند بیشتر از ۱۰۰ باشد
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
 DocType: Maintenance Visit,Unscheduled,برنامه ریزی
 DocType: Employee,Owned,متعلق به
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,بستگی به مرخصی بدون حقوق
@@ -1182,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,دولت
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,انواع آیتم
 DocType: Company,Services,خدمات
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),مجموع ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),مجموع ({0})
 DocType: Cost Center,Parent Cost Center,مرکز هزینه پدر و مادر
 DocType: Sales Invoice,Source,منبع
 DocType: Leave Type,Is Leave Without Pay,آیا ترک کنی بدون اینکه پرداخت
@@ -1255,17 +1262,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ارسال مجدد ایمیل پرداخت
 DocType: Dependent Task,Dependent Task,وظیفه وابسته
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},مرخصی از نوع {0} نمی تواند بیش از {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,مقدار مصرف
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} نمایش
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,تغییر خالص در نقدی
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,تغییر خالص در نقدی
 DocType: Salary Structure Deduction,Salary Structure Deduction,کسر ساختار حقوق و دستمزد
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,واحد اندازه گیری {0} است بیش از یک بار در تبدیل فاکتور جدول وارد شده است
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,واحد اندازه گیری {0} است بیش از یک بار در تبدیل فاکتور جدول وارد شده است
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},درخواست پرداخت از قبل وجود دارد {0}
 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 +182,Quantity must not be more than {0},تعداد نباید بیشتر از {0}
@@ -1327,7 +1334,7 @@
 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: Packed Item,To Warehouse (Optional),به انبار (اختیاری)
 DocType: Sales Invoice,Paid Amount (Company Currency),مبلغ پرداخت شده (شرکت ارز)
 DocType: Purchase Invoice,Additional Discount,تخفیف اضافی
 DocType: Selling Settings,Selling Settings,فروش تنظیمات
@@ -1336,7 +1343,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",شرکت، ماه و سال مالی الزامی است
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,هزینه های بازاریابی
 ,Item Shortage Report,مورد گزارش کمبود
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن ذکر شده است، \ n لطفا ذکر &quot;وزن UOM&quot; بیش از حد
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن ذکر شده است، \ n لطفا ذکر &quot;وزن UOM&quot; بیش از حد
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,درخواست مواد مورد استفاده در ساخت این سهام ورود
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,تنها واحد آیتم استفاده کنید.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',زمان ورود دسته ای {0} باید &#39;فرستاده&#39;
@@ -1347,6 +1354,7 @@
 DocType: Employee,Date Of Retirement,تاریخ بازنشستگی
 DocType: Upload Attendance,Get Template,دریافت قالب
 DocType: Address,Postal,پستی
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext راه اندازی کامل!
 DocType: Item,Weightage,بین وزنها
 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,یک گروه مشتری با نام مشابهی وجود دارد. لطا نام مشتری را تغییر دهید یا نام گروه مشتری را اصلاح نمایید.
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,لطفا {0} انتخاب کنید.
@@ -1375,12 +1383,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ستون های بسیاری. صادرات این گزارش و با استفاده از یک برنامه صفحه گسترده آن را چاپ.
 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 +139,Main,اصلی
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,اصلی
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,نوع دیگر
 DocType: Naming Series,Set prefix for numbering series on your transactions,تنظیم پیشوند برای شماره سری در معاملات خود را
 DocType: Employee Attendance Tool,Employees HTML,کارمندان HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,منظور متوقف نمی تواند لغو شود. Unstop برای لغو.
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,به طور پیش فرض BOM ({0}) باید برای این آیتم به و یا قالب آن فعال باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,انواع
@@ -1405,7 +1413,6 @@
 DocType: Sales Order,To Deliver and Bill,برای ارائه و بیل
 DocType: GL Entry,Credit Amount in Account Currency,مقدار اعتبار در حساب ارز
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,سیاههها زمان برای تولید.
-DocType: Item,Apply Warehouse-wise Reorder Level,درخواست انبار و زرنگ ترتیب مجدد سطح
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} باید ارائه شود
 DocType: Authorization Control,Authorization Control,کنترل مجوز
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ردیف # {0}: رد انبار در برابر رد مورد الزامی است {1}
@@ -1503,6 +1510,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,ردیف # {0}: عملیات {1} برای {2} تعداد کالا به پایان رسید در تولید تکمیل مرتب # {3}. لطفا وضعیت عملیات به روز رسانی از طریق زمان گزارش ها
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,سرمایه گذاری
 DocType: Issue,Resolution Details,جزییات قطعنامه
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,تخصیص
 DocType: Quality Inspection Reading,Acceptance Criteria,ملاک پذیرش
 DocType: Item Attribute,Attribute Name,نام مشخصه
 DocType: Item Group,Show In Website,نمایش در وب سایت
@@ -1553,7 +1561,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,ادعای هزینه منتظر تأیید است. تنها تصویب هزینه می توانید وضعیت به روز رسانی.
 DocType: Purchase Invoice,Additional Discount Amount,تخفیف اضافی مبلغ
 DocType: Leave Block List Allow,Leave Block List Allow,ترک فهرست بلوک اجازه
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,مخفف نمیتواند خالی باشد یا فضای
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,مخفف نمیتواند خالی باشد یا فضای
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,گروه به غیر گروه
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ورزشی
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,مجموع واقعی
@@ -1594,7 +1602,7 @@
 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**.,** ** سال مالی نشان دهنده یک سال مالی. تمام پست های حسابداری و دیگر معاملات عمده در برابر سال مالی ** ** ردیابی.
 DocType: Opportunity,Customer / Lead Address,مشتری / سرب آدرس
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},هشدار: گواهینامه SSL نامعتبر در پیوست {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},هشدار: گواهینامه SSL نامعتبر در پیوست {0}
 DocType: Production Order Operation,Actual Operation Time,عملیات واقعی زمان
 DocType: Authorization Rule,Applicable To (User),به قابل اجرا (کاربر)
 DocType: Purchase Taxes and Charges,Deduct,کسر کردن
@@ -1743,7 +1751,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,شماره مورد نمی تواند 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,اگر شما تیم فروش و فروش همکاران (کانال همکاران) می توان آنها را برچسب و حفظ سهم خود در فعالیت های فروش
 DocType: Item,Show a slideshow at the top of the page,نمایش تصاویر به صورت خودکار در بالای صفحه
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,فروشگاه
+DocType: Item,"Allow in Sales Order of type ""Service""",اجازه می دهد در سفارش فروش از نوع &quot;خدمات&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,فروشگاه
 DocType: Time Log,Projects Manager,مدیر پروژه های
 DocType: Serial No,Delivery Time,زمان تحویل
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,سالمندی بر اساس
@@ -1768,7 +1777,7 @@
 ,Financial Analytics,تجزیه و تحلیل ترافیک مالی
 DocType: Quality Inspection,Verified By,تایید شده توسط
 DocType: Address,Subsidiary,فرعی
-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.",می تواند به طور پیش فرض ارز شرکت را تغییر نمی، چرا که معاملات موجود وجود دارد. معاملات باید لغو شود برای تغییر ارز به طور پیش فرض.
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",می تواند به طور پیش فرض ارز شرکت را تغییر نمی، چرا که معاملات موجود وجود دارد. معاملات باید لغو شود برای تغییر ارز به طور پیش فرض.
 DocType: Quality Inspection,Purchase Receipt No,رسید خرید بدون
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,بیعانه
 DocType: Process Payroll,Create Salary Slip,ایجاد لغزش حقوق
@@ -1816,7 +1825,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,مواد اولیه نمی تواند خالی باشد.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.",می تواند سهام به روز رسانی نیست، فاکتور شامل آیتم افت حمل و نقل.
 DocType: Newsletter,Test,تست
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'",همانطور که معاملات سهام موجود برای این آیتم به، \ شما می توانید مقادیر تغییر نمی کند ندارد سریال &#39;،&#39; دارای دسته ای بدون &#39;،&#39; آیا مورد سهام &quot;و&quot; روش های ارزش گذاری &#39;
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,سریع دانشگاه علوم پزشکی ورودی
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,اگر ذکر بی ا م در مقابل هر ایتمی باشد شما نمیتوانید نرخ را تغییر دهید
@@ -1905,7 +1914,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,لطفا توجه داشته باشید برای اولین بار از تحویل
 DocType: Purchase Invoice,Currency and Price List,نرخ ارز و لیست قیمت
 DocType: Opportunity,Customer / Lead Name,مشتری / نام سرب
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,ترخیص کالا از تاریخ ذکر نشده است
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,ترخیص کالا از تاریخ ذکر نشده است
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,تولید
 DocType: Item,Allow Production Order,اجازه سفارش تولید
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,ردیف {0}: تاریخ شروع باید قبل از پایان تاریخ است
@@ -1915,7 +1924,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,سود مجموع
 DocType: Purchase Receipt,Time at which materials were received,زمانی که در آن مواد دریافت شده
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,آدرس من
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,آدرس من
 DocType: Stock Ledger Entry,Outgoing Rate,نرخ خروجی
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,شاخه سازمان کارشناسی ارشد.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,یا
@@ -1984,7 +1993,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,مدیریت مشتری گروه درخت.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,نام مرکز هزینه
 DocType: Leave Control Panel,Leave Control Panel,ترک کنترل پنل
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,بدون پیش فرض آدرس الگو در بر داشت. لطفا یکی از جدید از راه اندازی&gt; چاپ و نام تجاری&gt; آدرس الگو ایجاد کنید.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,بدون پیش فرض آدرس الگو در بر داشت. لطفا یکی از جدید از راه اندازی&gt; چاپ و نام تجاری&gt; آدرس الگو ایجاد کنید.
 DocType: Appraisal,HR User,HR کاربر
 DocType: Purchase Invoice,Taxes and Charges Deducted,مالیات و هزینه کسر
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,مسائل مربوط به
@@ -2001,7 +2010,7 @@
 ,Sales Browser,مرورگر فروش
 DocType: Journal Entry,Total Credit,مجموع اعتباری
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},هشدار: یکی دیگر از {0} # {1} در برابر ورود سهام وجود دارد {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,محلی
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,بزرگ
@@ -2020,7 +2029,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,تمام معاملات فروش را می توان در برابر چند ** ** افراد فروش برچسب به طوری که شما می توانید تعیین و نظارت بر اهداف.
 ,S.O. No.,SO شماره
 DocType: Production Order Operation,Make Time Log,را زمان ورود
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,لطفا مقدار سفارش مجدد مجموعه
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},لطفا مشتری از سرب ایجاد {0}
 DocType: Price List,Applicable for Countries,قابل استفاده برای کشورهای
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,کامپیوتر
@@ -2095,7 +2103,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,دریافت مطالب مرتبط
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,ثبت حسابداری برای انبار
 DocType: Sales Invoice,Sales Team1,Team1 فروش
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,مورد {0} وجود ندارد
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,مورد {0} وجود ندارد
 DocType: Sales Invoice,Customer Address,آدرس مشتری
 DocType: Payment Request,Recipient and Message,گیرنده و پیام
 DocType: Purchase Invoice,Apply Additional Discount On,درخواست تخفیف اضافی
@@ -2137,7 +2145,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,نرخ گذاری
 apps/erpnext/erpnext/stock/get_item_details.py +274,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} در جدول بالا &#39;خرید رسید&#39; وجود ندارد
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,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 +155,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,تغییر نام ورود
@@ -2175,7 +2183,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,لطفا تاریخ تسکین وارد کنید.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,فقط برنامه های کاربردی با وضعیت &quot;تایید&quot; را می توان ارائه بگذارید
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,عنوان نشانی الزامی است.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,عنوان نشانی الزامی است.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,نام کمپین را وارد کنید اگر منبع تحقیق مبارزات انتخاباتی است
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,روزنامه
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,انتخاب سال مالی
@@ -2199,6 +2207,7 @@
 DocType: UOM,Must be Whole Number,باید عدد
 DocType: Leave Control Panel,New Leaves Allocated (In Days),برگ جدید اختصاص داده شده (در روز)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,سریال بدون {0} وجود ندارد
+DocType: Sales Invoice Item,Customer Warehouse (Optional),انبار و ضوابط (اختیاری)
 DocType: Pricing Rule,Discount Percentage,درصد تخفیف
 DocType: Payment Reconciliation Invoice,Invoice Number,شماره فاکتور
 apps/erpnext/erpnext/hooks.py +55,Orders,سفارشات
@@ -2308,7 +2317,7 @@
 DocType: Appraisal,Appraisal,ارزیابی
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,تاریخ تکرار شده است
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,امضای مجاز
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},ترک تصویب شود باید یکی از {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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,زمان شروع
@@ -2477,7 +2486,7 @@
 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 +733,Show tax break-up,نمایش مالیاتی تجزیه
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,نمایش مالیاتی تجزیه
 apps/erpnext/erpnext/accounts/party.py +283,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',اگر شما در فعالیت های تولید باشد. را قادر می سازد آیتم های تولیدی است
@@ -2526,7 +2535,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,لطفا دوباره نوع نام شرکت برای تایید
@@ -2553,8 +2562,6 @@
 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,تاریخ پیوستن باید بیشتر از تاریخ تولد شود
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,ساختار حقوق و دستمزد
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}",قانون قیمت های متعدد را با معیارهای همان وجود دارد، لطفا \ درگیری با اختصاص اولویت حل و فصل. مشاهده قوانین قیمت: {0}
 DocType: Account,Bank,بانک
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,شرکت هواپیمایی
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,مواد شماره
@@ -2579,7 +2586,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,اوراق بهادار و بورس کالا
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',واحد اندازه گیری پیش فرض برای متغیر &#39;{0}&#39; باید همان است که در الگو: &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',واحد اندازه گیری پیش فرض برای متغیر &#39;{0}&#39; باید همان است که در الگو: &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,محاسبه بر اساس
 DocType: Delivery Note Item,From Warehouse,از انبار
 DocType: Purchase Taxes and Charges,Valuation and Total,ارزش گذاری و مجموع
@@ -2588,7 +2595,7 @@
 DocType: Account,Purchase User,خرید کاربر
 DocType: Notification Control,Customize the Notification,سفارشی اطلاع رسانی
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,جریان وجوه نقد از عملیات
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,به طور پیش فرض آدرس الگو نمی تواند حذف شود
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,به طور پیش فرض آدرس الگو نمی تواند حذف شود
 DocType: Sales Invoice,Shipping Rule,قانون حمل و نقل
 DocType: Manufacturer,Limited to 12 characters,محدود به 12 کاراکتر
 DocType: Journal Entry,Print Heading,چاپ سرنویس
@@ -2681,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,اطلاعات پروژه و زرنگ در دسترس برای عین نمی
 DocType: Project,Expected End Date,انتظار می رود تاریخ پایان
 DocType: Appraisal Template,Appraisal Template Title,ارزیابی الگو عنوان
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,تجاری
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,خدمات عالی
@@ -2700,7 +2707,7 @@
 DocType: Customer,Default Receivable Accounts,پیش فرض حسابهای دریافتنی
 DocType: Tax Rule,Billing State,دولت صدور صورت حساب
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,انتقال
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),واکشی BOM منفجر شد (از جمله زیر مجموعه)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),واکشی BOM منفجر شد (از جمله زیر مجموعه)
 DocType: Authorization Rule,Applicable To (Employee),به قابل اجرا (کارمند)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,تاریخ الزامی است
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,افزایش برای صفت {0} نمی تواند 0
@@ -2733,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,نرخ گذاری منفی مجاز نیست
 DocType: Holiday List,Weekly Off,فعال هفتگی
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",برای مثال 2012، 2012-13
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),موقت سود / زیان (اعتباری)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),موقت سود / زیان (اعتباری)
 DocType: Sales Invoice,Return Against Sales Invoice,بازگشت علیه فاکتور فروش
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,مورد 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},لطفا مقدار پیش فرض {0} در شرکت راه {1}
@@ -2764,6 +2771,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,اضافه کردن کودک
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,نقش مجاز به تنظیم حساب های یخ زده و منجمد ویرایش مطالب
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,می تواند مرکز هزینه به دفتر تبدیل کند آن را به عنوان گره فرزند
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,ارزش باز
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,سریال #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,کمیسیون فروش
 DocType: Offer Letter Term,Value / Description,ارزش / توضیحات
@@ -2797,7 +2805,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,با موفقیت حذف تمام معاملات مربوط به این شرکت!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,همانطور که در تاریخ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,عفو مشروط
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,به طور پیش فرض انبار سهام مورد الزامی است.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},پرداخت حقوق و دستمزد برای ماه {0} و {1} سال
 DocType: Stock Settings,Auto insert Price List rate if missing,درج خودرو نرخ لیست قیمت اگر از دست رفته
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,کل مقدار پرداخت
@@ -2833,7 +2840,7 @@
 DocType: Payment Tool,Set Matching Amounts,مقدار تطبیق تنظیم
 DocType: Purchase Invoice,Taxes and Charges Added,مالیات و هزینه اضافه شده
 ,Sales Funnel,قیف فروش
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,مخفف الزامی است
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,مخفف الزامی است
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,تشکر از شما برای منافع خود را در اشتراک به روز رسانی ما
 ,Qty to Transfer,تعداد می توان به انتقال
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,به نقل از به آگهی یا مشتریان.
@@ -2861,7 +2868,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,نقل قول تامین کننده
 DocType: Quotation,In Words will be visible once you save the Quotation.,به عبارت قابل مشاهده خواهد بود هنگامی که شما نقل قول را نجات دهد.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} متوقف شده است
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},بارکد {0} در حال حاضر در مورد استفاده {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,رویدادهای نزدیک
@@ -2883,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,انتخاب سال مالی ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,نمایش POS مورد نیاز برای ایجاد POS ورود
 DocType: Hub Settings,Name Token,نام رمز
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,فروش استاندارد
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,فروش استاندارد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,حداقل یک انبار الزامی است
 DocType: Serial No,Out of Warranty,خارج از ضمانت
 DocType: BOM Replace Tool,Replace,جایگزین کردن
@@ -3006,7 +3013,7 @@
 DocType: Sales Invoice,Paid Amount,مبلغ پرداخت
 ,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,تنظیم این آدرس الگو به عنوان پیش فرض به عنوان پیش فرض هیچ دیگر وجود دارد
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,تنظیم این آدرس الگو به عنوان پیش فرض به عنوان پیش فرض هیچ دیگر وجود دارد
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",مانده حساب در حال حاضر در بدهی، شما امکان پذیر نیست را به مجموعه &quot;تعادل باید به عنوان&quot; اعتبار &quot;
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,مدیریت کیفیت
 DocType: Production Planning Tool,Filter based on customer,فیلتر بر اساس مشتری
@@ -3107,7 +3114,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",برای تنظیم این سال مالی به عنوان پیش فرض، بر روی &quot;تنظیم به عنوان پیش فرض &#39;
 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 +19,Shortage Qty,کمبود تعداد
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
 DocType: Salary Slip,Salary Slip,لغزش حقوق و دستمزد
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'تا تاریخ' مورد نیاز است
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",تولید بسته بندی ورقه برای بسته تحویل داده می شود. مورد استفاده به اطلاع تعداد بسته، محتویات بسته و وزن آن است.
@@ -3118,7 +3125,7 @@
 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.",هنگامی که هر یک از معاملات چک می &quot;فرستاده&quot;، یک ایمیل پاپ آپ به طور خودکار باز برای ارسال یک ایمیل به همراه &quot;تماس&quot; در آن معامله، با معامله به عنوان یک پیوست. کاربر ممکن است یا ممکن است ایمیل ارسال کنید.
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,تنظیمات جهانی
 DocType: Employee Education,Employee Education,آموزش و پرورش کارمند
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,آن را به واکشی اطلاعات مورد نیاز است.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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} در حال حاضر دریافت شده است
@@ -3144,6 +3151,7 @@
 DocType: BOM,Manufacturing User,ساخت کاربری
 DocType: Purchase Order,Raw Materials Supplied,مواد اولیه عرضه شده
 DocType: Purchase Invoice,Recurring Print Format,تکرار چاپ فرمت
+DocType: C-Form,Series,سلسله
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,انتظار می رود تاریخ تحویل نمی تواند قبل از سفارش خرید تاریخ
 DocType: Appraisal,Appraisal Template,ارزیابی الگو
 DocType: Item Group,Item Classification,طبقه بندی مورد
@@ -3219,7 +3227,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},ردیف {0}: ورود ترتیب مجدد در حال حاضر برای این انبار وجود دارد {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.",نمی تواند به عنوان از دست رفته اعلام، به دلیل عبارت ساخته شده است.
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,خرید استاد مدیر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,سفارش تولید {0} باید ارائه شود
@@ -3227,7 +3235,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,گزارشهای اصلی
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,تا به امروز نمی تواند قبل از از تاریخ
 DocType: Purchase Receipt Item,Prevdoc DocType,DOCTYPE Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,افزودن / ویرایش قیمتها
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,سفارشهای من
@@ -3275,7 +3283,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},ردیف # {0}: تنظیم کننده برای آیتم {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,وب سایت تصویر {0} متصل به مورد {1} را نمی توان یافت
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,وب سایت تصویر {0} متصل به مورد {1} را نمی توان یافت
 DocType: Issue,Content Type,نوع محتوا
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,کامپیوتر
 DocType: Item,List this Item in multiple groups on the website.,فهرست این مورد در گروه های متعدد بر روی وب سایت.
@@ -3289,7 +3297,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,"""دارای شماره سریال""  برای موارد غیر انباری نمی تواند ""بله"" باشد"
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'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,سر حساب
@@ -3315,7 +3323,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,با بستن حساب {0} باید از نوع مسئولیت / حقوق صاحبان سهام می باشد
 DocType: Authorization Rule,Based On,بر اساس
 DocType: Sales Order Item,Ordered Qty,دستور داد تعداد
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,مورد {0} غیر فعال است
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,مورد {0} غیر فعال است
 DocType: Stock Settings,Stock Frozen Upto,سهام منجمد تا حد
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},دوره و دوره به تاریخ برای تکرار اجباری {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,فعالیت پروژه / وظیفه.
@@ -3323,7 +3331,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",خرید باید بررسی شود، اگر قابل استفاده برای عنوان انتخاب شده {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,تخفیف باید کمتر از 100 باشد
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ارسال کردن مقدار (شرکت ارز)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,ردیف # {0}: لطفا مقدار سفارش مجدد مجموعه
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,ردیف # {0}: لطفا مقدار سفارش مجدد مجموعه
 DocType: Landed Cost Voucher,Landed Cost Voucher,فرود کوپن هزینه
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},لطفا {0}
 DocType: Purchase Invoice,Repeat on Day of Month,تکرار در روز از ماه
@@ -3395,7 +3403,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,مشاهده در حال حاضر
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,دوره انتخاب کنید که فاکتور خواهد شد به صورت خودکار تولید
 DocType: BOM,Raw Material Cost,هزینه مواد خام
-DocType: Item,Re-Order Level,ترتیب سطح
+DocType: Item Reorder,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.,اقلام و تعداد برنامه ریزی شده که برای آن شما می خواهید به افزایش سفارشات تولید و یا دانلود کنید مواد خام برای تجزیه و تحلیل را وارد کنید.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,پاره وقت
 DocType: Employee,Applicable Holiday List,فهرست تعطیلات قابل اجرا
@@ -3450,7 +3458,7 @@
 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 +573,Please specify Attribute Value for attribute {0},لطفا موجودیت مقدار برای صفت مشخص {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3529,7 +3537,7 @@
 DocType: Address,Office,دفتر
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,مطالب مجله حسابداری.
 DocType: Delivery Note Item,Available Qty at From Warehouse,تعداد موجود در انبار از
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,لطفا ابتدا کارمند ضبط را انتخاب کنید.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,لطفا ابتدا کارمند ضبط را انتخاب کنید.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,لطفا هزینه حساب وارد کنید
@@ -3604,7 +3612,7 @@
 DocType: Item Attribute,Numeric Values,مقادیر عددی
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,ضمیمه لوگو
 DocType: Customer,Commission Rate,کمیسیون نرخ
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,متغیر را
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,متغیر را
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,برنامه بلوک مرخصی توسط بخش.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,سبد خرید خالی است
 DocType: Production Order,Actual Operating Cost,هزینه های عملیاتی واقعی
@@ -3621,15 +3629,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item",برای تنظیم سطح دوباره سفارش دادن، مورد باید مورد خرید و یا مورد ساخت می باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),(نیم روز)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(نیم روز)
 DocType: Supplier,Credit Days,روز اعتباری
 DocType: Leave Type,Is Carry Forward,آیا حمل به جلو
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,گرفتن اقلام از BOM
diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv
index 089b31d..78b6dce 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% laskutettu
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),valuutta taso on oltava sama kuin {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,asiakkaan nimi
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Pankkitilin ei voida nimetty {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Pankkitilin ei voida nimetty {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),odottavat {0} ei voi olla alle nolla ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,uusi poistumissovellus
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,uusi poistumissovellus
 apps/erpnext/erpnext/setup/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
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","lokiaktiviteetit kohdistettuna käyttäjien tehtäviin, joista aikaseuranta tai laskutus on mahdollista"
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Uusi {0}: # {1}
 ,Sales Partners Commission,myyntikumppanit provisio
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Lyhenne voi olla enintään 5 merkkiä
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Lyhenne voi olla enintään 5 merkkiä
 DocType: Payment Request,Payment Request,Maksupyyntö
 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.",Määrite Arvo {0} ei voi poistaa {1} kuin Tuote vaihtoehdot \ esiintyy tämän Taito.
@@ -195,6 +195,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,valitse ehdot ja säännöt
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,out Arvo
 DocType: Production Planning Tool,Sales Orders,myyntitilaukset
 DocType: Purchase Taxes and Charges,Valuation,arvo
 ,Purchase Order Trends,Ostotilaus Trendit
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,televisio
 DocType: Production Order Operation,Updated via 'Time Log',päivitetty 'aikaloki' kautta
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},tili {0} ei kuulu yritykselle {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Advance määrä ei voi olla suurempi kuin {0} {1}
 DocType: Naming Series,Series List for this Transaction,sarjalistaus tähän tapahtumaan
 DocType: Sales Invoice,Is Opening Entry,on avauskirjaus
 DocType: Customer Group,Mention if non-standard receivable account applicable,maininta ellei sovelletaan saataien perustiliä käytetä
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,tee palkkalaskelma edellä mainittujen kriteerien mukaan
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,ei annettua kuvausta
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Pyydä ostaa.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/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
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Varasto {0} ei kuulu yritykselle {1}
 DocType: Item Website Specification,Item Website Specification,tuote verkkosivujen asetukset
 DocType: Payment Tool,Reference No,Viitenumero
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,poistuminen estetty
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,poistuminen estetty
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},tuote {0} on saavuttanut elinkaaren lopun {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Vuotuinen
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,"varaston täsmäytys, tuote"
 DocType: Stock Entry,Sales Invoice No,"myyntilasku, nro"
@@ -248,7 +250,7 @@
 DocType: Pricing Rule,Supplier Type,toimittaja tyyppi
 DocType: Item,Publish in Hub,Julkaista Hub
 ,Terretory,alue
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,tuote {0} on peruutettu
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,tuote {0} on peruutettu
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,materiaalipyyntö
 DocType: Bank Reconciliation,Update Clearance Date,päivitä tilityspäivä
 DocType: Item,Purchase Details,oston lisätiedot
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,lähete
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,verojen perusmääritykset
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} vero on kirjattu kahdesti
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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
@@ -327,7 +329,7 @@
 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 +215,Please see attachment,katso liitetiedosto
 DocType: Purchase Order,% Received,% vastaanotettu
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,määritys on valmis
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,määritys on valmis
 ,Finished Goods,valmiit tavarat
 DocType: Delivery Note,Instructions,ohjeet
 DocType: Quality Inspection,Inspected By,tarkastanut
@@ -352,14 +354,13 @@
 ,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 +169,{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 +189,{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/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
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},työasema on suljettu seuraavina päivinä lomapäivien {0} mukaan
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Mahdollisuudet
 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
@@ -388,7 +389,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
 DocType: HR Settings,Employee record is created using selected field. ,työntekijä tietue luodaan käyttämällä valittua kenttää
 DocType: Sales Order,Not Applicable,ei sovellettu
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,lomien valvonta
@@ -427,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,kosmetiikka
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"To merge, following properties must be same for both items",seuraavat ominaisuudet tulee olla samat molemmilla tuotteilla jotta ne voi sulauttaa
 DocType: Shipping Rule,Net Weight,Netto
 DocType: Employee,Emergency Phone,hätänumero
 ,Serial No Warranty Expiry,sarjanumeron takuu on päättynyt
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Toimitusjohtaja Alihankinta
 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"
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},tili {0} ei kuulu yritykselle: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},tili {0} ei kuulu yritykselle: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Lyhenne jo toisen yrityksen
 DocType: Selling Settings,Default Customer Group,oletus asiakasryhmä
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",mikäli 'pyöristys yhteensä' kenttä on poistettu käytöstä se ei näy missään tapahtumassa
 DocType: BOM,Operating Cost,käyttökustannus
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,tietuetta ei löydy laskutaulukosta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,valitse ensin yritys ja osapuoli tyyppi
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,tili- / kirjanpitokausi
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,kertyneet Arvot
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",sarjanumeroita ei voi yhdistää
 DocType: Project Task,Project Task,Projekti Tehtävä
 ,Lead Id,vihje tunnus
@@ -492,7 +495,7 @@
 DocType: Quotation,Quotation To,tarjoukseen
 DocType: Lead,Middle Income,keskitason tulo
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Oletus mittayksikkö Tuote {0} ei voi muuttaa suoraan, koska olet jo tehnyt joitakin tapahtuma (s) toisen UOM. Sinun täytyy luoda uusi Tuote käyttää eri Default UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Oletus mittayksikkö Tuote {0} ei voi muuttaa suoraan, koska olet jo tehnyt joitakin tapahtuma (s) toisen UOM. Sinun täytyy luoda uusi Tuote käyttää eri Default UOM."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,kohdennettu arvomäärä ei voi olla negatiivinen
 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"
@@ -570,7 +573,7 @@
 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 +543,Item has variants.,tuotteella on useampia malleja
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -583,6 +586,7 @@
 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 +33,Goods received from Suppliers.,tavarat tastaanotettu toimittajilta
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,in Arvo
 DocType: Lead,Campaign Name,Kampanjan nimi
 ,Reserved,Varattu
 DocType: Purchase Order,Supply Raw Materials,toimita raaka-aineita
@@ -597,16 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,tilin tapahtumaa ei voi muuttaa tilikirjaksi
 DocType: Delivery Note,Customer's Purchase Order No,asiakkaan ostotilaus numero
 DocType: Employee,Cell Number,solunumero
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Materiaali pyynnöt Luotu
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Auto Materiaali pyynnöt Luotu
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Menetetty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,kyseistä tositetta ei voi kohdistaa 'päiväkirjakirjaus' sarakkeessa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energia
 DocType: Opportunity,Opportunity From,tilaisuuteen
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,kuukausipalkka tosite
 DocType: Item Group,Website Specifications,Verkkosivujen tiedot
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},On virhe osoittekirjassasi Template {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,uusi tili
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: valitse {0} tyypistä {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rivi {0}: Conversion Factor on pakollista
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Useita Hinta Säännöt ovat olemassa samoja kriteereitä, ota ratkaista konflikti antamalla prioriteetti. Hinta Säännöt: {0}"
 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.,"kirjanpidon kirjaukset voidaan kodistaa jatkosidoksiin, kohdistus ryhmiin ei ole sallittu"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,BOM:ia ei voi poistaa tai peruuttaa sillä muita BOM:ja on linkitettynä siihen
 DocType: Opportunity,Maintenance,huolto
@@ -649,7 +655,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,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/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Varoitus: Virheellinen Liite {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Varoitus: Virheellinen Liite {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ei oikeuksia
 DocType: Company,Default Bank Account,oletus pankkitili
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",valitse osapuoli tyyppi saadaksesi osapuolen mukaisen suodatuksen
@@ -679,13 +685,13 @@
 DocType: Production Planning Tool,Select Items,valitse tuotteet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} kuittia vastaan {1} päivätty {2}
 DocType: Maintenance Visit,Completion Status,katselmus tila
-DocType: Sales Invoice Item,Target Warehouse,tavoite varasto
+DocType: Production Order,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 +50,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/setup_wizard/install_fixtures.py +17,All Item Groups,kaikki tuoteryhmät
 DocType: Process Payroll,Activity Log,aktiivisuus loki
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,netto voitto/tappio
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,netto voitto/tappio
 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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} tila on {2}
@@ -693,7 +699,7 @@
 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
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Tuote Variant {0} on jo olemassa samoja ominaisuuksia
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Tuote Variant {0} on jo olemassa samoja ominaisuuksia
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','avautuu'
 DocType: Notification Control,Delivery Note Message,lähetteen vieti
 DocType: Expense Claim,Expenses,kulut
@@ -703,7 +709,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Tutkimus ja kehitys
 ,Amount to Bill,laskutettava arvomäärä
 DocType: Company,Registration Details,rekisteröinnin lisätiedot
-DocType: Item,Re-Order Qty,uudelleentilattava yksikkömäärä
+DocType: Item Reorder,Re-Order Qty,uudelleentilattava yksikkömäärä
 DocType: Leave Block List Date,Leave Block List Date,"poistu estoluettelo, päivä"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},aikataulutettu lähettämään {0}:lle
 DocType: Pricing Rule,Price or Discount,Hinta tai Alennus
@@ -746,7 +752,7 @@
 DocType: Bank Reconciliation,Total Amount,kokonaisarvomäärä
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,internet julkaisu
 DocType: Production Planning Tool,Production Orders,tuotannon tilaukset
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,tase arvo
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,tase arvo
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,myyntihinnasto
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Julkaise synkronoida kohteita
 DocType: Bank Reconciliation,Account Currency,Tilin valuutta
@@ -755,7 +761,7 @@
 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 +538,Item Variants {0} updated,tuotemallit {0} päivitetty
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -776,7 +782,7 @@
 DocType: Payment Request,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/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,on pakollinen. Valuutanvaihtotietue on mahdollisesti luomatta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,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 +532,"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 +28,Shipments to customers.,toimitukset asiakkaille
@@ -832,7 +838,7 @@
 DocType: POS Profile,Cash/Bank Account,kassa- / pankkitili
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Taito pöytä on pakollinen
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,alennus
@@ -860,7 +866,7 @@
 DocType: Tax Rule,Shipping State,Lähettävällä valtiolla
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"tuote tulee lisätä ""hae kohteita ostokuitit"" painikella"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,myynnin kulut
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,perusostaminen
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,perusostaminen
 DocType: GL Entry,Against,kohdistus
 DocType: Item,Default Selling Cost Center,myyntien oletuskustannuspaikka
 DocType: Sales Partner,Implementation Partner,sovelluskumppani
@@ -902,7 +908,7 @@
 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 +210,Production Order {0} must be cancelled before cancelling this Sales Order,tuotannon tilaus {0} tulee peruuttaa ennen myyntitilauksen peruutusta
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Aseta &#39;Käytä lisäalennusta &quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Aseta &#39;Käytä lisäalennusta &quot;
 ,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
@@ -919,7 +925,7 @@
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,avaa kirjanpidon tase
 DocType: Sales Invoice Advance,Sales Invoice Advance,"myyntilasku, ennakko"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Mitään pyytää
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','aloituspäivä' ei voi olla ennen 'päättymispäivää'
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','aloituspäivä' tulee olla ennen 'päättymispäivää'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,hallinto
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,aikalomakkeen aktiviteetti tyyppit
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},joko debet- tai kredit arvomäärä vaaditaan {0}:lle
@@ -970,9 +976,9 @@
 DocType: Contact,User ID,käyttäjätunnus
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,näytä tilikirja
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,aikaisintaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,valmistus kohdistus myyntitilaukseen
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Rest Of The World
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1002,7 +1008,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged",yhtiöitä ei voi yhdistää
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged",yhtiöitä ei voi yhdistää
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,pieni
 DocType: Employee,Employee Number,työntekijän numero
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"asianumero/numerot on jo käytössä, aloita asianumerosta {0}"
@@ -1021,7 +1027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Maatalous
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Omat tavarat tai palvelut
 DocType: Mode of Payment,Mode of Payment,maksutapa
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Website Kuva pitäisi olla julkinen tiedoston tai verkkosivuston URL-
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Website Kuva pitäisi olla julkinen tiedoston tai verkkosivuston URL-
 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
@@ -1093,6 +1099,7 @@
 DocType: Address,Utilities,hyödykkeet
 DocType: Purchase Invoice Item,Accounting,Kirjanpito
 DocType: Features Setup,Features Setup,ominaisuuksien määritykset
+DocType: Item,Is Service Item,on palvelutuote
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Hakuaika ei voi ulkona loman jakokauteen
 DocType: Activity Cost,Projects,Projektit
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Ole hyvä ja valitse Tilikausi
@@ -1123,7 +1130,7 @@
 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 +465,cannot be greater than 100,ei voi olla suurempi kuin 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,tuote {0} ei ole varastotuote
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1182,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,hallinto
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,tuotemallit
 DocType: Company,Services,palvelut
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),yhteensä ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),yhteensä ({0})
 DocType: Cost Center,Parent Cost Center,pääkustannuspaikka
 DocType: Sales Invoice,Source,lähde
 DocType: Leave Type,Is Leave Without Pay,on poistunut ilman palkkaa
@@ -1255,17 +1262,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Lähettää maksu Sähköposti
 DocType: Dependent Task,Dependent Task,riippuvainen tehtävä
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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ä
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} näytä
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Rahavarojen muutos
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Rahavarojen muutos
 DocType: Salary Structure Deduction,Salary Structure Deduction,"palkkarakenne, vähennys"
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Maksupyyntö on jo olemassa {0}
 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 +182,Quantity must not be more than {0},Määrä saa olla enintään {0}
@@ -1327,7 +1334,7 @@
 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: Packed 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
@@ -1336,7 +1343,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","yritys, kuukausi ja tilikausi vaaditaan"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,markkinointikulut
 ,Item Shortage Report,tuotteet vähissä raportti
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","paino on mainittu, \ ssa mainitse  ""paino UOM"" myös"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","paino on mainittu, \ ssa mainitse  ""paino UOM"" myös"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,varaston kirjaus materiaalipyynnöstä
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,tuotteen yksittäisyksikkö
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',"aikalokin erä {0} pitää ""lähettää"""
@@ -1347,6 +1354,7 @@
 DocType: Employee,Date Of Retirement,eläkkepäivä
 DocType: Upload Attendance,Get Template,hae mallipohja
 DocType: Address,Postal,Posti-
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext Asennus valmis!
 DocType: Item,Weightage,painoarvo
 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"
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Ole hyvä ja valitse {0} ensin.
@@ -1375,12 +1383,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,"liian monta saraketta, vie raportti taulukkolaskentaohjelman ja tulosta se siellä"
 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 +139,Main,Tärkein
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Tärkein
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,malli
 DocType: Naming Series,Set prefix for numbering series on your transactions,aseta sarjojen numeroinnin etuliite tapahtumiin
 DocType: Employee Attendance Tool,Employees HTML,Työntekijät HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,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 +367,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/stock/doctype/item/item.py +361,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
@@ -1405,7 +1413,6 @@
 DocType: Sales Order,To Deliver and Bill,toimitukseen ja laskutukseen
 DocType: GL Entry,Credit Amount in Account Currency,Luoton määrä Account Valuutta
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,aikaloki valmistukseen
-DocType: Item,Apply Warehouse-wise Reorder Level,käytä varasto työkalua uuden ostotilauksen suositusarvon määrittämiseen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} tulee lähettää
 DocType: Authorization Control,Authorization Control,Valtuutus Ohjaus
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rivi # {0}: Hylätyt Warehouse on pakollinen vastaan hylätään Tuote {1}
@@ -1503,6 +1510,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"rivi # {0}: toiminto {1} ei ole valmis {2} valmiiden tuotteiden yksikkömäärä tuotantotilauksessa # {3}, päivitä toiminnon tila aikalokin kautta"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,sijoitukset
 DocType: Issue,Resolution Details,johtopäätös lisätiedot
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,määrärahat
 DocType: Quality Inspection Reading,Acceptance Criteria,hyväksymiskriteerit
 DocType: Item Attribute,Attribute Name,"tuntomerkki, nimi"
 DocType: Item Group,Show In Website,näytä verkkosivustossa
@@ -1553,7 +1561,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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ä
 DocType: Leave Block List Allow,Leave Block List Allow,"poistu estoluettelo, salli"
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Ryhmä Non-ryhmän
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,urheilu
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,"yhteensä, todellinen"
@@ -1594,7 +1602,7 @@
 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**
 DocType: Opportunity,Customer / Lead Address,asiakas / vihje osoite
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Varoitus: Virheellinen SSL-varmenteen kiinnittymiseen {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Varoitus: Virheellinen SSL-varmenteen kiinnittymiseen {0}
 DocType: Production Order Operation,Actual Operation Time,todellinen toiminta-aika
 DocType: Authorization Rule,Applicable To (User),sovellettavissa (käyttäjä)
 DocType: Purchase Taxes and Charges,Deduct,vähentää
@@ -1743,7 +1751,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,asianumero ei voi olla 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,mikäli sinulla on myyntitiimi ja myyntikumppaneita (välityskumppanit) voidaan ne tagata ja ylläpitää niiden panostusta myyntiaktiviteetteihin
 DocType: Item,Show a slideshow at the top of the page,näytä diaesitys sivun yläreunassa
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,varastoi
+DocType: Item,"Allow in Sales Order of type ""Service""","salli myyntitilaukset tyypille ""palvelu"""
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,varastoi
 DocType: Time Log,Projects Manager,"projektihallinta, pääkäyttäjä"
 DocType: Serial No,Delivery Time,toimitusaika
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,vanhentuminen perustuu
@@ -1768,7 +1777,7 @@
 ,Financial Analytics,talousanalyysi
 DocType: Quality Inspection,Verified By,vahvistanut
 DocType: Address,Subsidiary,tytäryhtiö
-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.","yrityksen oletusvaluuttaaei voi muuttaa sillä tapahtumia on olemassa, tapahtumat tulee peruuttaa jotta oletusvaluuttaa voi muuttaa"
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","yrityksen oletusvaluuttaaei voi muuttaa sillä tapahtumia on olemassa, tapahtumat tulee peruuttaa jotta oletusvaluuttaa voi muuttaa"
 DocType: Quality Inspection,Purchase Receipt No,Ostokuitti No
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,aikaisintaan raha
 DocType: Process Payroll,Create Salary Slip,tee palkkalaskelma
@@ -1816,7 +1825,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,raaka-aineet ei voi olla tyhjiä
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Ei voinut päivittää hyllyssä, lasku sisältää pudota merenkulku erä."
 DocType: Newsletter,Test,testi
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 +459,Quick Journal Entry,Nopea Päiväkirjakirjaus
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"tasoa ei voi muuttaa, jos BOM liitetty johonkin tuotteeseen"
@@ -1905,7 +1914,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,ensin lähete
 DocType: Purchase Invoice,Currency and Price List,Valuutta ja hinnasto
 DocType: Opportunity,Customer / Lead Name,asiakas / vihje nimi
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,tilityspäivää ei ole mainittu
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,tilityspäivää ei ole mainittu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,tuotanto
 DocType: Item,Allow Production Order,salli tuotannon tilaus
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Rivi {0}: Aloitus on ennen Päättymispäivä
@@ -1915,7 +1924,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,emotyyppi
 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 +118,My Addresses,omat osoitteet
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,omat osoitteet
 DocType: Stock Ledger Entry,Outgoing Rate,lähtevä taso
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,"organisaatio, toimiala valvonta"
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,tai
@@ -1984,7 +1993,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,hallitse asiakasryhmäpuuta
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,uuden kustannuspaikan nimi
 DocType: Leave Control Panel,Leave Control Panel,"poistu, ohjauspaneeli"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,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"
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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ä
 DocType: Purchase Invoice,Taxes and Charges Deducted,verot ja maksut vähennetty
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,aiheet
@@ -2001,7 +2010,7 @@
 ,Sales Browser,myyntiselain
 DocType: Journal Entry,Total Credit,kredit yhteensä
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},varoitus: toinen varaston kirjausksen kohdistus {0} # {1} on jo olemassa {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Paikallinen
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Suuri
@@ -2020,7 +2029,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,kaikki myyntitapahtumat voidaan kohdistaa useammalle ** myyjälle ** tavoitteiden asettamiseen ja seurantaan
 ,S.O. No.,myyntitilaus nro
 DocType: Production Order Operation,Make Time Log,Tee Time Log
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Aseta tilausrajaa
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},tee asiakasvihje {0}
 DocType: Price List,Applicable for Countries,Sovelletaan Maat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,tietokoneet
@@ -2095,7 +2103,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,hae tarvittavat kirjaukset
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,kirjanpidon varaston kirjaus
 DocType: Sales Invoice,Sales Team1,myyntitiimi 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,tuotetta {0} ei ole olemassa
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,tuotetta {0} ei ole olemassa
 DocType: Sales Invoice,Customer Address,asiakkaan osoite
 DocType: Payment Request,Recipient and Message,Vastaanottaja ja Viesti
 DocType: Purchase Invoice,Apply Additional Discount On,käytä lisäalennusta
@@ -2137,7 +2145,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,arvotaso
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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
@@ -2175,7 +2183,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Syötä lievittää päivämäärä.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,pankkipääte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,vain 'hyväksytty' poistumissovellus voidaan lähettää
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,osoiteotsikko on pakollinen.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,osoiteotsikko on pakollinen.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,syötä kampanjan nimi jos kirjauksen lähde on kampanja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Newspaper Publishers
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,valitse tilikausi
@@ -2199,6 +2207,7 @@
 DocType: UOM,Must be Whole Number,täytyy olla kokonaisluku
 DocType: Leave Control Panel,New Leaves Allocated (In Days),uusi poistumisten kohdennus (päiviä)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,sarjanumeroa {0} ei ole olemassa
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Asiakkaan Warehouse (valinnainen)
 DocType: Pricing Rule,Discount Percentage,alennusprosentti
 DocType: Payment Reconciliation Invoice,Invoice Number,laskun numero
 apps/erpnext/erpnext/hooks.py +55,Orders,Tilaukset
@@ -2308,7 +2317,7 @@
 DocType: Appraisal,Appraisal,arviointi
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,päivä toistetaan
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Valtuutettu allekirjoittaja
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},poistumis hyväksyjä tulee olla {0}:sta
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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
@@ -2477,7 +2486,7 @@
 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"
 DocType: Sales Order Item,Supplier delivers to Customer,Toimittaja toimittaa Asiakkaalle
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Näytä vero hajottua
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Näytä vero hajottua
 apps/erpnext/erpnext/accounts/party.py +283,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"""
@@ -2526,7 +2535,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,kirjoita yrityksen nimi uudelleen vahvistukseksi
@@ -2553,8 +2562,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,palkkarakenne
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"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/setup_wizard/industry_type.py +9,Airline,lentoyhtiö
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,materiaali aihe
@@ -2579,7 +2586,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,arvopaperit & hyödykkeet vaihto
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Oletus mittayksikkö Variant &quot;{0}&quot; on oltava sama kuin malli &quot;{1}&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Oletus mittayksikkö Variant &quot;{0}&quot; on oltava sama kuin malli &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,"laske, perusteet"
 DocType: Delivery Note Item,From Warehouse,Varastosta
 DocType: Purchase Taxes and Charges,Valuation and Total,arvo ja summa
@@ -2588,7 +2595,7 @@
 DocType: Account,Purchase User,Osto Käyttäjä
 DocType: Notification Control,Customize the Notification,muokkaa ilmoitusta
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,LIIKETOIMINNAN RAHAVIRTA
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,"oletus osoite, mallipohjaa ei voi poistaa"
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,"oletus osoite, mallipohjaa ei voi poistaa"
 DocType: Sales Invoice,Shipping Rule,toimitus sääntö
 DocType: Manufacturer,Limited to 12 characters,Rajattu 12 merkkiä
 DocType: Journal Entry,Print Heading,Tulosta Otsikko
@@ -2681,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,kaupallinen
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,hyvät palvelut
@@ -2700,7 +2707,7 @@
 DocType: Customer,Default Receivable Accounts,oletus saatava tilit
 DocType: Tax Rule,Billing State,Laskutus valtion
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,siirto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),nouda BOM räjäytys (mukaan lukien alikokoonpanot)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,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 +95,Due Date is mandatory,eräpäivä vaaditaan
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Puuston Taito {0} ei voi olla 0
@@ -2733,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),voitto/tappio ote (kredit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),voitto/tappio ote (kredit)
 DocType: Sales Invoice,Return Against Sales Invoice,palautus kohdistettuna myyntilaskuun
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,tuote 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Aseta oletusarvo {0} in Company {1}
@@ -2764,6 +2771,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,lisää alasidos
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,rooli voi jäädyttää- sekä muokata jäädytettyjä kirjauksia
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"kustannuspaikasta ei voi siirtää tilikirjaan, sillä kustannuspaikalla on alasidoksia"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Opening Arvo
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,sarja #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,provisio myynti
 DocType: Offer Letter Term,Value / Description,arvo / kuvaus
@@ -2797,7 +2805,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,kaikki tähän yritykseen liittyvät tapahtumat on poistettu
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kuin Päivämäärä
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Koeaika
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,oletus Varasto vaaditaan varastotuotteelle
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},palkanmaksu kuukausi {0} vuosi {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Automaattinen käynnistys Hinnasto korolla, jos puuttuu"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,maksettu arvomäärä yhteensä
@@ -2833,7 +2840,7 @@
 DocType: Payment Tool,Set Matching Amounts,aseta täsmäävät arvomäärät
 DocType: Purchase Invoice,Taxes and Charges Added,verot ja maksut lisätty
 ,Sales Funnel,myynnin suppilo
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Lyhenne on pakollinen
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Lyhenne on pakollinen
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,kiitos päivityksen tilaamisesta
 ,Qty to Transfer,siirrettävä yksikkömäärä
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,noteerauksesta vihjeeksi tai asiakkaaksi
@@ -2861,7 +2868,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} on pysäytetty
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},viivakoodi {0} on jo käytössä tuotteella {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Tulevat tapahtumat
@@ -2883,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,valitse tilikausi ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS profiili vaatii POS kirjauksen
 DocType: Hub Settings,Name Token,Name Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,perusmyynti
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,perusmyynti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -2980,7 +2987,7 @@
 DocType: Production Order Operation,Production Order Operation,tuotannon tilauksen toimenpiteet
 DocType: Pricing Rule,Disable,poista käytöstä
 DocType: Project Task,Pending Review,odottaa näkymä
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +122, Click here to pay,Klikkaa tästä maksaa
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +122, Click here to pay,Maksa tästä
 DocType: Task,Total Expense Claim (via Expense Claim),kuluvaatimus yhteensä (kuluvaatimuksesta)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,asiakastunnus
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Absent
@@ -3006,7 +3013,7 @@
 DocType: Sales Invoice,Paid Amount,maksettu arvomäärä
 ,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"
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","tilin tase on jo dedet, syötetyn arvon tulee olla 'tasapainossa' eli 'krebit'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,määrähallinta
 DocType: Production Planning Tool,Filter based on customer,suodata asiakkaisiin perustuen
@@ -3108,7 +3115,7 @@
 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 +19,Shortage Qty,yksikkömäärä vähissä
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
 DocType: Salary Slip,Salary Slip,palkkalaskelma
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'päättymispäivä' vaaditaan
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","muodosta pakkausluetteloita toimitettaville pakkauksille, käytetään pakkausnumeron, -sisältö ja painon määritykseen"
@@ -3119,7 +3126,7 @@
 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 +749,It is needed to fetch Item Details.,Sitä tarvitaan hakemaan Osa Tiedot.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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
@@ -3145,6 +3152,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: C-Form,Series,sarjat
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,tuote luokittelu
@@ -3220,7 +3228,7 @@
 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 +434,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 +420,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"
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,"ostojenhallinta, valvonta"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,tuotannon tilaus {0} on lähetettävä
@@ -3228,7 +3236,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,pääraportit
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,päivään ei voi olla ennen aloituspäivää
 DocType: Purchase Receipt Item,Prevdoc DocType,esihallitse asiakirjatyyppi
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Lisää / muokkaa hintoja
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Omat tilaukset
@@ -3276,7 +3284,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Rivi # {0}: Aseta toimittaja kohteen {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Website Kuva {0} kiinnitetty Tuote {1} ei löydy
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Website Kuva {0} kiinnitetty Tuote {1} ei löydy
 DocType: Issue,Content Type,sisällön tyyppi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,tietokone
 DocType: Item,List this Item in multiple groups on the website.,Listaa tästä Kohta useisiin ryhmiin verkkosivuilla.
@@ -3290,7 +3298,7 @@
 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 +357,'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 +351,'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
@@ -3316,7 +3324,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Tilin sulkemisen {0} on oltava tyyppiä Vastuu / Oma pääoma
 DocType: Authorization Rule,Based On,perustuu
 DocType: Sales Order Item,Ordered Qty,tilattu yksikkömäärä
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Tuote {0} on poistettu käytöstä
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +168,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ä.
@@ -3324,7 +3332,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",osto tulee täpätä mikälisovellus on valittu {0}:na
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,alennus on oltava alle 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Kirjoita Off Määrä (Yrityksen valuutta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Rivi # {0}: Aseta tilausrajaa
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Rivi # {0}: Aseta tilausrajaa
 DocType: Landed Cost Voucher,Landed Cost Voucher,"kohdistetut kustannukset, tosite"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Aseta {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Toista päivä Kuukausi
@@ -3396,7 +3404,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,näytä nyt
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"valitse ajanjakso, jolloin lasku muodostetaan automaattisesti"
 DocType: BOM,Raw Material Cost,raaka-ainekustannukset
-DocType: Item,Re-Order Level,Re-Order Level
+DocType: Item Reorder,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"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Osa-aikainen
 DocType: Employee,Applicable Holiday List,sovellettava lomalista
@@ -3451,7 +3459,7 @@
 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 +573,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3530,7 +3538,7 @@
 DocType: Address,Office,Toimisto
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,"kirjanpito, päiväkirjakirjaukset"
 DocType: Delivery Note Item,Available Qty at From Warehouse,Available Kpl at varastosta
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,valitse työntekijä tietue ensin
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,valitse työntekijä tietue ensin
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,syötä kulutili
@@ -3605,7 +3613,7 @@
 DocType: Item Attribute,Numeric Values,Numeroarvot
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Kiinnitä Logo
 DocType: Customer,Commission Rate,provisio taso
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Tee Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Tee Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,estä poistumissovellukset osastoittain
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Ostoskori on tyhjä
 DocType: Production Order,Actual Operating Cost,todelliset toimintakustannukset
@@ -3622,15 +3630,14 @@
 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 +380,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 +419,"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 +408,"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 +380, (Half Day),(1/2 päivä)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,hae tuotteita BOM:sta
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index 168bad7..d5de603 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,Facturé%
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Taux de change doit être le même que {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nom du client
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Compte bancaire ne peut pas être nommé {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Compte bancaire ne peut pas être nommé {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Participation pour les employés {0} est déjà marqué
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Nouvelle Demande de Congés
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Nouvelle Demande de Congés
 apps/erpnext/erpnext/setup/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. Utiliser cette option pour maintenir le code de référence du client et les rendre consultables en fonction de leur code.
 DocType: Mode of Payment Account,Mode of Payment Account,Mode de compte de paiement
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Connexion des activités réalisées par les utilisateurs contre les tâches qui peuvent être utilisés pour le suivi du temps, de la facturation."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Nouveau {0}: # {1}
 ,Sales Partners Commission,Partenaires Sales Commission
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,L'abbréviation ne peut pas avoir plus de 5 caractères
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,L'abbréviation ne peut pas avoir plus de 5 caractères
 DocType: Payment Request,Payment Request,Requête de paiement
 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.",Attribut Valeur {0} ne peut pas être retiré de {1} comme Point Variantes \ existe avec cet attribut.
@@ -127,7 +127,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Coût des articles livrés
 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/config/manufacturing.py +14,Bill of Material,"Liste de pièces, éléments"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Ouverture
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Du {0} au {1}
 DocType: Item,Copy From Item Group,Copy From Group article
@@ -196,6 +196,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,Sélectionnez Termes et Conditions
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,Valeur hors
 DocType: Production Planning Tool,Sales Orders,Commandes clients
 DocType: Purchase Taxes and Charges,Valuation,Évaluation
 ,Purchase Order Trends,Bon de commande Tendances
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Télévision
 DocType: Production Order Operation,Updated via 'Time Log',Mis à jour via 'Log Time'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Compte {0} n'appartient pas à la société {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},montant de l&#39;avance ne peut être supérieur à {0} {1}
 DocType: Naming Series,Series List for this Transaction,Liste des Séries pour cette transaction
 DocType: Sales Invoice,Is Opening Entry,Est l&#39;ouverture d&#39;entrée
 DocType: Customer Group,Mention if non-standard receivable account applicable,Mentionner si créance non standard applicable
@@ -225,9 +227,9 @@
 ,Contact Name,Contact Nom
 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/templates/generators/item.html +30,No description given,Le jour (s ) sur lequel vous postulez pour congé sont les vacances . Vous n'avez pas besoin de demander l'autorisation .
+apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Pas de description indiquée
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Demande d&#39;achat.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/setup_wizard/install_fixtures.py +172,Leaves per Year,Congés 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&#39;il vous plaît mettre Naming série pour {0} via Configuration&gt; Paramètres&gt; Série Naming
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Entrepôt {0} n'appartient pas à la société {1}
 DocType: Item Website Specification,Item Website Specification,Spécification Site élément
 DocType: Payment Tool,Reference No,No de référence
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Laisser verouillé
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},dépenses
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,Laisser verouillé
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},dépenses
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Annuel
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock réconciliation article
 DocType: Stock Entry,Sales Invoice No,Aucune facture de vente
@@ -249,7 +251,7 @@
 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 +606,Item {0} is cancelled,Nom de la campagne est nécessaire
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Nom de la campagne est nécessaire
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,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
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Bon de livraison
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Mise en place d&#39;impôts
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{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 +381,{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&#39;il vous plaît sélectionner le mois et l&#39;année
@@ -309,7 +311,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,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,Cet article est un modèle et ne peut être utilisé dans les transactions. Attributs d'élément seront copiés dans les variantes moins 'No Copy »est réglé
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Total de la commande Considéré
 apps/erpnext/erpnext/config/hr.py +118,"Employee designation (e.g. CEO, Director etc.).","Intitulé de Poste (par exemple Directeur Général, Directeur...)"
-apps/erpnext/erpnext/controllers/recurring_document.py +201,Please enter 'Repeat on Day of Month' field value,1 devise = [ ? ] Fraction
+apps/erpnext/erpnext/controllers/recurring_document.py +201,Please enter 'Repeat on Day of Month' field value,S'il vous plaît entrez la valeur 'Répéter le jour du mois'
 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&#39;imposition
@@ -329,7 +331,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Votre adresse Email
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,S'il vous plaît voir la pièce jointe
 DocType: Purchase Order,% Received,% reçus
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Configuration déjà terminée !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Configuration déjà terminée !
 ,Finished Goods,Produits finis
 DocType: Delivery Note,Instructions,Instructions
 DocType: Quality Inspection,Inspected By,Inspecté par
@@ -339,7 +341,7 @@
 DocType: Leave Application,Leave Approver Name,Nom de l'approbateur d'absence
 ,Schedule Date,calendrier Date
 DocType: Packed Item,Packed Item,Article d&#39;emballage de livraison Note
-apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,non Soumis
+apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Paramètres par défaut pour les transactions d'achat.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Des couts de personnel existe pour l'employé {0} dans le type d'activité - {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.,S&#39;il vous plaît ne créez pas de comptes pour les clients et les fournisseurs. Ils sont créés directement par les maîtres clients / fournisseurs.
 DocType: Currency Exchange,Currency Exchange,Change de devises
@@ -354,16 +356,15 @@
 ,Purchase Register,Achat S&#39;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 +169,{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 +189,{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/setup_wizard/install_fixtures.py +39,Medical,Médical
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Raison pour perdre
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation est fermé aux dates suivantes selon la liste de vacances: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Des opportunités
 DocType: Employee,Single,Unique
-DocType: Issue,Attachment,Pièce jointe
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budget ne peut pas être réglé pour le centre de coûts du Groupe
-DocType: Account,Cost of Goods Sold,Montant payé + Write Off montant ne peut être supérieur à Total
+DocType: Account,Cost of Goods Sold,Coût des marchandises vendues
 DocType: Purchase Invoice,Yearly,Annuel
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,S'il vous plaît entrer Centre de coûts
 DocType: Journal Entry Account,Sales Order,Commande
@@ -381,7 +382,7 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Vérifiez Fournisseur numéro de facture Unicité
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',«Le cas No ' ne peut pas être inférieure à 'Du Cas No'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,À but non lucratif
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Non commencé
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Pas commencé
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Parent Vieux
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Personnaliser le texte d'introduction qui se déroule comme une partie de cet courriel. Chaque transaction a un texte séparé d'introduction.
@@ -390,7 +391,7 @@
 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 +564,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 +550,Attribute {0} selected multiple times in Attributes Table,Attribut {0} sélectionnée à plusieurs reprises dans le tableau Attributs
 DocType: HR Settings,Employee record is created using selected field. ,dossier de l&#39;employé est créé en utilisant champ sélectionné.
 DocType: Sales Order,Not Applicable,Non applicable
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Débit doit être égal à crédit . La différence est {0}
@@ -429,7 +430,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,produits de beauté
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"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: 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
@@ -440,7 +441,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Gestion de la sous-traitance
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Compte {0} n'appartient pas à la société : {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Compte {0} n'appartient pas à la société : {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Abréviation déjà utilisé pour une autre société
 DocType: Selling Settings,Default Customer Group,Groupe de clients par défaut
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Si coché, le champ ""Total arrondi"" ne sera pas visible et les montants ne seront pas arrondis."
 DocType: BOM,Operating Cost,Coût d&#39;exploitation
@@ -454,7 +456,7 @@
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Ajouter / Modifier Taxes et Charges
 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&#39;il est utilisé dans les transactions d&#39;achat d&#39;actions"
+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 les No de série  {0}, tant qu'ils sont est dans les mouvements de stock"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +231,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
@@ -475,6 +477,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Aucun enregistrement trouvé dans la table Facture
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,S'il vous plaît sélectionnez Société et partie Type premier
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Point {0} a été saisi plusieurs fois contre une même opération
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Les valeurs accumulées
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Désolé , série n ne peut pas être fusionné"
 DocType: Project Task,Project Task,Groupe de Projet
 ,Lead Id,Id prospect
@@ -496,7 +499,7 @@
 DocType: Quotation,Quotation To,Devis Pour
 DocType: Lead,Middle Income,Revenu intermédiaire
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Ouverture ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,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. Vous aurez besoin de créer un nouveau poste d&#39;utiliser un défaut UOM différente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,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. Vous aurez besoin de créer un nouveau poste d&#39;utiliser un défaut UOM différente.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Le montant alloué ne peut être négatif
 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.
@@ -574,7 +577,7 @@
 DocType: Hub Settings,Seller City,Vendeur Ville
 DocType: Email Digest,Next email will be sent on:,Le prochain Email sera envoyé le :
 DocType: Offer Letter Term,Offer Letter Term,Offrez Lettre terme
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item has variants.,Point a variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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&#39;action
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Type d' arbre
@@ -587,6 +590,7 @@
 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 +33,Goods received from Suppliers.,Marchandises reçues des fournisseurs.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,En valeur
 DocType: Lead,Campaign Name,Nom de la campagne
 ,Reserved,réservé
 DocType: Purchase Order,Supply Raw Materials,Raw Materials Supply
@@ -601,16 +605,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Un compte contenant une transaction ne peut pas être converti en grand livre
 DocType: Delivery Note,Customer's Purchase Order No,Numéro bon de commande du client
 DocType: Employee,Cell Number,Nombre de cellules
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Demandes de matériel généré automatiquement
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Demandes de matériel généré automatiquement
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,perdu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,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/setup_wizard/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.
 DocType: Item Group,Website Specifications,Site Web Spécifications
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Il y a une erreur dans votre Modèle d&#39;adresse {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Nouveau Compte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Du {0} de type {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ligne {0}: facteur de conversion est obligatoire
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Règles multiples de prix qui est avec les mêmes critères, s&#39;il vous plaît résoudre les conflits en attribuant des priorités. Règles de prix: {0}"
 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.,Les écritures comptables ne peuvent être faites sur les nœuds feuilles. Les entrées dans les groupes ne sont pas autorisées.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,Vous ne pouvez pas désactiver ou annuler BOM car il est lié à d'autres nomenclatures
 DocType: Opportunity,Maintenance,Entretien
@@ -672,7 +678,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,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/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Attention: Pièce jointe non valide {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Attention: Pièce jointe non valide {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Aucune autorisation
 DocType: Company,Default Bank Account,Compte bancaire par défaut
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Pour filtrer sur la base du Parti, sélectionnez Parti premier type"
@@ -702,13 +708,13 @@
 DocType: Production Planning Tool,Select Items,Sélectionner les objets
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} contre le projet de loi en date du {1} {2}
 DocType: Maintenance Visit,Completion Status,L&#39;état d&#39;achèvement
-DocType: Sales Invoice Item,Target Warehouse,Cible d&#39;entrepôt
+DocType: Production Order,Target Warehouse,Cible d&#39;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 +50,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/setup_wizard/install_fixtures.py +17,All Item Groups,Tous les groupes d'article
 DocType: Process Payroll,Activity Log,Journal d&#39;activité
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Bénéfice Net / Perte Nette
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Bénéfice Net / Perte Nette
 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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} statut est {2}
@@ -716,7 +722,7 @@
 DocType: Sales Order Item,Projected Qty,Qté projeté
 DocType: Sales Invoice,Payment Due Date,Date d'échéance
 DocType: Newsletter,Newsletter Manager,Responsable de l'infolettre
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Point Variant {0} existe déjà avec les mêmes caractéristiques
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Point Variant {0} existe déjà avec les mêmes caractéristiques
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Ouverture&#39;
 DocType: Notification Control,Delivery Note Message,Note Message de livraison
 DocType: Expense Claim,Expenses,Note: Ce centre de coûts est un groupe . Vous ne pouvez pas faire les écritures comptables contre des groupes .
@@ -726,7 +732,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Recherche & Développement
 ,Amount to Bill,Montant à facturer
 DocType: Company,Registration Details,Détails de l&#39;enregistrement
-DocType: Item,Re-Order Qty,Re-commande Quantité
+DocType: Item Reorder,Re-Order Qty,Re-commande Quantité
 DocType: Leave Block List Date,Leave Block List Date,Laisser Date de Block List
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Prévu pour envoyer à {0}
 DocType: Pricing Rule,Price or Discount,Frais d'administration
@@ -769,7 +775,7 @@
 DocType: Bank Reconciliation,Total Amount,Montant total
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publication Internet
 DocType: Production Planning Tool,Production Orders,Ordres de fabrication
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Valeur du solde
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Valeur du solde
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Liste de prix de vente
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publier pour synchroniser les éléments
 DocType: Bank Reconciliation,Account Currency,Compte
@@ -778,7 +784,7 @@
 DocType: Supplier,Default Payable Accounts,Comptes de créances fournisseur par défaut
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,"L'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 +538,Item Variants {0} updated,Point variantes {0} mis à jour
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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&#39;avance Facture
 DocType: Address,Shop,Magasiner
@@ -855,7 +861,7 @@
 DocType: POS Profile,Cash/Bank Account,Trésorerie / Compte bancaire
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Table attribut est obligatoire
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Rabais
@@ -883,7 +889,7 @@
 DocType: Tax Rule,Shipping State,Etat de livraison
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,L'article doit être ajouté à l'aide 'obtenir des éléments de reçus d'achat de la touche
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Fournisseur numéro de livraison en double dans {0}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,achat standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,achat standard
 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
@@ -925,7 +931,7 @@
 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 +210,Production Order {0} must be cancelled before cancelling this Sales Order,Tous les groupes de clients
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',S&#39;il vous plaît mettre «Appliquer réduction supplémentaire sur &#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',S&#39;il vous plaît mettre «Appliquer réduction supplémentaire sur &#39;
 ,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.
@@ -986,16 +992,16 @@
 ,Trial Balance,Balance
 apps/erpnext/erpnext/config/hr.py +220,Setting up Employees,Mise en place d&#39;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/doctype/naming_series/naming_series.py +150,Please select prefix first,S'il vous plaît sélectionner préfixe en premier
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,recherche
 DocType: Maintenance Visit Purpose,Work Done,Travaux effectués
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,S&#39;il vous plaît spécifier au moins un attribut dans le tableau Attributs
 DocType: Contact,User ID,ID utilisateur
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Voir Grand Livre
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,plus tôt
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Fabrication à l&#39;encontre des commandes clients
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,revenu indirect
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1025,7 +1031,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Désolé , les entreprises ne peuvent pas être fusionnés"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Désolé , les entreprises ne peuvent pas être fusionnés"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Petit
 DocType: Employee,Employee Number,Numéro d'employé
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Entrées avant {0} sont gelés
@@ -1044,7 +1050,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,agriculture
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Vos produits ou services
 DocType: Mode of Payment,Mode of Payment,Mode de paiement
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,L'image de site Web doit être un fichier public ou l'URL d'un site web
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,L'image de site Web doit être un fichier public ou l'URL d'un site web
 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
@@ -1070,7 +1076,7 @@
 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/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Remarque: ce centre de coûts est un groupe. Vous ne pouvez pas faire des écritures comptables contre les groupes.
 DocType: Item,Website Item Groups,Groupes d&#39;articles Site web
 DocType: Purchase Invoice,Total (Company Currency),Total (Société devise)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,Numéro de série {0} est entré plus d'une fois
@@ -1092,7 +1098,7 @@
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,S&#39;il vous plaît sélectionner une entreprise
 apps/erpnext/erpnext/setup/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
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Vous devez activer le panier
 DocType: Appraisal Template Goal,Appraisal Template Goal,Objectif modèle d&#39;évaluation
 DocType: Salary Slip,Earning,Revenus
 DocType: Payment Tool,Party Account Currency,Compte Parti devise
@@ -1116,6 +1122,7 @@
 DocType: Address,Utilities,Utilitaires
 DocType: Purchase Invoice Item,Accounting,Comptabilité
 DocType: Features Setup,Features Setup,Features Setup
+DocType: Item,Is Service Item,Est-Point de service
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Période d&#39;application ne peut pas être la période d&#39;allocation de congé à l&#39;extérieur
 DocType: Activity Cost,Projects,Projets
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,S'il vous plaît sélectionner l'Exercice
@@ -1146,7 +1153,7 @@
 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 +465,cannot be greater than 100,ne peut pas être supérieure à 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Point {0} n'est pas un stock Article
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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é
@@ -1206,14 +1213,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Si différente de l'adresse du client
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Des variantes de l&#39;article
 DocType: Company,Services,Services
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centre de coûts Parent
 DocType: Sales Invoice,Source,Source
 DocType: Leave Type,Is Leave Without Pay,Est un congé non payé
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +129,No records found in the Payment table,Aucun enregistrement trouvé dans la table Paiement
 apps/erpnext/erpnext/public/js/setup_wizard.js +65,Financial Year Start Date,Date de Début de l'exercice financier
 DocType: Employee External Work History,Total Experience,Total Experience
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Point {0} doit être un élément de sous- traitance
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,Bordereau(x) annulé
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Flux de trésorerie d&#39;investissement
 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
@@ -1264,7 +1271,7 @@
 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 +336,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 +62,Leaves Allocated Successfully for {0},Congés attribués avec succès pour {0}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Pas d'éléments pour emballer
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Pas d'éléments à emballer
 DocType: Shipping Rule Condition,From Value,De la valeur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +542,Manufacturing Quantity is mandatory,Fabrication Quantité est obligatoire
 DocType: Quality Inspection Reading,Reading 4,Reading 4
@@ -1279,17 +1286,17 @@
 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&#39;aide de code à barres. Vous serez en mesure d&#39;entrer dans les articles bon de livraison et la facture de vente par balayage de code à barres de l&#39;article.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Renvoyer Paiement Email
 DocType: Dependent Task,Dependent Task,Tâche dépendante
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,Conversion factor for default Unit of Measure must be 1 in row {0},Facteur de conversion de l'unité de mesure par défaut doit être 1 dans la ligne {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,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 +344,Conversion factor for default Unit of Measure must be 1 in row {0},Facteur de conversion de l'unité de mesure par défaut doit être 1 dans la ligne {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,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&#39;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
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Voir
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Variation nette des espèces
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Variation nette des espèces
 DocType: Salary Structure Deduction,Salary Structure Deduction,Déduction structure salariale
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 la Table de facteur de Conversion
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,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 la Table de facteur de Conversion
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Demande de paiement existe déjà {0}
 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 +182,Quantity must not be more than {0},Quantité ne doit pas être plus de {0}
@@ -1351,7 +1358,7 @@
 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: Packed 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
@@ -1360,7 +1367,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Société , le mois et l'année fiscale est obligatoire"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Dépenses de marketing
 ,Item Shortage Report,Point Pénurie rapport
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Poids est mentionné, \n S'il vous plaît mentionner ""Poids UOM« trop"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Poids est mentionné, \n S'il vous plaît mentionner ""Poids UOM« trop"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Demande de Matériel utilisé pour réaliser cette Stock Entrée
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Une seule unité d&#39;un élément.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Geler stocks Older Than [ jours]
@@ -1371,6 +1378,7 @@
 DocType: Employee,Date Of Retirement,Date de départ à la retraite
 DocType: Upload Attendance,Get Template,Obtenez modèle
 DocType: Address,Postal,Postal
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext Installation terminée!
 DocType: Item,Weightage,Weightage
 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}
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,S'il vous plaît sélectionnez {0} en premier.
@@ -1399,17 +1407,17 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Trop de colonnes. Exporter le rapport et l'imprimer à l'aide d'un tableur.
 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&#39;un client
-apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Définir le préfixe des séries numérotées pour vos transactions
 DocType: Employee Attendance Tool,Employees HTML,Les employés HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,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 +367,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/stock/doctype/item/item.py +361,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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +769,Make Purchase Order,Faites bon de commande
-DocType: SMS Center,Send To,Send To
+DocType: SMS Center,Send To,Envoyer à
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,There is not enough leave balance for Leave Type {0},Il n'y a pas assez de solde de congés d'autorisation de type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Montant alloué
 DocType: Sales Team,Contribution to Net Total,Contribution à Total net
@@ -1429,7 +1437,6 @@
 DocType: Sales Order,To Deliver and Bill,De livrer et le projet de loi
 DocType: GL Entry,Credit Amount in Account Currency,Montant de crédit en compte Devises
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Temps pour la fabrication des journaux.
-DocType: Item,Apply Warehouse-wise Reorder Level,Appliquer Warehouse-sage Réorganiser Niveau
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} doit être soumis
 DocType: Authorization Control,Authorization Control,Contrôle d&#39;autorisation
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Entrepôt Rejeté est obligatoire contre Item rejeté {1}
@@ -1528,6 +1535,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Ligne # {0}: Opération {1} ne est pas terminée pour {2} Quantité de produits finis en ordre de fabrication # {3}. S'il vous plaît mettre à jour l'état de fonctionnement via Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Laisser Bill of Materials devrait être «oui» . Parce que un ou plusieurs nomenclatures actifs présents pour cet article
 DocType: Issue,Resolution Details,Détails de la résolution
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,allocations
 DocType: Quality Inspection Reading,Acceptance Criteria,Critères d&#39;acceptation
 DocType: Item Attribute,Attribute Name,Nom de l'attribut
 DocType: Item Group,Show In Website,Afficher dans le site Web
@@ -1578,7 +1586,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,La note de frais est en attente d'approbation. Seul l'approbateur des frais peut mettre à jour le statut.
 DocType: Purchase Invoice,Additional Discount Amount,Montant de réduction supplémentaire
 DocType: Leave Block List Allow,Leave Block List Allow,Laisser Block List Autoriser
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abr ne peut être vide ou l&#39;espace
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abr ne peut être vide ou l&#39;espace
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Groupe non-groupe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportif
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total réel
@@ -1596,7 +1604,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,S'il vous plaît spécifier la devise de Société
 DocType: Workstation,Wages per hour,Salaires par heure
 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 équilibre dans Batch {0} deviendra négative {1} pour le point {2} au Entrepôt {3}
-apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.",commercial
+apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.",Afficher / Masquer fonctionnalités telles que No de serie. POS ect.
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Suite à des demandes importantes ont été soulevées automatiquement en fonction du niveau de re-commande de l&#39;article
 apps/erpnext/erpnext/controllers/accounts_controller.py +252,Account {0} is invalid. Account Currency must be {1},Le compte {0} est invalide. La devise du compte doit être {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Point {0} a été saisi plusieurs fois avec la même description ou la date ou de l'entrepôt
@@ -1619,7 +1627,7 @@
 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 **.
 DocType: Opportunity,Customer / Lead Address,Adresse Client / Prospect
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Attention: certificat SSL non valide sur la pièce jointe {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Attention: certificat SSL non valide sur la pièce jointe {0}
 DocType: Production Order Operation,Actual Operation Time,Temps Opérationnel Réel
 DocType: Authorization Rule,Applicable To (User),Applicable aux (Utilisateur)
 DocType: Purchase Taxes and Charges,Deduct,Déduire
@@ -1768,7 +1776,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Cas n ° ne peut pas être 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 vous avez équipe de vente et Partenaires Vente (Channel Partners), ils peuvent être marqués et maintenir leur contribution à l&#39;activité commerciale"
 DocType: Item,Show a slideshow at the top of the page,Afficher un diaporama en haut de la page
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Magasins
+DocType: Item,"Allow in Sales Order of type ""Service""","Autoriser les bon de commandes de type ""Service"""
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Magasins
 DocType: Time Log,Projects Manager,Chef de Projet
 DocType: Serial No,Delivery Time,L'heure de la livraison
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Basé sur le vieillissement
@@ -1793,7 +1802,7 @@
 ,Financial Analytics,Financial Analytics
 DocType: Quality Inspection,Verified By,Vérifié par
 DocType: Address,Subsidiary,Filiale
-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.",Voyage
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Vous ne pouvez pas changer la devise par défaut de l'entreprise, parce qu'il ya des opérations existantes. Les transactions doivent être annulées pour changer la devise par défaut."
 DocType: Quality Inspection,Purchase Receipt No,Achetez un accusé de réception
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Arrhes
 DocType: Process Payroll,Create Salary Slip,Créer bulletin de salaire
@@ -1841,7 +1850,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Matières premières ne peuvent pas être vide.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Impossible de mettre à jour de stock, facture contient baisse élément de l&#39;expédition."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 &#39;A Numéro de série &quot;,&quot; A lot Non »,« Est-Stock Item »et« Méthode d&#39;évaluation »"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Journal Entrée rapide
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Vous ne pouvez pas modifier le taux si BOM mentionné agianst un article
@@ -1950,7 +1959,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,S'il vous plaît Livraison première note
 DocType: Purchase Invoice,Currency and Price List,Monnaie et liste de prix
 DocType: Opportunity,Customer / Lead Name,Nom du Client / Prospect
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,"Désignation des employés (par exemple de chef de la direction , directeur , etc.)"
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,"Désignation des employés (par exemple de chef de la direction , directeur , etc.)"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Production
 DocType: Item,Allow Production Order,Permettre les ordres de fabrication
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Ligne {0} : Date de début doit être avant Date de fin
@@ -1960,7 +1969,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
 DocType: Salary Structure,Total Earning,Total Revenus
 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 +118,My Addresses,Mes adresses
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Mes adresses
 DocType: Stock Ledger Entry,Outgoing Rate,Taux sortant
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Organisation principale des branches.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,ou
@@ -2029,7 +2038,7 @@
 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 +302,New Cost Center Name,Nom du Nouveau Centre de Coûts
 DocType: Leave Control Panel,Leave Control Panel,Quitter le panneau de configuration
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Aucune Modèle d'Adresse par défaut trouvé. S'il vous plaît créez un nouveau modèle à partir de Configuration> Impression et Branding> Modèle d'Adresse
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Aucune Modèle d'Adresse par défaut trouvé. S'il vous plaît créez un nouveau modèle à partir de Configuration> Impression et Branding> Modèle d'Adresse
 DocType: Appraisal,HR User,Chargé de Ressources Humaines
 DocType: Purchase Invoice,Taxes and Charges Deducted,Taxes et frais déduits
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Questions
@@ -2046,7 +2055,7 @@
 ,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 +499,Warning: Another {0} # {1} exists against stock entry {2},Attention: Un autre {0} {1} # existe contre l&#39;entrée en stock {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,arrondis
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Grand
@@ -2065,7 +2074,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Toutes les opérations de vente peuvent être assignées à plusieurs **Agent Commerciaux** de sorte que vous pouvez configurer et surveiller les cibles.
 ,S.O. No.,S.O. Non.
 DocType: Production Order Operation,Make Time Log,Prenez le temps Connexion
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,S&#39;il vous plaît définir la quantité de réapprovisionnement
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Merci de créer un Client à partir du Prospect {0}
 DocType: Price List,Applicable for Countries,Applicable pour les pays
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Ordinateurs
@@ -2152,7 +2160,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Obtenez les entrées pertinentes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Entrée comptable pour Stock
 DocType: Sales Invoice,Sales Team1,Ventes Equipe1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Point {0} n'existe pas
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Point {0} n'existe pas
 DocType: Sales Invoice,Customer Address,Adresse du client
 DocType: Payment Request,Recipient and Message,Destinataire Message
 DocType: Purchase Invoice,Apply Additional Discount On,Appliquer de remise supplémentaire sur
@@ -2194,7 +2202,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Taux d&#39;évaluation
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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
@@ -2232,7 +2240,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Type de partie de Parent
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Date de livraison prévue ne peut pas être avant commande date
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Le titre de l'adresse est obligatoire
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Le titre de l'adresse est obligatoire
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Entrez le nom de la campagne si la source de l&#39;enquête est la campagne
 apps/erpnext/erpnext/setup/setup_wizard/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
@@ -2256,6 +2264,7 @@
 DocType: UOM,Must be Whole Number,Doit être un nombre entier
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nouvelle Attribution de Congés (en jours)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Maître d'adresses.
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Entrepôt de clientèle (Facultatif)
 DocType: Pricing Rule,Discount Percentage,Annuler Matériel Visiter {0} avant d'annuler ce numéro de client
 DocType: Payment Reconciliation Invoice,Invoice Number,Numéro de facture
 apps/erpnext/erpnext/hooks.py +55,Orders,Commandes
@@ -2365,7 +2374,7 @@
 DocType: Appraisal,Appraisal,Évaluation
 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/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Signataire autorisé
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},Approbateur d'absence doit être un de {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,Leave approver must be one of {0},Approbateur d'absence doit être un de {0}
 DocType: Hub Settings,Seller Email,Vendeur Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Coût d&#39;achat total (via la facture d&#39;achat)
 DocType: Workstation Working Hour,Start Time,Heure de début
@@ -2534,7 +2543,7 @@
 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
 DocType: Sales Order Item,Supplier delivers to Customer,Fournisseur fournit au client
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Afficher impôt rupture
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Afficher impôt rupture
 apps/erpnext/erpnext/accounts/party.py +283,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&#39;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.
@@ -2558,7 +2567,7 @@
 DocType: Opportunity,Opportunity Type,Type d&#39;opportunité
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,Nouvelle Société
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},Quantité de minute
-apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transactions ne peuvent être supprimés par le créateur de la Société
+apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transactions ne peuvent être supprimés que par le créateur de la Société
 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.,Nombre incorrect de General Ledger Entrées trouvées. Vous avez peut-être choisi le bon compte dans la transaction.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,Pour créer un compte bancaire
 DocType: Hub Settings,Publish Availability,Publier Disponibilité
@@ -2577,14 +2586,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilités
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,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/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,S'il vous plaît entrer au moins 1 facture dans le tableau
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,Add Users,Ajouter des utilisateurs
 DocType: Pricing Rule,Item Group,Groupe d&#39;éléments
 DocType: Task,Actual Start Date (via Time Logs),Date de début réelle (via Time Logs)
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,S&#39;il vous plaît retaper nom de l&#39;entreprise pour confirmer
@@ -2611,9 +2620,6 @@
 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,La Date d'Embauche doit être supérieure à la Date de Naissance
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Grille des salaires
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Multiple règle de prix existe avec les mêmes critères, s'il vous plaît résoudre \
- conflit en attribuant des priorités. Règles Prix: {0}"
 DocType: Account,Bank,Banque
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,compagnie aérienne
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Material Issue
@@ -2630,7 +2636,7 @@
 DocType: Purchase Invoice,Items,Articles
 DocType: Fiscal Year,Year Name,Nom Année
 DocType: Process Payroll,Process Payroll,processus de paye
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,Compte de capital
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,Il n'y a plus de vacances que de jours de travail ce mois-ci.
 DocType: Product Bundle Item,Product Bundle Item,Produit Bundle Point
 DocType: Sales Partner,Sales Partner Name,Nom Sales Partner
 DocType: Payment Reconciliation,Maximum Invoice Amount,Montant maximal de la facture
@@ -2638,7 +2644,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valeurs mobilières et des bourses de marchandises
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unité de mesure pour la variante par défaut &#39;{0}&#39; doit être la même que dans le modèle &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unité de mesure pour la variante par défaut &#39;{0}&#39; doit être la même que dans le modèle &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calculer en fonction
 DocType: Delivery Note Item,From Warehouse,De Entrepôt
 DocType: Purchase Taxes and Charges,Valuation and Total,Valorisation et Total
@@ -2647,10 +2653,10 @@
 DocType: Account,Purchase User,Achat utilisateur
 DocType: Notification Control,Customize the Notification,Personnaliser la notification
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Flux de trésorerie provenant des opérations
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Adresse par défaut modèle ne peut pas être supprimé
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Adresse par défaut modèle ne peut pas être supprimé
 DocType: Sales Invoice,Shipping Rule,Règle de livraison
 DocType: Manufacturer,Limited to 12 characters,Limité à 12 caractères
-DocType: Journal Entry,Print Heading,Imprimer Cap
+DocType: Journal Entry,Print Heading,Imprimer rubrique
 DocType: Quotation,Maintenance Manager,Responsable Maintenance
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total ne peut pas être zéro
 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,'Jours depuis la dernière commande' doit être supérieur ou égale à zéro
@@ -2664,7 +2670,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,S&#39;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&#39;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}
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Centre de coûts de transactions existants ne peut pas être converti pour le grand livre
 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
 DocType: Item,Item Code for Suppliers,Code de l&#39;article pour les fournisseurs
@@ -2741,8 +2747,8 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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&#39;évaluation
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,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
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,Commercial,Reste du monde
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,L'article parent {0} ne doit pas être un élément de Stock
 DocType: Cost Center,Distribution Id,Id distribution
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Services impressionnants
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Tous les produits ou services.
@@ -2760,7 +2766,7 @@
 DocType: Customer,Default Receivable Accounts,Comptes de créances clients par défaut
 DocType: Tax Rule,Billing State,État de facturation
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Transférer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,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 +642,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 +95,Due Date is mandatory,Date d&#39;échéance est obligatoire
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Incrément pour attribut {0} ne peut pas être 0
@@ -2793,7 +2799,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Résultat provisoire / Perte (crédit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Résultat provisoire / Perte (crédit)
 DocType: Sales Invoice,Return Against Sales Invoice,Retour contre facture de vente
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Point 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},S'il vous plaît définir la valeur par défaut {0} dans {1} Société
@@ -2807,7 +2813,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Le compte {0} est inactif
 DocType: GL Entry,Is Advance,Est-Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Participation Date de début et de présence à ce jour est obligatoire
-apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,{0} {1} contre facture {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,S'il vous plaît entrez 'Est sous-traitée' Oui ou Non
 DocType: Sales Team,Contact No.,Contactez No.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,Le compte {0} de type 'profit et pertes' n'est pas permis dans une ouverture d'entrée.
 DocType: Features Setup,Sales Discounts,Escomptes sur ventes
@@ -2818,12 +2824,13 @@
 apps/erpnext/erpnext/templates/generators/item.html +83,Specifications,caractéristiques
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Taxes de vente et frais Template
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Vêtements & Accessoires
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Nombre de l'ordre
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Nombre de commande
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / bannière qui apparaîtra sur le haut de la liste des produits.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Préciser les conditions pour calculer le montant de l'expédition
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Ajouter un enfant
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rôle autorisés à fixer congelés Comptes et modifier les entrées congelés
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Vous ne pouvez pas convertir le centre de coûts à livre car il possède des nœuds enfant
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Valeur d&#39;ouverture
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,# Série
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Commission sur les ventes
 DocType: Offer Letter Term,Value / Description,Valeur / Description
@@ -2832,7 +2839,7 @@
 DocType: Production Order,Expected Delivery Date,Date de livraison prévue
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,De débit et de crédit pas égale pour {0} # {1}. La différence est {2}.
 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 +191,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Montant du rabais
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +191,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Facture de vente {0} doit être annulé avant l'annulation de cette commande client
 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 .
@@ -2857,7 +2864,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Supprimé avec succès toutes les transactions liées à cette société!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Comme le Date
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,probation
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,{0} {1} contre le projet de loi {2} du {3}
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,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}
 DocType: Stock Settings,Auto insert Price List rate if missing,Insertion automatique de taux de la liste de prix si manquante
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Montant total payé
@@ -2893,7 +2899,7 @@
 DocType: Payment Tool,Set Matching Amounts,Montants assortis Assortiment
 DocType: Purchase Invoice,Taxes and Charges Added,Taxes et redevances Ajouté
 ,Sales Funnel,Entonnoir des ventes
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Abréviation est obligatoire
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Abréviation est obligatoire
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Merci de votre intérêt pour en vous abonnant à nos mises à jour
 ,Qty to Transfer,Qté à Transférer
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Devis à Prospects ou Clients.
@@ -2905,7 +2911,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +44,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)
 DocType: Account,Temporary,Temporaire
-DocType: Address,Preferred Billing Address,Préféré adresse de facturation
+DocType: Address,Preferred Billing Address,Adresse de facturation principale
 DocType: Monthly Distribution Percentage,Percentage Allocation,Répartition en pourcentage
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,secrétaire
 DocType: Serial No,Distinct unit of an Item,Unité distincte d'un élément
@@ -2921,7 +2927,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,Estimation Fournisseur
 DocType: Quotation,In Words will be visible once you save the Quotation.,En Toutes Lettres. Sera visible une fois que vous enregistrerez le devis.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} est arrêté
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Le code barre {0} est déjà utilisé dans l'article {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Evénements à venir
@@ -2944,7 +2950,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Sélectionnez Exercice ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,Profil POS nécessaire pour faire POS Entrée
 DocType: Hub Settings,Name Token,Nom du jeton
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,vente standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,vente standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -3004,7 +3010,7 @@
 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/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 +351,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 +351,Note: {0},Note: {0}
 ,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 +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}"
@@ -3067,7 +3073,7 @@
 DocType: Sales Invoice,Paid Amount,Montant payé
 ,Available Stock for Packing Items,Disponible en stock pour l&#39;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"
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Le solde du compte est déjà en débit, vous n'êtes pas autorisé à définir 'Doit être en équilibre' comme 'Crédit'"
 apps/erpnext/erpnext/setup/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
@@ -3113,7 +3119,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,S&#39;il vous plaît préciser à partir de / à la gamme
 DocType: Serial No,Under AMC,En vertu de l&#39;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
+apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Paramètres par défaut pour les transactions de vente.
 DocType: BOM Replace Tool,Current BOM,Nomenclature actuelle
 apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Ajouter Numéro de série
 DocType: Production Order,Warehouses,Entrepôts
@@ -3168,7 +3174,7 @@
 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 courriel . (par exemple support@example.com )
 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 +578,Item variant {0} exists with same attributes,Variante d&#39;objet {0} existe avec les mêmes caractéristiques
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Variante d&#39;objet {0} existe avec les mêmes caractéristiques
 DocType: Salary Slip,Salary Slip,Fiche de paye
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'La date' est requise
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Générer bordereaux des paquets à livrer. Utilisé pour notifier numéro de colis, le contenu du paquet et son poids."
@@ -3179,7 +3185,7 @@
 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 courriel 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 courriel."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Paramètres globaux
 DocType: Employee Education,Employee Education,Formation de l'employé
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,Il est nécessaire d&#39;aller chercher de l&#39;article Détails.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,It is needed to fetch Item Details.,Il est nécessaire d&#39;aller chercher de l&#39;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}
@@ -3205,6 +3211,7 @@
 DocType: BOM,Manufacturing User,Intervenant/Chargé de Fabrication
 DocType: Purchase Order,Raw Materials Supplied,Des matières premières fournies
 DocType: Purchase Invoice,Recurring Print Format,Format d&#39;impression récurrent
+DocType: C-Form,Series,série
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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&#39;évaluation
 DocType: Item Group,Item Classification,Point Classification
@@ -3291,7 +3298,7 @@
 DocType: Workstation,Operating Costs,Coûts d'exploitation
 DocType: Employee Leave Approver,Employee Leave Approver,Approbateur des Congés de l'employé
 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 +434,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 +420,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."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Directeur des Achats
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Ordre de fabrication {0} doit être soumis
@@ -3299,7 +3306,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Rapports principaux
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,À ce jour ne peut pas être avant la date
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Ajouter / Modifier Prix
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Mes Commandes
@@ -3316,7 +3323,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Date d&#39;achèvement
 DocType: Purchase Invoice Item,Amount (Company Currency),Montant (Devise de la Société)
 apps/erpnext/erpnext/config/hr.py +113,Organization unit (department) master.,Unité d'organisation (département) maître .
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,nos
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,S'il vous plaît entrez No mobiles valides
 DocType: Budget Detail,Budget Detail,Détail du budget
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Vous ne pouvez pas supprimer Aucune série {0} en stock . Première retirer du stock, puis supprimer ."
 apps/erpnext/erpnext/config/accounts.py +137,Point-of-Sale Profile,Point-of-Sale profil
@@ -3347,7 +3354,7 @@
 DocType: Employee,Date of Issue,Date d&#39;é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 +150,Row #{0}: Set Supplier for item {1},Row # {0}: Réglez Fournisseur pour le point {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Site Web image {0} attaché à Point {1} ne peut pas être trouvé
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Site Web image {0} attaché à Point {1} ne peut pas être trouvé
 DocType: Issue,Content Type,Type de contenu
 apps/erpnext/erpnext/setup/setup_wizard/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.
@@ -3361,7 +3368,7 @@
 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 +357,'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 +351,'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
@@ -3387,7 +3394,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Fermeture compte {0} doit être de type passif / Equity
 DocType: Authorization Rule,Based On,Basé sur
 DocType: Sales Order Item,Ordered Qty,Quantité commandée
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Point {0} est désactivé
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Point {0} est désactivé
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Jusqu&#39;à
 apps/erpnext/erpnext/controllers/recurring_document.py +168,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.
@@ -3395,7 +3402,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Achat doit être vérifiée, si pour Applicable est sélectionné comme {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,La remise doit être inférieure à 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Write Off Montant (Société devise)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Row # {0}: S&#39;il vous plaît définir la quantité de réapprovisionnement
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Row # {0}: S&#39;il vous plaît définir la quantité de réapprovisionnement
 DocType: Landed Cost Voucher,Landed Cost Voucher,Bon d'Landed Cost
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},S'il vous plaît mettre {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Répétez le Jour du Mois
@@ -3446,7 +3453,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Nombre de feuilles alloués sont plus de jours de la période
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Point {0} doit être un stock Article
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Par défaut Work In Progress Entrepôt
-apps/erpnext/erpnext/config/accounts.py +117,Default settings for accounting transactions.,Les paramètres par défaut pour les opérations comptables .
+apps/erpnext/erpnext/config/accounts.py +117,Default settings for accounting transactions.,Paramètres par défaut pour les opérations comptables .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +58,Expected Date cannot be before Material Request Date,Date prévu ne peut pas être avant Matériel Date de la demande
 apps/erpnext/erpnext/stock/get_item_details.py +115,Item {0} must be a Sales Item,Point {0} doit être un élément de ventes
 DocType: Naming Series,Update Series Number,Mettre à jour la Série
@@ -3468,7 +3475,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Voir maintenant
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Sélectionnez la période pendant laquelle la facture sera générée automatiquement
 DocType: BOM,Raw Material Cost,Raw Material Coût
-DocType: Item,Re-Order Level,Re-commande de niveau
+DocType: Item Reorder,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&#39;analyse.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,À temps partiel
 DocType: Employee,Applicable Holiday List,Liste de vacances applicable
@@ -3523,7 +3530,7 @@
 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 +573,Please specify Attribute Value for attribute {0},S&#39;il vous plaît spécifier Attribut Valeur pour l&#39;attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Please specify Attribute Value for attribute {0},S&#39;il vous plaît spécifier Attribut Valeur pour l&#39;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&#39;encontre du compte de groupe {0}
@@ -3602,7 +3609,7 @@
 DocType: Address,Office,Bureau
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Les écritures comptables.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Quantité disponible à partir de l'entrepôt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,S&#39;il vous plaît sélectionnez dossier de l&#39;employé en premier.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,S&#39;il vous plaît sélectionnez dossier de l&#39;employé en premier.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,S&#39;il vous plaît entrer Compte de dépenses
@@ -3662,10 +3669,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Quantité réelle est obligatoire
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Carte de crédit
 DocType: BOM,Item to be manufactured or repacked,Ce point doit être manufacturés ou reconditionnés
-apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,minute
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Paramètres par défaut pour les mouvements de stock.
 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,S'il vous plaît entrer Taxes et frais
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,S'il vous plaît entrez Taxes et frais
 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
@@ -3677,7 +3684,7 @@
 DocType: Item Attribute,Numeric Values,Valeurs numériques
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Joindre le logo
 DocType: Customer,Commission Rate,Taux de commission
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Assurez Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Assurez Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Bloquer les demandes d&#39;autorisation par le ministère.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Le panier est vide
 DocType: Production Order,Actual Operating Cost,Coût de fonctionnement réel
@@ -3694,15 +3701,14 @@
 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 +380,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&#39;enregistrer Achat point-sage
 DocType: Batch,Expiry Date,Date d&#39;expiration
-apps/erpnext/erpnext/stock/doctype/item/item.py +419,"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&#39;achat ou de fabrication de l&#39;article"
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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&#39;achat ou de fabrication de l&#39;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.,Liste de projets.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Ne plus afficher le symbole (tel que $, €...) à côté des montants."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Demi-journée)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Obtenir des éléments de nomenclature
diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv
index 010da3d..aefd416 100644
--- a/erpnext/translations/gu.csv
+++ b/erpnext/translations/gu.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% ગણાવી
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),વિનિમય દર તરીકે જ હોવી જોઈએ {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ગ્રાહક નું નામ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},બેન્ક એકાઉન્ટ તરીકે નામ આપવામાં આવ્યું ન કરી શકાય {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},બેન્ક એકાઉન્ટ તરીકે નામ આપવામાં આવ્યું ન કરી શકાય {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),ઉત્કૃષ્ટ {0} કરી શકાય નહીં શૂન્ય કરતાં ઓછી ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,ન્યૂ છોડો અરજી
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,ન્યૂ છોડો અરજી
 apps/erpnext/erpnext/setup/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,ચુકવણી એકાઉન્ટ પ્રકાર
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","પ્રવૃત્તિઓ લોગ, બિલિંગ સમય માટે ટ્રેકિંગ કરવા માટે વાપરી શકાય છે કે કાર્યો સામે વપરાશકર્તાઓ દ્વારા કરવામાં આવતી."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},ન્યૂ {0}: # {1}
 ,Sales Partners Commission,સેલ્સ પાર્ટનર્સ કમિશન
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,કરતાં વધુ 5 અક્ષરો છે નથી કરી શકો છો સંક્ષેપનો
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,કરતાં વધુ 5 અક્ષરો છે નથી કરી શકો છો સંક્ષેપનો
 DocType: Payment Request,Payment Request,ચુકવણી વિનંતી
 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.",ભાવ {0} {1} આઇટમ તરીકે ચલો \ દૂર કરી શકાતી નથી એટ્રીબ્યુટ આ લક્ષણ સાથે અસ્તિત્વ ધરાવે છે.
@@ -195,6 +195,7 @@
 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 (%),ભાવ યાદી દર પર ડિસ્કાઉન્ટ (%)
 DocType: Offer Letter,Select Terms and Conditions,પસંદ કરો નિયમો અને શરતો
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,મૂલ્ય
 DocType: Production Planning Tool,Sales Orders,વેચાણ ઓર્ડર
 DocType: Purchase Taxes and Charges,Valuation,મૂલ્યાંકન
 ,Purchase Order Trends,ઓર્ડર પ્રવાહો ખરીદી
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,દૂરદર્શન
 DocType: Production Order Operation,Updated via 'Time Log',&#39;સમય લોગ&#39; મારફતે સુધારાશે
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},એકાઉન્ટ {0} કંપની ને અનુલક્ષતું નથી {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},એડવાન્સ રકમ કરતાં વધારે ન હોઈ શકે {0} {1}
 DocType: Naming Series,Series List for this Transaction,આ સોદા માટે સિરીઝ યાદી
 DocType: Sales Invoice,Is Opening Entry,એન્ટ્રી ખુલી છે
 DocType: Customer Group,Mention if non-standard receivable account applicable,ઉલ્લેખ બિન પ્રમાણભૂત મળવાપાત્ર એકાઉન્ટ લાગુ પડતું હોય તો
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,ઉપર ઉલ્લેખ કર્યો માપદંડ માટે પગાર સ્લીપ બનાવે છે.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,આપવામાં કોઈ વર્ણન
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ખરીદી માટે વિનંતી.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,ફક્ત પસંદ કરેલ છોડો તાજનો આ છોડી અરજી સબમિટ કરી શકો છો
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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} સેટઅપ&gt; સેટિંગ્સ મારફતે&gt; નામકરણ સિરીઝ માટે સિરીઝ નામકરણ સુયોજિત કરો
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},{0} વેરહાઉસ કંપની ને અનુલક્ષતું નથી {1}
 DocType: Item Website Specification,Item Website Specification,વસ્તુ વેબસાઇટ સ્પષ્ટીકરણ
 DocType: Payment Tool,Reference No,સંદર્ભ કોઈ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,છોડો અવરોધિત
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},વસ્તુ {0} પર તેના જીવનના અંતે પહોંચી ગયું છે {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,છોડો અવરોધિત
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},વસ્તુ {0} પર તેના જીવનના અંતે પહોંચી ગયું છે {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,વાર્ષિક
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,સ્ટોક રિકંસીલેશન વસ્તુ
 DocType: Stock Entry,Sales Invoice No,સેલ્સ ભરતિયું કોઈ
@@ -248,7 +250,7 @@
 DocType: Pricing Rule,Supplier Type,પુરવઠોકર્તા પ્રકાર
 DocType: Item,Publish in Hub,હબ પ્રકાશિત
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,{0} વસ્તુ રદ કરવામાં આવે છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,{0} વસ્તુ રદ કરવામાં આવે છે
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,સામગ્રી વિનંતી
 DocType: Bank Reconciliation,Update Clearance Date,સુધારા ક્લિયરન્સ તારીખ
 DocType: Item,Purchase Details,ખરીદી વિગતો
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,ડિલીવરી નોંધ
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,કર સુયોજિત કરી રહ્યા છે
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,તમે તેને ખેંચી ચુકવણી પછી એન્ટ્રી સુધારાઈ ગયેલ છે. તેને ફરીથી ખેંચી કરો.
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} વસ્તુ ટેક્સ બે વખત દાખલ
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,મહિનો અને વર્ષ પસંદ કરો
@@ -327,7 +329,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,તમારું ઈ મેઈલ સરનામું
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,જોડાણ જુઓ
 DocType: Purchase Order,% Received,% પ્રાપ્ત
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,સેટઅપ પહેલેથી પૂર્ણ !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,સેટઅપ પહેલેથી પૂર્ણ !!
 ,Finished Goods,ફિનિશ્ડ ગૂડ્સ
 DocType: Delivery Note,Instructions,સૂચનાઓ
 DocType: Quality Inspection,Inspected By,દ્વારા પરીક્ષણ
@@ -352,14 +354,13 @@
 ,Purchase Register,ખરીદી રજીસ્ટર
 DocType: Landed Cost Item,Applicable Charges,લાગુ ખર્ચ
 DocType: Workstation,Consumable Cost,ઉપભોજ્ય કિંમત
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ભૂમિકા હોવી જ જોઈએ &#39;છોડી તાજનો&#39;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ભૂમિકા હોવી જ જોઈએ &#39;છોડી તાજનો&#39;
 DocType: Purchase Receipt,Vehicle Date,વાહન તારીખ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,મેડિકલ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,ગુમાવી માટે કારણ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},વર્કસ્ટેશન રજા યાદી મુજબ નીચેની તારીખો પર બંધ છે: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,તકો
 DocType: Employee,Single,એક
-DocType: Issue,Attachment,જોડાણ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,બજેટ ગ્રુપ ખર્ચ કેન્દ્રને માટે સેટ કરી શકાય છે
 DocType: Account,Cost of Goods Sold,માલની કિંમત વેચાઈ
 DocType: Purchase Invoice,Yearly,વાર્ષિક
@@ -388,7 +389,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,એટ્રીબ્યુટ {0} લક્ષણો ટેબલ ઘણી વખત પસંદ
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,એટ્રીબ્યુટ {0} લક્ષણો ટેબલ ઘણી વખત પસંદ
 DocType: HR Settings,Employee record is created using selected field. ,કર્મચારીનું રેકોર્ડ પસંદ ક્ષેત્ર ઉપયોગ કરીને બનાવવામાં આવે છે.
 DocType: Sales Order,Not Applicable,લાગુ નથી
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,હોલિડે માસ્ટર.
@@ -427,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,કોસ્મેટિક્સ
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items","મર્જ, નીચેના ગુણધર્મો બંને આઇટમ્સ માટે જ હોવી જોઈએ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","મર્જ, નીચેના ગુણધર્મો બંને આઇટમ્સ માટે જ હોવી જોઈએ"
 DocType: Shipping Rule,Net Weight,કુલ વજન
 DocType: Employee,Emergency Phone,સંકટકાલીન ફોન
 ,Serial No Warranty Expiry,સીરીયલ કોઈ વોરંટી સમાપ્તિ
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,મેનેજિંગ Subcontracting
 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,દર ભાવ યાદી ચલણ પર કંપનીના આધાર ચલણ ફેરવાય છે
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},{0} એકાઉન્ટ કંપની ને અનુલક્ષતું નથી: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},{0} એકાઉન્ટ કંપની ને અનુલક્ષતું નથી: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,સંક્ષેપનો પહેલેથી બીજી કંપની માટે વપરાય
 DocType: Selling Settings,Default Customer Group,મૂળભૂત ગ્રાહક જૂથ
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","અક્ષમ કરો છો, &#39;ગોળાકાર કુલ&#39; ક્ષેત્ર કોઈપણ વ્યવહાર માં દૃશ્યમાન હશે નહિં"
 DocType: BOM,Operating Cost,સંચાલન ખર્ચ
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,ભરતિયું ટેબલ માં શોધી કોઈ રેકોર્ડ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,પ્રથમ કંપની અને પાર્ટી પ્રકાર પસંદ કરો
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,નાણાકીય / હિસાબી વર્ષ.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,સંચિત મૂલ્યો
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","માફ કરશો, સીરીયલ અમે મર્જ કરી શકાતા નથી"
 DocType: Project Task,Project Task,પ્રોજેક્ટ ટાસ્ક
 ,Lead Id,લીડ આઈડી
@@ -492,7 +495,7 @@
 DocType: Quotation,Quotation To,માટે અવતરણ
 DocType: Lead,Middle Income,મધ્યમ આવક
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),ખુલી (સીઆર)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,જો તમે પહેલાથી જ અન્ય UOM સાથે કેટલાક વ્યવહાર (ઓ) કર્યા છે કારણ કે વસ્તુ માટે માપવા એકમ મૂળભૂત {0} સીધા બદલી શકાતું નથી. તમે વિવિધ મૂળભૂત UOM વાપરવા માટે એક નવી આઇટમ બનાવવા માટે જરૂર પડશે.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,જો તમે પહેલાથી જ અન્ય UOM સાથે કેટલાક વ્યવહાર (ઓ) કર્યા છે કારણ કે વસ્તુ માટે માપવા એકમ મૂળભૂત {0} સીધા બદલી શકાતું નથી. તમે વિવિધ મૂળભૂત UOM વાપરવા માટે એક નવી આઇટમ બનાવવા માટે જરૂર પડશે.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,ફાળવેલ રકમ નકારાત્મક ન હોઈ શકે
 DocType: Purchase Order Item,Billed Amt,ચાંચ એએમટી
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"સ્ટોક પ્રવેશો કરવામાં આવે છે, જે સામે લોજિકલ વેરહાઉસ."
@@ -570,7 +573,7 @@
 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 +543,Item has variants.,વસ્તુ ચલો છે.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,વૃક્ષ પ્રકાર
@@ -583,6 +586,7 @@
 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 +33,Goods received from Suppliers.,ગૂડ્ઝ સપ્લાયરો પાસેથી પ્રાપ્ત થઈ છે.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,ભાવ
 DocType: Lead,Campaign Name,ઝુંબેશ નામ
 ,Reserved,અનામત
 DocType: Purchase Order,Supply Raw Materials,પુરવઠા કાચો માલ
@@ -597,16 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,હાલની વ્યવહાર સાથે એકાઉન્ટ ખાતાવહી રૂપાંતરિત કરી શકતા નથી
 DocType: Delivery Note,Customer's Purchase Order No,ગ્રાહક ખરીદી ઓર્ડર કોઈ
 DocType: Employee,Cell Number,સેલ સંખ્યા
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,ઓટો સામગ્રી અરજીઓ પેદા
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,ઓટો સામગ્રી અરજીઓ પેદા
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,લોસ્ટ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,તમે સ્તંભ &#39;જર્નલ પ્રવેશ સામે વર્તમાન વાઉચર દાખલ નહીં કરી શકો
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,એનર્જી
 DocType: Opportunity,Opportunity From,પ્રતિ તક
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,માસિક પગાર નિવેદન.
 DocType: Item Group,Website Specifications,વેબસાઇટ તરફથી
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},તમારા સરનામું ઢાંચો એક ભૂલ છે {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,નવા એકાઉન્ટ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: પ્રતિ {0} પ્રકારની {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,રો {0}: રૂપાંતર ફેક્ટર ફરજિયાત છે
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","મલ્ટીપલ ભાવ નિયમો જ માપદંડ સાથે અસ્તિત્વ ધરાવે છે, અગ્રતા સોંપણી દ્વારા તકરાર ઉકેલવા કરો. ભાવ નિયમો: {0}"
 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.,હિસાબી પ્રવેશો પર્ણ ગાંઠો સામે કરી શકાય છે. જૂથો સામે પ્રવેશો મંજૂરી નથી.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,"નિષ્ક્રિય અથવા તે અન્ય BOMs સાથે કડી થયેલ છે, કારણ કે BOM રદ કરી શકાતી નથી"
 DocType: Opportunity,Maintenance,જાળવણી
@@ -649,7 +655,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,ભાવ યાદી પસંદ નહી
 DocType: Employee,Family Background,કૌટુંબિક પૃષ્ઠભૂમિ
 DocType: Process Payroll,Send Email,ઇમેઇલ મોકલો
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},ચેતવણી: અમાન્ય જોડાણ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},ચેતવણી: અમાન્ય જોડાણ {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,પરવાનગી નથી
 DocType: Company,Default Bank Account,મૂળભૂત બેન્ક એકાઉન્ટ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","પાર્ટી પર આધારિત ફિલ્ટર કરવા માટે, પસંદ પાર્ટી પ્રથમ પ્રકાર"
@@ -679,13 +685,13 @@
 DocType: Production Planning Tool,Select Items,આઇટમ્સ પસંદ કરો
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} બિલ સામે {1} ના રોજ {2}
 DocType: Maintenance Visit,Completion Status,પૂર્ણ સ્થિતિ
-DocType: Sales Invoice Item,Target Warehouse,લક્ષ્યાંક વેરહાઉસ
+DocType: Production Order,Target Warehouse,લક્ષ્યાંક વેરહાઉસ
 DocType: Item,Allow over delivery or receipt upto this percent,આ ટકા સુધી ડિલિવરી અથવા રસીદ પર પરવાનગી આપે છે
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,અપેક્ષિત બોલ તારીખ સેલ્સ ઓર્ડર તારીખ પહેલાં ન હોઈ શકે
 DocType: Upload Attendance,Import Attendance,આયાત એટેન્ડન્સ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,બધા આઇટમ જૂથો
 DocType: Process Payroll,Activity Log,પ્રવૃત્તિ લોગ
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,ચોખ્ખો નફો / નુકશાન
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,ચોખ્ખો નફો / નુકશાન
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,આપમેળે વ્યવહારો સબમિશન પર સંદેશ કંપોઝ.
 DocType: Production Order,Item To Manufacture,વસ્તુ ઉત્પાદન
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} સ્થિતિ {2} છે
@@ -693,7 +699,7 @@
 DocType: Sales Order Item,Projected Qty,અંદાજિત Qty
 DocType: Sales Invoice,Payment Due Date,ચુકવણી કારણે તારીખ
 DocType: Newsletter,Newsletter Manager,ન્યૂઝલેટર વ્યવસ્થાપક
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,વસ્તુ વેરિએન્ટ {0} પહેલાથી જ લક્ષણો સાથે હાજર
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,વસ્તુ વેરિએન્ટ {0} પહેલાથી જ લક્ષણો સાથે હાજર
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;ખુલી&#39;
 DocType: Notification Control,Delivery Note Message,ડ લવર નોંધ સંદેશ
 DocType: Expense Claim,Expenses,ખર્ચ
@@ -703,7 +709,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,રિસર્ચ એન્ડ ડેવલપમેન્ટ
 ,Amount to Bill,બિલ રકમ
 DocType: Company,Registration Details,નોંધણી વિગતો
-DocType: Item,Re-Order Qty,ફરીથી ઓર્ડર Qty
+DocType: Item Reorder,Re-Order Qty,ફરીથી ઓર્ડર Qty
 DocType: Leave Block List Date,Leave Block List Date,બ્લોક યાદી તારીખ છોડી દો
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},મોકલવા માટે અનુસૂચિત {0}
 DocType: Pricing Rule,Price or Discount,ભાવ અથવા ડિસ્કાઉન્ટ
@@ -746,7 +752,7 @@
 DocType: Bank Reconciliation,Total Amount,કુલ રકમ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,ઈન્ટરનેટ પબ્લિશિંગ
 DocType: Production Planning Tool,Production Orders,ઉત્પાદન ઓર્ડર્સ
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,બેલેન્સ ભાવ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,બેલેન્સ ભાવ
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,સેલ્સ ભાવ યાદી
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,વસ્તુઓ સુમેળ કરવા પ્રકાશિત
 DocType: Bank Reconciliation,Account Currency,એકાઉન્ટ કરન્સી
@@ -755,7 +761,7 @@
 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 +538,Item Variants {0} updated,વસ્તુ ચલો {0} સુધારાશે
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,વસ્તુ ચલો {0} સુધારાશે
 DocType: Quality Inspection Reading,Reading 6,6 વાંચન
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ભરતિયું એડવાન્સ ખરીદી
 DocType: Address,Shop,દુકાન
@@ -832,7 +838,7 @@
 DocType: POS Profile,Cash/Bank Account,કેશ / બેન્ક એકાઉન્ટ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,જથ્થો અથવા કિંમત કોઈ ફેરફાર સાથે દૂર વસ્તુઓ.
 DocType: Delivery Note,Delivery To,ડ લવર
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,એટ્રીબ્યુટ ટેબલ ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,ડિસ્કાઉન્ટ
@@ -860,7 +866,7 @@
 DocType: Tax Rule,Shipping State,શીપીંગ રાજ્ય
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,વસ્તુ બટન &#39;ખરીદી રસીદો થી વસ્તુઓ વિચાર&#39; નો ઉપયોગ ઉમેરાવી જ જોઈએ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,સેલ્સ ખર્ચ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,સ્ટાન્ડર્ડ ખરીદી
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,સ્ટાન્ડર્ડ ખરીદી
 DocType: GL Entry,Against,સામે
 DocType: Item,Default Selling Cost Center,મૂળભૂત વેચાણ ખર્ચ કેન્દ્ર
 DocType: Sales Partner,Implementation Partner,અમલીકરણ જીવનસાથી
@@ -902,7 +908,7 @@
 DocType: Sales Partner,Distributor,ડિસ્ટ્રીબ્યુટર
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,શોપિંગ કાર્ટ શીપીંગ નિયમ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,ઉત્પાદન ઓર્ડર {0} આ વેચાણ ઓર્ડર રદ પહેલાં રદ થયેલ હોવું જ જોઈએ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',સુયોજિત &#39;પર વધારાની ડિસ્કાઉન્ટ લાગુ&#39; કરો
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',સુયોજિત &#39;પર વધારાની ડિસ્કાઉન્ટ લાગુ&#39; કરો
 ,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.,સમય લોગ પસંદ કરો અને નવી વેચાણ ભરતિયું બનાવવા માટે સબમિટ કરો.
@@ -970,9 +976,9 @@
 DocType: Contact,User ID,વપરાશકર્તા ID
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,જુઓ ખાતાવહી
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,જુનું
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group","એક વસ્તુ ગ્રુપ જ નામ સાથે હાજર, આઇટમ નામ બદલવા અથવા વસ્તુ જૂથ નામ બદલી કૃપા કરીને"
 DocType: Production Order,Manufacture against Sales Order,વેચાણ ઓર્ડર સામે ઉત્પાદન
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,બાકીનું વિશ્વ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,કુલ પે
@@ -1002,7 +1008,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","માફ કરશો, કંપનીઓ મર્જ કરી શકાતા નથી"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","માફ કરશો, કંપનીઓ મર્જ કરી શકાતા નથી"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,નાના
 DocType: Employee,Employee Number,કર્મચારીનું સંખ્યા
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},કેસ ના (ઓ) પહેલેથી જ વપરાશમાં છે. કેસ કોઈ થી પ્રયાસ {0}
@@ -1021,7 +1027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,કૃષિ
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,તમારી ઉત્પાદનો અથવા સેવાઓ
 DocType: Mode of Payment,Mode of Payment,ચૂકવણીની પદ્ધતિ
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,વેબસાઇટ છબી જાહેર ફાઈલ અથવા વેબસાઇટ URL હોવો જોઈએ
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,વેબસાઇટ છબી જાહેર ફાઈલ અથવા વેબસાઇટ URL હોવો જોઈએ
 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,વેરહાઉસ સંપર્ક માહિતી
@@ -1093,6 +1099,7 @@
 DocType: Address,Utilities,ઉપયોગીતાઓ
 DocType: Purchase Invoice Item,Accounting,હિસાબી
 DocType: Features Setup,Features Setup,લક્ષણો સેટઅપ
+DocType: Item,Is Service Item,સેવા વસ્તુ છે
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,એપ્લિકેશન સમયગાળાની બહાર રજા ફાળવણી સમય ન હોઈ શકે
 DocType: Activity Cost,Projects,પ્રોજેક્ટ્સ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,ફિસ્કલ વર્ષ પસંદ કરો
@@ -1123,7 +1130,7 @@
 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 +465,cannot be greater than 100,100 કરતા વધારે ન હોઈ શકે
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,{0} વસ્તુ સ્ટોક વસ્તુ નથી
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,{0} વસ્તુ સ્ટોક વસ્તુ નથી
 DocType: Maintenance Visit,Unscheduled,અનિશ્ચિત
 DocType: Employee,Owned,માલિકીની
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,પગાર વિના રજા પર આધાર રાખે છે
@@ -1182,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,સરકાર
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,વસ્તુ ચલો
 DocType: Company,Services,સેવાઓ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),કુલ ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),કુલ ({0})
 DocType: Cost Center,Parent Cost Center,પિતૃ ખર્ચ કેન્દ્રને
 DocType: Sales Invoice,Source,સોર્સ
 DocType: Leave Type,Is Leave Without Pay,પગાર વિના છોડી દો
@@ -1255,17 +1262,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ચુકવણી ઇમેઇલ ફરી મોકલો
 DocType: Dependent Task,Dependent Task,આશ્રિત ટાસ્ક
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},પ્રકાર રજા {0} કરતાં લાંબા સમય સુધી ન હોઈ શકે {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,કમ્પોનન્ટ રકમ
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} જુઓ
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,કેશ કુલ ફેરફાર
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,કેશ કુલ ફેરફાર
 DocType: Salary Structure Deduction,Salary Structure Deduction,પગાર માળખું કપાત
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,મેઝર {0} એકમ રૂપાંતર ફેક્ટર ટેબલ એક કરતા વધુ વખત દાખલ કરવામાં આવી છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,મેઝર {0} એકમ રૂપાંતર ફેક્ટર ટેબલ એક કરતા વધુ વખત દાખલ કરવામાં આવી છે
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},ચુકવણી વિનંતી પહેલેથી હાજર જ છે {0}
 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 +182,Quantity must not be more than {0},જથ્થો કરતાં વધુ ન હોવું જોઈએ {0}
@@ -1327,7 +1334,7 @@
 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: Packed Item,To Warehouse (Optional),વેરહાઉસ (વૈકલ્પિક)
 DocType: Sales Invoice,Paid Amount (Company Currency),ચૂકવેલ રકમ (કંપની ચલણ)
 DocType: Purchase Invoice,Additional Discount,વધારાના ડિસ્કાઉન્ટ
 DocType: Selling Settings,Selling Settings,સેટિંગ્સ વેચાણ
@@ -1336,7 +1343,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","કંપની, મહિનો અને ફિસ્કલ વર્ષ ફરજિયાત છે"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,માર્કેટિંગ ખર્ચ
 ,Item Shortage Report,વસ્તુ અછત રિપોર્ટ
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","વજન \ n કૃપા કરીને પણ &quot;વજન UOM&quot; ઉલ્લેખ, ઉલ્લેખ કર્યો છે"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","વજન \ n કૃપા કરીને પણ &quot;વજન UOM&quot; ઉલ્લેખ, ઉલ્લેખ કર્યો છે"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,સામગ્રી વિનંતી આ સ્ટોક એન્ટ્રી બનાવવા માટે વપરાય
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,આઇટમ એક એકમ.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',સમય લોગ બેચ {0} &#39;સબમિટ&#39; હોવું જ જોઈએ
@@ -1347,6 +1354,7 @@
 DocType: Employee,Date Of Retirement,નિવૃત્તિ તારીખ
 DocType: Upload Attendance,Get Template,નમૂના મેળવવા
 DocType: Address,Postal,ટપાલ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext સેટઅપ પૂર્ણ કરો!
 DocType: Item,Weightage,ભારાંકન
 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,એક ગ્રાહક જૂથ જ નામ સાથે હાજર ગ્રાહક નામ બદલી અથવા ગ્રાહક જૂથ નામ બદલી કૃપા કરીને
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,{0} પ્રથમ પસંદ કરો.
@@ -1375,12 +1383,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ઘણા બધા કૉલમ. અહેવાલમાં નિકાસ અને એક સ્પ્રેડશીટ એપ્લિકેશન ઉપયોગ છાપો.
 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 +139,Main,મુખ્ય
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,મુખ્ય
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,વેરિએન્ટ
 DocType: Naming Series,Set prefix for numbering series on your transactions,તમારા વ્યવહારો પર શ્રેણી નંબર માટે સેટ ઉપસર્ગ
 DocType: Employee Attendance Tool,Employees HTML,કર્મચારીઓ HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,બંધ ઓર્ડર રદ કરી શકાતી નથી. રદ કરવા Unstop.
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,મૂળભૂત BOM ({0}) આ આઇટમ અથવા તેના નમૂના માટે સક્રિય હોવા જ જોઈએ
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,ચલો
@@ -1405,7 +1413,6 @@
 DocType: Sales Order,To Deliver and Bill,વિતરિત અને બિલ
 DocType: GL Entry,Credit Amount in Account Currency,એકાઉન્ટ કરન્સી ક્રેડિટ રકમ
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,ઉત્પાદન માટે સમય લોગ.
-DocType: Item,Apply Warehouse-wise Reorder Level,વેરહાઉસ મુજબના પુનઃક્રમાંકિત કરો સ્તર લાગુ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} સબમિટ હોવું જ જોઈએ
 DocType: Authorization Control,Authorization Control,અધિકૃતિ નિયંત્રણ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ROW # {0}: વેરહાઉસ નકારેલું ફગાવી વસ્તુ સામે ફરજિયાત છે {1}
@@ -1503,6 +1510,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,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}: ઓપરેશન {1} ઉત્પાદન સમાપ્ત માલ {2} Qty માટે પૂર્ણ નથી ઓર્ડર # {3}. સમય લોગ મારફતે કામગીરી સ્થિતિ અપડેટ કરો
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,રોકાણો
 DocType: Issue,Resolution Details,ઠરાવ વિગતો
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ફાળવણી
 DocType: Quality Inspection Reading,Acceptance Criteria,સ્વીકૃતિ માપદંડ
 DocType: Item Attribute,Attribute Name,નામ લક્ષણ
 DocType: Item Group,Show In Website,વેબસાઇટ બતાવો
@@ -1553,7 +1561,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,ખર્ચ દાવો મંજૂરી બાકી છે. માત્ર ખર્ચ તાજનો સ્થિતિ અપડેટ કરી શકો છો.
 DocType: Purchase Invoice,Additional Discount Amount,વધારાના ડિસ્કાઉન્ટ રકમ
 DocType: Leave Block List Allow,Leave Block List Allow,બ્લોક પરવાનગી સૂચિ છોડો
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,સંક્ષિપ્ત ખાલી અથવા જગ્યા ન હોઈ શકે
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,સંક્ષિપ્ત ખાલી અથવા જગ્યા ન હોઈ શકે
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,બિન-ગ્રુપ ગ્રુપ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,રમતો
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,વાસ્તવિક કુલ
@@ -1594,7 +1602,7 @@
 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**.,** ફિસ્કલ વર્ષ ** એક નાણાકીય વર્ષ રજૂ કરે છે. બધા હિસાબી પ્રવેશો અને અન્ય મોટા પાયાના વ્યવહારો ** ** ફિસ્કલ યર સામે ટ્રેક છે.
 DocType: Opportunity,Customer / Lead Address,ગ્રાહક / લીડ સરનામું
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},ચેતવણી: જોડાણ પર અમાન્ય SSL પ્રમાણપત્ર {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},ચેતવણી: જોડાણ પર અમાન્ય SSL પ્રમાણપત્ર {0}
 DocType: Production Order Operation,Actual Operation Time,વાસ્તવિક કામગીરી સમય
 DocType: Authorization Rule,Applicable To (User),લાગુ કરો (વપરાશકર્તા)
 DocType: Purchase Taxes and Charges,Deduct,કપાત
@@ -1743,7 +1751,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,કેસ નંબર 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,"તમે (ચેનલ પાર્ટનર્સ) વેચાણ ટીમ અને વેચાણ ભાગીદારો છે, તો તેઓ ટૅગ કર્યા છે અને વેચાણ પ્રવૃત્તિ તેમના યોગદાન જાળવી શકાય છે"
 DocType: Item,Show a slideshow at the top of the page,પાનાંની ટોચ પર એક સ્લાઇડ શો બતાવવા
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,સ્ટોર્સ
+DocType: Item,"Allow in Sales Order of type ""Service""",પ્રકાર &quot;સેવા&quot; ના વેચાણ ઓર્ડર માટે પરવાનગી આપે છે
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,સ્ટોર્સ
 DocType: Time Log,Projects Manager,પ્રોજેક્ટ્સ વ્યવસ્થાપક
 DocType: Serial No,Delivery Time,ડ લવર સમય
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,પર આધારિત એઇજીંગનો
@@ -1768,7 +1777,7 @@
 ,Financial Analytics,નાણાકીય ઍનલિટિક્સ
 DocType: Quality Inspection,Verified By,દ્વારા ચકાસવામાં
 DocType: Address,Subsidiary,સબસિડીયરી
-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.","હાલની વ્યવહારો છે, કારણ કે કંપની મૂળભૂત ચલણ બદલી શકાતું નથી. વ્યવહારો મૂળભૂત ચલણ બદલવાની રદ હોવું જ જોઈએ."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","હાલની વ્યવહારો છે, કારણ કે કંપની મૂળભૂત ચલણ બદલી શકાતું નથી. વ્યવહારો મૂળભૂત ચલણ બદલવાની રદ હોવું જ જોઈએ."
 DocType: Quality Inspection,Purchase Receipt No,ખરીદી રસીદ કોઈ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,બાનું
 DocType: Process Payroll,Create Salary Slip,પગાર કાપલી બનાવો
@@ -1816,7 +1825,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,કાચો માલ ખાલી ન હોઈ શકે.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","સ્ટોક અપડેટ કરી શકાયું નથી, ભરતિયું ડ્રોપ શીપીંગ વસ્તુ છે."
 DocType: Newsletter,Test,ટેસ્ટ
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'","હાલની સ્ટોક વ્યવહારો તમે ના કિંમતો બદલી શકતા નથી \ આ આઇટમ માટે ત્યાં હોય છે &#39;સીરિયલ કોઈ છે&#39;, &#39;બેચ છે કોઈ&#39;, &#39;સ્ટોક વસ્તુ છે&#39; અને &#39;મૂલ્યાંકન પદ્ધતિ&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,ઝડપી જર્નલ પ્રવેશ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,BOM કોઈપણ વસ્તુ agianst ઉલ્લેખ તો તમે દર બદલી શકતા નથી
@@ -1905,7 +1914,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,કૃપા કરીને બોલ પર કોઈ નોંધ પ્રથમ
 DocType: Purchase Invoice,Currency and Price List,કરન્સી અને ભાવ યાદી
 DocType: Opportunity,Customer / Lead Name,ગ્રાહક / લીડ નામ
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,ક્લિયરન્સ તારીખ ઉલ્લેખ નથી
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,ક્લિયરન્સ તારીખ ઉલ્લેખ નથી
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,ઉત્પાદન
 DocType: Item,Allow Production Order,પરવાનગી આપે છે ઉત્પાદન ઓર્ડર
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,રો {0}: પ્રારંભ તારીખ સમાપ્તિ તારીખ પહેલાં જ હોવી જોઈએ
@@ -1915,7 +1924,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,કુલ અર્નિંગ
 DocType: Purchase Receipt,Time at which materials were received,"સામગ્રી પ્રાપ્ત કરવામાં આવી હતી, જે અંતે સમય"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,મારા સરનામાંઓ
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,મારા સરનામાંઓ
 DocType: Stock Ledger Entry,Outgoing Rate,આઉટગોઇંગ દર
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,સંસ્થા શાખા માસ્ટર.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,અથવા
@@ -1984,7 +1993,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,ગ્રાહક જૂથ વૃક્ષ મેનેજ કરો.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,ન્યૂ ખર્ચ કેન્દ્રને નામ
 DocType: Leave Control Panel,Leave Control Panel,નિયંત્રણ પેનલ છોડો
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,મૂળભૂત સરનામું ઢાંચો જોવા મળે છે. સેટઅપ&gt; પ્રિન્ટર અને બ્રાંડિંગ&gt; સરનામું નમૂનો એક નવું બનાવો.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,મૂળભૂત સરનામું ઢાંચો જોવા મળે છે. સેટઅપ&gt; પ્રિન્ટર અને બ્રાંડિંગ&gt; સરનામું નમૂનો એક નવું બનાવો.
 DocType: Appraisal,HR User,એચઆર વપરાશકર્તા
 DocType: Purchase Invoice,Taxes and Charges Deducted,કર અને ખર્ચ બાદ
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,મુદ્દાઓ
@@ -2001,7 +2010,7 @@
 ,Sales Browser,સેલ્સ બ્રાઉઝર
 DocType: Journal Entry,Total Credit,કુલ ક્રેડિટ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},ચેતવણી: અન્ય {0} # {1} સ્ટોક પ્રવેશ સામે અસ્તિત્વમાં {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,સ્થાનિક
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,મોટા
@@ -2020,7 +2029,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,તમે સુયોજિત અને લક્ષ્યો મોનીટર કરી શકે છે કે જેથી બધા સેલ્સ વ્યવહારો બહુવિધ ** વેચાણ વ્યક્તિઓ ** સામે ટૅગ કરી શકો છો.
 ,S.O. No.,તેથી નંબર
 DocType: Production Order Operation,Make Time Log,સમય લોગ બનાવો
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,પુનઃક્રમાંકિત કરો જથ્થો સુયોજિત કરો
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},લીડ પ્રતિ ગ્રાહક બનાવવા કૃપા કરીને {0}
 DocType: Price List,Applicable for Countries,દેશો માટે લાગુ પડે છે
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,એન્જીનિયરિંગ
@@ -2095,7 +2103,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,સંબંધિત પ્રવેશો મળી
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,સ્ટોક માટે એકાઉન્ટિંગ એન્ટ્રી
 DocType: Sales Invoice,Sales Team1,સેલ્સ team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,વસ્તુ {0} અસ્તિત્વમાં નથી
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,વસ્તુ {0} અસ્તિત્વમાં નથી
 DocType: Sales Invoice,Customer Address,ગ્રાહક સરનામું
 DocType: Payment Request,Recipient and Message,મેળવનાર અને સંદેશ
 DocType: Purchase Invoice,Apply Additional Discount On,વધારાના ડિસ્કાઉન્ટ પર લાગુ પડે છે
@@ -2137,7 +2145,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,મૂલ્યાંકન દર
 apps/erpnext/erpnext/stock/get_item_details.py +274,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} ઉપર &#39;ખરીદી રસીદો&#39; ટેબલ અસ્તિત્વમાં નથી ખરીદી રસીદ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,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 +155,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,લોગ
@@ -2175,7 +2183,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,તારીખ રાહત દાખલ કરો.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,એએમટી
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,માત્ર પરિસ્થિતિ &#39;માન્ય&#39; સબમિટ કરી શકો છો પૂરૂં છોડો
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,સરનામું શીર્ષક ફરજિયાત છે.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,સરનામું શીર્ષક ફરજિયાત છે.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"તપાસ સ્ત્રોત અભિયાન છે, તો ઝુંબેશ નામ દાખલ કરો"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,અખબાર પ્રકાશકો
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ફિસ્કલ વર્ષ પસંદ કરો
@@ -2199,6 +2207,7 @@
 DocType: UOM,Must be Whole Number,સમગ્ર નંબર હોવો જોઈએ
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(દિવસોમાં) સોંપાયેલ નવા પાંદડા
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,સીરીયલ કોઈ {0} અસ્તિત્વમાં નથી
+DocType: Sales Invoice Item,Customer Warehouse (Optional),ગ્રાહક વેરહાઉસ (વૈકલ્પિક)
 DocType: Pricing Rule,Discount Percentage,ડિસ્કાઉન્ટ ટકાવારી
 DocType: Payment Reconciliation Invoice,Invoice Number,બીલ નંબર
 apps/erpnext/erpnext/hooks.py +55,Orders,ઓર્ડર્સ
@@ -2308,7 +2317,7 @@
 DocType: Appraisal,Appraisal,મૂલ્યાંકન
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,તારીખ પુનરાવર્તન કરવામાં આવે છે
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,અધિકૃત હસ્તાક્ષર
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},એક હોવો જ જોઈએ સાક્ષી છોડો {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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,પ્રારંભ સમય
@@ -2477,7 +2486,7 @@
 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 +733,Show tax break-up,બતાવો કર બ્રેક અપ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,બતાવો કર બ્રેક અપ
 apps/erpnext/erpnext/accounts/party.py +283,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',તમે ઉત્પાદન પ્રવૃત્તિમાં સમાવેશ છે. સક્રિય કરે છે વસ્તુ &#39;ઉત્પાદિત છે&#39;
@@ -2526,7 +2535,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,ફરીથી લખો કંપની નામ ખાતરી કરવા માટે કરો
@@ -2553,8 +2562,6 @@
 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,જોડાયા જન્મ તારીખ તારીખ કરતાં મોટી હોવી જ જોઈએ
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,પગાર માળખું
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","મલ્ટીપલ ભાવ નિયમ જ માપદંડ સાથે જ અસ્તિત્વમાં છે, અગ્રતા સોંપવા દ્વારા \ તકરાર ઉકેલવા વિનંતી. ભાવ નિયમો: {0}"
 DocType: Account,Bank,બેન્ક
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,એરલાઇન
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,ઇશ્યૂ સામગ્રી
@@ -2579,7 +2586,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,સિક્યોરિટીઝ એન્ડ કોમોડિટી એક્સચેન્જો
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',વેરિએન્ટ માટે માપવા એકમ મૂળભૂત &#39;{0}&#39; નમૂનો તરીકે જ હોવી જોઈએ &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',વેરિએન્ટ માટે માપવા એકમ મૂળભૂત &#39;{0}&#39; નમૂનો તરીકે જ હોવી જોઈએ &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,પર આધારિત ગણતરી
 DocType: Delivery Note Item,From Warehouse,વેરહાઉસ માંથી
 DocType: Purchase Taxes and Charges,Valuation and Total,મૂલ્યાંકન અને કુલ
@@ -2588,7 +2595,7 @@
 DocType: Account,Purchase User,ખરીદી વપરાશકર્તા
 DocType: Notification Control,Customize the Notification,સૂચન કસ્ટમાઇઝ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,કામગીરી માંથી રોકડ પ્રવાહ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,મૂળભૂત સરનામું ઢાંચો કાઢી શકાતી નથી
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,મૂળભૂત સરનામું ઢાંચો કાઢી શકાતી નથી
 DocType: Sales Invoice,Shipping Rule,શીપીંગ નિયમ
 DocType: Manufacturer,Limited to 12 characters,12 અક્ષરો સુધી મર્યાદિત
 DocType: Journal Entry,Print Heading,પ્રિંટ મથાળું
@@ -2681,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,પ્રોજેક્ટ મુજબના માહિતી અવતરણ માટે ઉપલબ્ધ નથી
 DocType: Project,Expected End Date,અપેક્ષિત ઓવરને તારીખ
 DocType: Appraisal Template,Appraisal Template Title,મૂલ્યાંકન ઢાંચો શીર્ષક
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,કોમર્શિયલ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,ઓસમ સેવાઓ
@@ -2700,7 +2707,7 @@
 DocType: Customer,Default Receivable Accounts,એકાઉન્ટ્સ પ્રાપ્ત મૂળભૂત
 DocType: Tax Rule,Billing State,બિલિંગ રાજ્ય
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,ટ્રાન્સફર
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),(પેટા-સ્થળોના સહિત) ફેલાય છે BOM મેળવો
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),(પેટા-સ્થળોના સહિત) ફેલાય છે BOM મેળવો
 DocType: Authorization Rule,Applicable To (Employee),લાગુ કરો (કર્મચારી)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,કારણે તારીખ ફરજિયાત છે
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,લક્ષણ માટે વૃદ્ધિ {0} 0 ન હોઈ શકે
@@ -2733,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,નકારાત્મક મૂલ્યાંકન દર મંજૂરી નથી
 DocType: Holiday List,Weekly Off,અઠવાડિક બંધ
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","દા.ત. 2012, 2012-13 માટે"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),કામચલાઉ નફો / નુકશાન (ક્રેડિટ)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),કામચલાઉ નફો / નુકશાન (ક્રેડિટ)
 DocType: Sales Invoice,Return Against Sales Invoice,સામે સેલ્સ ભરતિયું પાછા ફરો
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,આઇટમ 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},કંપની મૂળભૂત કિંમત {0} સુયોજિત કરો {1}
@@ -2764,6 +2771,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,બાળ ઉમેરો
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,ભૂમિકા ફ્રોઝન એકાઉન્ટ્સ &amp; સંપાદિત કરો ફ્રોઝન પ્રવેશો સેટ કરવાની મંજૂરી
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"તે બાળક ગાંઠો છે, કારણ કે ખાતાવહી ખર્ચ કેન્દ્ર કન્વર્ટ કરી શકતા નથી"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,ખુલી ભાવ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,સીરીયલ #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,સેલ્સ પર કમિશન
 DocType: Offer Letter Term,Value / Description,ભાવ / વર્ણન
@@ -2797,7 +2805,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,સફળતાપૂર્વક આ કંપની સંબંધિત તમામ વ્યવહારો કાઢી!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,તારીખના રોજ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,પ્રોબેશન
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,મૂળભૂત વેરહાઉસ સ્ટોક વસ્તુ માટે ફરજિયાત છે.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},મહિના માટે પગાર ચુકવણી {0} અને વર્ષ {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ઓટો સામેલ ભાવ યાદી દર ગુમ તો
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,કુલ ભરપાઈ રકમ
@@ -2833,7 +2840,7 @@
 DocType: Payment Tool,Set Matching Amounts,સેટ મેચિંગ માત્રામાં
 DocType: Purchase Invoice,Taxes and Charges Added,કર અને ખર્ચ ઉમેર્યું
 ,Sales Funnel,વેચાણ નાળચું
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,સંક્ષેપનો ફરજિયાત છે
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,સંક્ષેપનો ફરજિયાત છે
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,અમારી સુધારાઓ ઉમેદવારી નોંધાવવા માં તમારા રસ માટે આભાર
 ,Qty to Transfer,પરિવહન માટે Qty
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,દોરી જાય છે અથવા ગ્રાહકો માટે ખર્ચ.
@@ -2861,7 +2868,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,પુરવઠોકર્તા અવતરણ
 DocType: Quotation,In Words will be visible once you save the Quotation.,તમે આ અવતરણ સેવ વાર શબ્દો દૃશ્યમાન થશે.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} બંધ છે
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},બારકોડ {0} પહેલાથી જ વસ્તુ ઉપયોગ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,આવનારી પ્રવૃત્તિઓ
@@ -2883,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,ફિસ્કલ વર્ષ પસંદ કરો ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS પ્રોફાઇલ POS એન્ટ્રી બનાવવા માટે જરૂરી
 DocType: Hub Settings,Name Token,નામ ટોકન
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,ધોરણ વેચાણ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,ધોરણ વેચાણ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,ઓછામાં ઓછા એક વખાર ફરજિયાત છે
 DocType: Serial No,Out of Warranty,વોરંટી બહાર
 DocType: BOM Replace Tool,Replace,બદલો
@@ -3006,7 +3013,7 @@
 DocType: Sales Invoice,Paid Amount,ચૂકવેલ રકમ
 ,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,અન્ય કોઈ મૂળભૂત છે કારણ કે ત્યાં મૂળભૂત તરીકે આ સરનામું ઢાંચો સુયોજિત કરી રહ્યા છે
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,અન્ય કોઈ મૂળભૂત છે કારણ કે ત્યાં મૂળભૂત તરીકે આ સરનામું ઢાંચો સુયોજિત કરી રહ્યા છે
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","પહેલેથી જ ડેબિટ એકાઉન્ટ બેલેન્સ, તમે ક્રેડિટ &#39;તરીકે&#39; બેલેન્સ હોવું જોઈએ &#39;સુયોજિત કરવા માટે માન્ય નથી"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,ક્વોલિટી મેનેજમેન્ટ
 DocType: Production Planning Tool,Filter based on customer,ફિલ્ટર ગ્રાહક પર આધારિત
@@ -3107,7 +3114,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",મૂળભૂત તરીકે ચાલુ નાણાકીય વર્ષના સુયોજિત કરવા માટે &#39;મૂળભૂત તરીકે સેટ કરો&#39; પર ક્લિક કરો
 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 +19,Shortage Qty,અછત Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,વસ્તુ ચલ {0} જ લક્ષણો સાથે હાજર
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,વસ્તુ ચલ {0} જ લક્ષણો સાથે હાજર
 DocType: Salary Slip,Salary Slip,પગાર કાપલી
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;તારીખ કરવા માટે&#39; જરૂરી છે
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","પેકેજો પહોંચાડી શકાય માટે સ્લિપ પેકિંગ બનાવો. પેકેજ નંબર, પેકેજ સમાવિષ્ટો અને તેનું વજન સૂચિત કરવા માટે વપરાય છે."
@@ -3118,7 +3125,7 @@
 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.","આ ચકાસાયેલ વ્યવહારો કોઈપણ &quot;સબમિટ&quot; કરવામાં આવે છે, એક ઇમેઇલ પોપ અપ આપોઆપ જોડાણ તરીકે સોદા સાથે, કે વ્યવહાર માં સંકળાયેલ &quot;સંપર્ક&quot; માટે એક ઇમેઇલ મોકલવા માટે ખોલવામાં આવી હતી. વપરાશકર્તા શકે છે અથવા ઇમેઇલ મોકલી શકે છે."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,વૈશ્વિક સેટિંગ્સ
 DocType: Employee Education,Employee Education,કર્મચારીનું શિક્ષણ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,તે વસ્તુ વિગતો મેળવવા માટે જરૂરી છે.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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} પહેલાથી જ પ્રાપ્ત કરવામાં આવ્યો છે
@@ -3144,6 +3151,7 @@
 DocType: BOM,Manufacturing User,ઉત્પાદન વપરાશકર્તા
 DocType: Purchase Order,Raw Materials Supplied,કાચો માલ પાડેલ
 DocType: Purchase Invoice,Recurring Print Format,રીકરીંગ પ્રિન્ટ ફોર્મેટ
+DocType: C-Form,Series,સિરીઝ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,અપેક્ષિત બોલ તારીખ ખરીદી ઓર્ડર તારીખ પહેલાં ન હોઈ શકે
 DocType: Appraisal,Appraisal Template,મૂલ્યાંકન ઢાંચો
 DocType: Item Group,Item Classification,વસ્તુ વર્ગીકરણ
@@ -3219,7 +3227,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},રો {0}: એક પુનઃક્રમાંકિત કરો પ્રવેશ પહેલેથી જ આ વેરહાઉસ માટે અસ્તિત્વમાં {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.","અવતરણ કરવામાં આવી છે, કારણ કે લોસ્ટ જાહેર કરી શકતા નથી."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ખરીદી માસ્ટર વ્યવસ્થાપક
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,ઓર્ડર {0} સબમિટ હોવું જ જોઈએ ઉત્પાદન
@@ -3227,7 +3235,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,મુખ્ય અહેવાલો
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,તારીખ કરવા માટે તારીખથી પહેલાં ન હોઈ શકે
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc Doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,/ સંપાદિત કરો ભાવમાં ઉમેરો
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,મારા ઓર્ડર
@@ -3275,7 +3283,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},ROW # {0}: આઇટમ માટે સેટ પુરવઠોકર્તા {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,વસ્તુ {1} સાથે જોડાયેલ વેબસાઇટ છબી {0} શોધી શકાતી નથી
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,વસ્તુ {1} સાથે જોડાયેલ વેબસાઇટ છબી {0} શોધી શકાતી નથી
 DocType: Issue,Content Type,સામગ્રી પ્રકાર
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,કમ્પ્યુટર
 DocType: Item,List this Item in multiple groups on the website.,આ વેબસાઇટ પર બહુવિધ જૂથો આ આઇટમ યાદી.
@@ -3289,7 +3297,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,&#39;હા&#39; હોઈ નોન-સ્ટોક આઇટમ માટે નથી કરી શકો છો &#39;સીરિયલ કોઈ છે&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,&#39;હા&#39; હોઈ નોન-સ્ટોક આઇટમ માટે નથી કરી શકો છો &#39;સીરિયલ કોઈ છે&#39;
 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,એકાઉન્ટ હેડ
@@ -3315,7 +3323,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,એકાઉન્ટ {0} બંધ પ્રકાર જવાબદારી / ઈક્વિટી હોવું જ જોઈએ
 DocType: Authorization Rule,Based On,પર આધારિત
 DocType: Sales Order Item,Ordered Qty,આદેશ આપ્યો Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,વસ્તુ {0} અક્ષમ છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,વસ્તુ {0} અક્ષમ છે
 DocType: Stock Settings,Stock Frozen Upto,સ્ટોક ફ્રોઝન સુધી
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},પ્રતિ અને સમય રિકરિંગ માટે ફરજિયાત તારીખો પીરિયડ {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,પ્રોજેક્ટ પ્રવૃત્તિ / કાર્ય.
@@ -3323,7 +3331,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","માટે લાગુ તરીકે પસંદ કરેલ છે તે ખરીદી, ચકાસાયેલ જ હોવું જોઈએ {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ડિસ્કાઉન્ટ કરતાં ઓછી 100 હોવી જ જોઈએ
 DocType: Purchase Invoice,Write Off Amount (Company Currency),રકમ માંડવાળ (કંપની ચલણ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,ROW # {0}: પુનઃક્રમાંકિત કરો જથ્થો સુયોજિત કરો
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,ROW # {0}: પુનઃક્રમાંકિત કરો જથ્થો સુયોજિત કરો
 DocType: Landed Cost Voucher,Landed Cost Voucher,ઉતારેલ માલની કિંમત વાઉચર
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},સેટ કરો {0}
 DocType: Purchase Invoice,Repeat on Day of Month,મહિનાનો દિવસ પર પુનરાવર્તન
@@ -3395,7 +3403,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,હવે જુઓ
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"ભરતિયું આપોઆપ પેદા કરવામાં આવશે, જ્યારે આ સમયગાળા પસંદ કરો"
 DocType: BOM,Raw Material Cost,કાચો સામગ્રી ખર્ચ
-DocType: Item,Re-Order Level,ફરીથી ઓર્ડર સ્તર
+DocType: Item Reorder,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 દાખલ કરો.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,ભાગ સમય
 DocType: Employee,Applicable Holiday List,લાગુ રજા યાદી
@@ -3450,7 +3458,7 @@
 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 +573,Please specify Attribute Value for attribute {0},લક્ષણ માટે લક્ષણની કિંમત સ્પષ્ટ કરો {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3529,7 +3537,7 @@
 DocType: Address,Office,ઓફિસ
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,હિસાબી જર્નલ પ્રવેશો.
 DocType: Delivery Note Item,Available Qty at From Warehouse,વેરહાઉસ માંથી ઉપલબ્ધ Qty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,પ્રથમ કર્મચારી રેકોર્ડ પસંદ કરો.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,પ્રથમ કર્મચારી રેકોર્ડ પસંદ કરો.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,ખર્ચ એકાઉન્ટ દાખલ કરો
@@ -3604,7 +3612,7 @@
 DocType: Item Attribute,Numeric Values,આંકડાકીય મૂલ્યો
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,લોગો જોડો
 DocType: Customer,Commission Rate,કમિશન દર
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,વેરિએન્ટ બનાવો
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,વેરિએન્ટ બનાવો
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,વિભાગ દ્વારા બ્લોક છોડી કાર્યક્રમો.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,કાર્ટ ખાલી છે
 DocType: Production Order,Actual Operating Cost,વાસ્તવિક ઓપરેટિંગ ખર્ચ
@@ -3621,15 +3629,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item","પુનઃક્રમાંકિત કરો સ્તર સુયોજિત કરવા માટે, આઇટમ ખરીદી વસ્તુ અથવા ઉત્પાદન વસ્તુ જ હોવી જોઈએ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),(અડધા દિવસ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(અડધા દિવસ)
 DocType: Supplier,Credit Days,ક્રેડિટ દિવસો
 DocType: Leave Type,Is Carry Forward,આગળ લઈ છે
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,BOM થી વસ્તુઓ વિચાર
diff --git a/erpnext/translations/he.csv b/erpnext/translations/he.csv
index aa9ab92..9fb6cd0 100644
--- a/erpnext/translations/he.csv
+++ b/erpnext/translations/he.csv
@@ -33,6 +33,7 @@
 DocType: Purchase Order,% Billed,% שחויבו
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),שער החליפין חייב להיות זהה {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,שם לקוח
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},חשבון בנק לא יכול להיות שם בתור {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),יוצא מן הכלל עבור {0} אינם יכולים להיות פחות מאפס ({1})
@@ -46,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,החדש Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,החדש Leave Application
 apps/erpnext/erpnext/setup/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,מצב של חשבון תשלומים
@@ -81,8 +82,10 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","יומן של פעילויות המבוצע על ידי משתמשים מפני משימות שיכולים לשמש למעקב זמן, חיוב."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},חדש {0}: # {1}
 ,Sales Partners Commission,ועדת שותפי מכירות
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,קיצור לא יכול להיות יותר מ 5 תווים
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,קיצור לא יכול להיות יותר מ 5 תווים
 DocType: Payment Request,Payment Request,בקשת תשלום
+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.",תכונה ערך {0} לא ניתן להסיר מ- {1} כפריט נוסחים \ להתקיים עם תכונה זו.
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,זהו חשבון שורש ולא ניתן לערוך.
 DocType: BOM,Operations,פעולות
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},לא ניתן להגדיר הרשאות על בסיס הנחה עבור {0}
@@ -126,6 +129,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},מ {0} {1}
 DocType: Item,Copy From Item Group,העתק מ קבוצת פריט
 DocType: Journal Entry,Opening Entry,כניסת פתיחה
 DocType: Stock Entry,Additional Costs,עלויות נוספות
@@ -191,6 +195,7 @@
 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 (%),הנחה על מחיר מחירון שיעור (%)
 DocType: Offer Letter,Select Terms and Conditions,תנאים והגבלות בחרו
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,ערך מתוך
 DocType: Production Planning Tool,Sales Orders,הזמנות ומכירות
 DocType: Purchase Taxes and Charges,Valuation,הערכת שווי
 ,Purchase Order Trends,לרכוש מגמות להזמין
@@ -203,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,טלוויזיה
 DocType: Production Order Operation,Updated via 'Time Log',"עדכון באמצעות 'יומן זמן """
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},חשבון {0} אינו שייך לחברת {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},הסכום מראש לא יכול להיות גדול מ {0} {1}
 DocType: Naming Series,Series List for this Transaction,רשימת סדרות לעסקה זו
 DocType: Sales Invoice,Is Opening Entry,האם פתיחת כניסה
 DocType: Customer Group,Mention if non-standard receivable account applicable,להזכיר אם ישים חשבון חייבים שאינם סטנדרטי
@@ -222,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,יוצר תלוש משכורת לקריטריונים שהוזכרו לעיל.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,אין תיאור נתון
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,בקש לרכישה.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,רק המאשר Leave נבחר יכול להגיש בקשה זו החופשה
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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} באמצעות התקנה&gt; הגדרות&gt; סדרת Naming
@@ -231,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},מחסן {0} אינו שייך לחברת {1}
 DocType: Item Website Specification,Item Website Specification,מפרט אתר פריט
 DocType: Payment Tool,Reference No,אסמכתא
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,השאר חסימה
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,השאר חסימה
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,שנתי
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,פריט במלאי פיוס
 DocType: Stock Entry,Sales Invoice No,מכירות חשבונית לא
@@ -244,7 +250,7 @@
 DocType: Pricing Rule,Supplier Type,סוג ספק
 DocType: Item,Publish in Hub,פרסם בHub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,פריט {0} יבוטל
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,פריט {0} יבוטל
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,בקשת חומר
 DocType: Bank Reconciliation,Update Clearance Date,תאריך שחרור עדכון
 DocType: Item,Purchase Details,פרטי רכישה
@@ -292,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,תעודת משלוח
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,הגדרת מסים
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,כניסת תשלום השתנתה לאחר שמשכת אותו. אנא למשוך אותו שוב.
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} נכנס פעמיים במס פריט
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,אנא בחר חודש והשנה
@@ -319,10 +325,11 @@
 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 +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 +215,Please see attachment,אנא ראה קובץ מצורף
 DocType: Purchase Order,% Received,% התקבל
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,התקנה כבר מלא !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,התקנה כבר מלא !!
 ,Finished Goods,מוצרים מוגמרים
 DocType: Delivery Note,Instructions,הוראות
 DocType: Quality Inspection,Inspected By,נבדק על ידי
@@ -347,14 +354,13 @@
 ,Purchase Register,רכישת הרשמה
 DocType: Landed Cost Item,Applicable Charges,חיובים החלים
 DocType: Workstation,Consumable Cost,עלות מתכלה
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) חייב להיות תפקיד ""Leave מאשר '"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) חייב להיות תפקיד ""Leave מאשר '"
 DocType: Purchase Receipt,Vehicle Date,תאריך רכב
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,רפואי
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,סיבה לאיבוד
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},תחנת עבודה סגורה בתאריכים הבאים בהתאם לרשימת Holiday: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,הזדמנויות
 DocType: Employee,Single,אחת
-DocType: Issue,Attachment,קובץ מצורף
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,לא ניתן להגדיר תקציב עבור מרכז עלות הקבוצה
 DocType: Account,Cost of Goods Sold,עלות מכר
 DocType: Purchase Invoice,Yearly,שנתי
@@ -383,7 +389,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,תכונה {0} נבחר מספר פעמים בטבלה תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,תכונה {0} נבחר מספר פעמים בטבלה תכונות
 DocType: HR Settings,Employee record is created using selected field. ,שיא עובד שנוצר באמצעות שדה שנבחר.
 DocType: Sales Order,Not Applicable,לא ישים
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,אב חג.
@@ -422,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,קוסמטיקה
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items","למזג, המאפיינים הבאים חייבים להיות זהים בשני הפריטים"
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","למזג, המאפיינים הבאים חייבים להיות זהים בשני הפריטים"
 DocType: Shipping Rule,Net Weight,משקל נטו
 DocType: Employee,Emergency Phone,טל 'חירום
 ,Serial No Warranty Expiry,Serial No תפוגה אחריות
@@ -433,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,קבלנות משנה ניהול
 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,קצב שבו רשימת מחיר המטבע מומר למטבע הבסיס של החברה
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},חשבון {0} אינו שייך לחברה: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},חשבון {0} אינו שייך לחברה: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,קיצור כבר בשימוש עבור חברה אחרת
 DocType: Selling Settings,Default Customer Group,קבוצת לקוחות המוגדרת כברירת מחדל
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","אם להשבית, השדה 'מעוגל סה""כ' לא יהיה גלוי בכל עסקה"
 DocType: BOM,Operating Cost,עלות הפעלה
@@ -466,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,לא נמצא רשומות בטבלת החשבונית
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,אנא בחר סוג החברה והמפלגה ראשון
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,כספי לשנה / חשבונאות.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,ערכים מצטברים
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","מצטער, לא ניתן למזג מס סידורי"
 DocType: Project Task,Project Task,פרויקט משימה
 ,Lead Id,זיהוי עופרת
@@ -487,7 +495,7 @@
 DocType: Quotation,Quotation To,הצעת מחיר ל
 DocType: Lead,Middle Income,הכנסה התיכונה
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),פתיחה (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"ברירת מחדל של יחידת מדידה לפריט {0} לא ניתן לשנות באופן ישיר, כי כבר עשו כמה עסקה (ים) עם יחידת מידה אחרת. יהיה עליך ליצור פריט חדש לשימוש יחידת מידת ברירת מחדל שונה."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"ברירת מחדל של יחידת מדידה לפריט {0} לא ניתן לשנות באופן ישיר, כי כבר עשו כמה עסקה (ים) עם יחידת מידה אחרת. יהיה עליך ליצור פריט חדש לשימוש יחידת מידת ברירת מחדל שונה."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,סכום שהוקצה אינו יכול להיות שלילי
 DocType: Purchase Order Item,Billed Amt,Amt שחויב
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,מחסן לוגי שנגדו מרשמו רשומות מלאי
@@ -496,6 +504,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +212,Production Order is Mandatory,ייצור להזמין מנדטורי
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,כתיבת הצעה
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,אדם אחר מכירות {0} קיים עם אותו זיהוי העובד
+apps/erpnext/erpnext/stock/stock_ledger.py +338,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},שגיאה במלאי שלילי ({6}) עבור פריט {0} ב מחסן {1} על {2} {3} {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,שנת כספי חברה
 DocType: Packing Slip Item,DN Detail,פרט DN
 DocType: Time Log,Billed,מחויב
@@ -564,7 +573,7 @@
 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 +543,Item has variants.,יש פריט גרסאות.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,סוג העץ
@@ -577,6 +586,7 @@
 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 +33,Goods received from Suppliers.,מוצרים שהתקבלו מספקים.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,ערך
 DocType: Lead,Campaign Name,שם מסע פרסום
 ,Reserved,שמורות
 DocType: Purchase Order,Supply Raw Materials,חומרי גלם אספקה
@@ -591,15 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,חשבון עם עסקה הקיימת לא ניתן להמיר לדג'ר
 DocType: Delivery Note,Customer's Purchase Order No,להזמין ללא הרכישה של הלקוח
 DocType: Employee,Cell Number,מספר סלולארי
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,בקשות אוטומטיות חומר שנוצרו
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,בקשות אוטומטיות חומר שנוצרו
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,איבדתי
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,אתה לא יכול להיכנס לשובר נוכחי ב'נגד תנועת יומן 'טור
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,אנרגיה
 DocType: Opportunity,Opportunity From,הזדמנות מ
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,הצהרת משכורת חודשית.
 DocType: Item Group,Website Specifications,מפרט אתר
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},יש שגיאת תבנית הכתובת שלך {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,חשבון חדש
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: החל מ- {0} מסוג {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,שורת {0}: המרת פקטור הוא חובה
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","חוקי מחיר מרובים קיימים עם אותם הקריטריונים, בבקשה לפתור את סכסוך על ידי הקצאת עדיפות. חוקי מחיר: {0}"
 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.,רישומים חשבונאיים יכולים להתבצע נגד צמתים עלה. ערכים נגד קבוצות אינם מורשים.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,לא יכול לבטל או לבטל BOM כפי שהוא מקושר עם עצי מוצר אחרים
 DocType: Opportunity,Maintenance,תחזוקה
@@ -642,7 +655,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,מחיר המחירון לא נבחר
 DocType: Employee,Family Background,רקע משפחתי
 DocType: Process Payroll,Send Email,שלח אי-מייל
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},אזהרה: קובץ מצורף לא חוקי {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},אזהרה: קובץ מצורף לא חוקי {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,אין אישור
 DocType: Company,Default Bank Account,חשבון בנק ברירת מחדל
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","כדי לסנן מבוסס על המפלגה, מפלגה בחר את הסוג ראשון"
@@ -672,13 +685,13 @@
 DocType: Production Planning Tool,Select Items,פריטים בחרו
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} נגד ביל {1} יום {2}
 DocType: Maintenance Visit,Completion Status,סטטוס השלמה
-DocType: Sales Invoice Item,Target Warehouse,יעד מחסן
+DocType: Production Order,Target Warehouse,יעד מחסן
 DocType: Item,Allow over delivery or receipt upto this percent,לאפשר על משלוח או קבלת upto אחוזים זה
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,תאריך אספקה צפוי לא יכול להיות לפני תאריך הזמנת המכירות
 DocType: Upload Attendance,Import Attendance,נוכחות יבוא
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,בכל קבוצות הפריט
 DocType: Process Payroll,Activity Log,יומן פעילות
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,רווח נקי / הפסד
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,רווח נקי / הפסד
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,באופן אוטומטי לחבר את ההודעה על הגשת עסקות.
 DocType: Production Order,Item To Manufacture,פריט לייצור
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} המצב הוא {2}
@@ -686,7 +699,7 @@
 DocType: Sales Order Item,Projected Qty,כמות חזויה
 DocType: Sales Invoice,Payment Due Date,מועד תשלום
 DocType: Newsletter,Newsletter Manager,מנהל עלון
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,פריט Variant {0} כבר קיים עימן תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,פריט Variant {0} כבר קיים עימן תכונות
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;פתיחה&quot;
 DocType: Notification Control,Delivery Note Message,מסר תעודת משלוח
 DocType: Expense Claim,Expenses,הוצאות
@@ -696,7 +709,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,מחקר ופיתוח
 ,Amount to Bill,הסכום להצעת החוק
 DocType: Company,Registration Details,פרטי רישום
-DocType: Item,Re-Order Qty,Re-להזמין כמות
+DocType: Item Reorder,Re-Order Qty,Re-להזמין כמות
 DocType: Leave Block List Date,Leave Block List Date,השאר תאריך בלוק רשימה
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},מתוכנן לשלוח {0}
 DocType: Pricing Rule,Price or Discount,מחיר או הנחה
@@ -739,7 +752,7 @@
 DocType: Bank Reconciliation,Total Amount,"סה""כ לתשלום"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,הוצאה לאור באינטרנט
 DocType: Production Planning Tool,Production Orders,הזמנות ייצור
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,ערך איזון
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,ערך איזון
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,מחיר מחירון מכירות
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,לפרסם לסנכרן פריטים
 DocType: Bank Reconciliation,Account Currency,מטבע חשבון
@@ -748,7 +761,7 @@
 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 +538,Item Variants {0} updated,פריט גרסאות {0} מעודכן
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,פריט גרסאות {0} מעודכן
 DocType: Quality Inspection Reading,Reading 6,קריאת 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,לרכוש חשבונית מראש
 DocType: Address,Shop,חנות
@@ -825,7 +838,7 @@
 DocType: POS Profile,Cash/Bank Account,מזומנים / חשבון בנק
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,פריטים הוסרו ללא שינוי בכמות או ערך.
 DocType: Delivery Note,Delivery To,משלוח ל
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,שולחן תכונה הוא חובה
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,דיסקונט
@@ -853,7 +866,7 @@
 DocType: Tax Rule,Shipping State,מדינת משלוח
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"פריט יש להוסיף באמצעות 'לקבל פריטים מרכישת קבלות ""כפתור"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,הוצאות מכירה
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,קנייה סטנדרטית
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,קנייה סטנדרטית
 DocType: GL Entry,Against,נגד
 DocType: Item,Default Selling Cost Center,מרכז עלות מכירת ברירת מחדל
 DocType: Sales Partner,Implementation Partner,שותף יישום
@@ -895,7 +908,7 @@
 DocType: Sales Partner,Distributor,מפיץ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,כלל משלוח סל קניות
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,ייצור להזמין {0} יש לבטל לפני ביטול הזמנת מכירות זה
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',אנא הגדר &#39;החל הנחה נוספות ב&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',אנא הגדר &#39;החל הנחה נוספות ב&#39;
 ,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.,בחר יומני זמן ושלח ליצור חשבונית מכירות חדשה.
@@ -963,9 +976,9 @@
 DocType: Contact,User ID,זיהוי משתמש
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,צפה לדג'ר
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,המוקדם
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group","קבוצת פריט קיימת עם אותו שם, בבקשה לשנות את שם הפריט או לשנות את שם קבוצת הפריט"
 DocType: Production Order,Manufacture against Sales Order,ייצור נגד להזמין מכירות
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,שאר העולם
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,חבילת גרוס
@@ -995,7 +1008,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","מצטער, לא ניתן למזג חברות"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","מצטער, לא ניתן למזג חברות"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,קטן
 DocType: Employee,Employee Number,מספר עובדים
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},מקרה לא (ים) כבר בשימוש. נסה מקייס לא {0}
@@ -1014,7 +1027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,חקלאות
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,המוצרים או השירותים שלך
 DocType: Mode of Payment,Mode of Payment,מצב של תשלום
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,תמונה: אתר אינטרנט צריכה להיות קובץ ציבורי או כתובת אתר אינטרנט
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,תמונה: אתר אינטרנט צריכה להיות קובץ ציבורי או כתובת אתר אינטרנט
 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,מחסן פרטים ליצירת קשר
@@ -1086,9 +1099,11 @@
 DocType: Address,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,חשבונאות
 DocType: Features Setup,Features Setup,הגדרת תכונות
+DocType: Item,Is Service Item,האם פריט השירות
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,תקופת יישום לא יכולה להיות תקופה הקצאת חופשה מחוץ
 DocType: Activity Cost,Projects,פרויקטים
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,אנא בחר שנת כספים
+apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},מ {0} | {1} {2}
 DocType: BOM Operation,Operation Description,תיאור מבצע
 DocType: Item,Will also apply to variants,יחול גם על גרסאות
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,לא ניתן לשנות את תאריך שנת הכספים התחלה ותאריך סיום שנת כספים אחת לשנת הכספים נשמרה.
@@ -1115,7 +1130,7 @@
 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 +465,cannot be greater than 100,לא יכול להיות גדול מ 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
 DocType: Maintenance Visit,Unscheduled,לא מתוכנן
 DocType: Employee,Owned,בבעלות
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,תלוי בחופשה ללא תשלום
@@ -1174,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,ממשלה
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,גרסאות פריט
 DocType: Company,Services,שירותים
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),"סה""כ ({0})"
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),"סה""כ ({0})"
 DocType: Cost Center,Parent Cost Center,מרכז עלות הורה
 DocType: Sales Invoice,Source,מקור
 DocType: Leave Type,Is Leave Without Pay,האם חופשה ללא תשלום
@@ -1223,6 +1238,7 @@
 DocType: Pricing Rule,Pricing Rule,כלל תמחור
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,בקשת חומר להזמנת רכש
 DocType: Payment Gateway Account,Payment Success URL,כתובת הצלחה תשלום
+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,שם עופרת
@@ -1230,6 +1246,7 @@
 apps/erpnext/erpnext/config/stock.py +268,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 +336,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 +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 +542,Manufacturing Quantity is mandatory,כמות ייצור היא תנאי הכרחית
@@ -1245,17 +1262,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,שלח שוב דוא&quot;ל תשלום
 DocType: Dependent Task,Dependent Task,משימה תלויה
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},Leave מסוג {0} אינו יכול להיות ארוך מ- {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,Leave of type {0} cannot be longer than {1},Leave מסוג {0} אינו יכול להיות ארוך מ- {1}
 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,כמות הנצרכת
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} צפה
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,שינוי נטו במזומנים
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,שינוי נטו במזומנים
 DocType: Salary Structure Deduction,Salary Structure Deduction,ניכוי שכר מבנה
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,יחידת מידת {0} כבר נכנסה יותר מפעם אחת בהמרת פקטור טבלה
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,יחידת מידת {0} כבר נכנסה יותר מפעם אחת בהמרת פקטור טבלה
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},בקשת תשלום כבר קיימת {0}
 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 +182,Quantity must not be more than {0},כמות לא חייבת להיות יותר מ {0}
@@ -1317,7 +1334,7 @@
 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: Packed Item,To Warehouse (Optional),למחסן (אופציונאלי)
 DocType: Sales Invoice,Paid Amount (Company Currency),הסכום ששולם (חברת מטבע)
 DocType: Purchase Invoice,Additional Discount,הנחה נוסף
 DocType: Selling Settings,Selling Settings,מכירת הגדרות
@@ -1326,7 +1343,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","חברה, חודש ושנת כספים הוא חובה"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,הוצאות שיווק
 ,Item Shortage Report,דווח מחסור פריט
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","המשקל מוזכר, \ n להזכיר ""משקל של אוני 'מישגן"" מדי"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","המשקל מוזכר, \ n להזכיר ""משקל של אוני 'מישגן"" מדי"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,בקשת חומר המשמשת לייצור Stock רשומת זו
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,יחידה אחת של פריט.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',זמן יומן אצווה {0} חייב להיות 'הוגש'
@@ -1337,6 +1354,7 @@
 DocType: Employee,Date Of Retirement,מועד הפרישה
 DocType: Upload Attendance,Get Template,קבל תבנית
 DocType: Address,Postal,דואר
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext ההתקנה הושלמה!
 DocType: Item,Weightage,Weightage
 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,"קבוצת לקוחות קיימת עם אותו שם, בבקשה לשנות את שם הלקוח או לשנות את שם קבוצת הלקוחות"
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,אנא בחר {0} הראשון.
@@ -1365,12 +1383,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,יותר מדי עמודות. לייצא את הדוח ולהדפיס אותו באמצעות יישום גיליון אלקטרוני.
 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 +139,Main,ראשי
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,ראשי
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,קידומת להגדיר למספור סדרה על העסקות שלך
 DocType: Employee Attendance Tool,Employees HTML,עובד HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,לא ניתן לבטל הזמנה הפסיקה. מגופה כדי לבטל.
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,BOM ברירת המחדל ({0}) חייב להיות פעיל לפריט זה או התבנית שלה
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,גרסאות
@@ -1395,7 +1413,6 @@
 DocType: Sales Order,To Deliver and Bill,לספק וביל
 DocType: GL Entry,Credit Amount in Account Currency,סכום אשראי במטבע חשבון
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,יומני זמן לייצור.
-DocType: Item,Apply Warehouse-wise Reorder Level,החל המחסן-חכמה להזמנה חוזרת רמה
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} יש להגיש
 DocType: Authorization Control,Authorization Control,אישור בקרה
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},# השורה {0}: נדחה מחסן הוא חובה נגד פריט דחה {1}
@@ -1490,8 +1507,10 @@
 DocType: Installation Note,Installation Time,זמן התקנה
 DocType: Sales Invoice,Accounting Details,חשבונאות פרטים
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,מחק את כל העסקאות לחברה זו
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,# השורה {0}: מבצע {1} לא הושלם עבור {2} כמות של מוצרים מוגמרים הפקה שמספרת {3}. עדכן מצב פעולה באמצעות יומני זמן
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,השקעות
 DocType: Issue,Resolution Details,רזולוציה פרטים
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,הקצבות
 DocType: Quality Inspection Reading,Acceptance Criteria,קריטריונים לקבלה
 DocType: Item Attribute,Attribute Name,שם תכונה
 DocType: Item Group,Show In Website,הצג באתר
@@ -1542,7 +1561,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,תביעת חשבון ממתינה לאישור. רק המאשר ההוצאות יכול לעדכן את הסטטוס.
 DocType: Purchase Invoice,Additional Discount Amount,סכום הנחה נוסף
 DocType: Leave Block List Allow,Leave Block List Allow,השאר בלוק רשימה אפשר
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr לא יכול להיות ריק או חלל
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr לא יכול להיות ריק או חלל
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,קבוצה לקבוצה ללא
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ספורט
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,"סה""כ בפועל"
@@ -1566,6 +1585,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},גורם של אוני 'מישגן ההמרה נדרש בשורת {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},תאריך חיסול לא יכול להיות לפני בדיקת תאריך בשורת {0}
 DocType: Salary Slip,Deduction,ניכוי
+apps/erpnext/erpnext/stock/get_item_details.py +242,Item Price added for {0} in Price List {1},מחיר הפריט נוסף עבור {0} ב מחירון {1}
 DocType: Address Template,Address Template,תבנית כתובת
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,נא להזין את עובדי זיהוי של איש מכירות זה
 DocType: Territory,Classification of Customers by region,סיווג של לקוחות מאזור לאזור
@@ -1582,7 +1602,7 @@
 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**.,** שנת כספים ** מייצגת שנת כספים. כל הרישומים החשבונאיים ועסקות גדולות אחרות מתבצעים מעקב נגד שנת כספים ** **.
 DocType: Opportunity,Customer / Lead Address,לקוחות / כתובת עופרת
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},אזהרה: תעודת SSL לא חוקית בקובץ מצורף {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},אזהרה: תעודת SSL לא חוקית בקובץ מצורף {0}
 DocType: Production Order Operation,Actual Operation Time,בפועל מבצע זמן
 DocType: Authorization Rule,Applicable To (User),כדי ישים (משתמש)
 DocType: Purchase Taxes and Charges,Deduct,לנכות
@@ -1731,7 +1751,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,מקרה מס 'לא יכול להיות 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,אם יש לך שותפים לצוות מכירות ומכר (שותפי ערוץ) הם יכולים להיות מתויגים ולשמור על תרומתם בפעילות המכירות
 DocType: Item,Show a slideshow at the top of the page,הצג מצגת בחלק העליון של הדף
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,חנויות
+DocType: Item,"Allow in Sales Order of type ""Service""",אפשר בהזמנת מכירות של &quot;שירות&quot; סוג
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,חנויות
 DocType: Time Log,Projects Manager,מנהל פרויקטים
 DocType: Serial No,Delivery Time,זמן אספקה
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,הזדקנות המבוסס על
@@ -1756,7 +1777,7 @@
 ,Financial Analytics,Analytics הפיננסי
 DocType: Quality Inspection,Verified By,מאומת על ידי
 DocType: Address,Subsidiary,חברת בת
-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.","לא ניתן לשנות את ברירת המחדל של המטבע של החברה, כי יש עסקות קיימות. עסקות יש לבטל לשנות את מטבע ברירת המחדל."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","לא ניתן לשנות את ברירת המחדל של המטבע של החברה, כי יש עסקות קיימות. עסקות יש לבטל לשנות את מטבע ברירת המחדל."
 DocType: Quality Inspection,Purchase Receipt No,קבלת רכישה לא
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,דְמֵי קְדִימָה
 DocType: Process Payroll,Create Salary Slip,צור שכר Slip
@@ -1804,7 +1825,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,חומרי גלם לא יכולים להיות ריקים.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","לא ניתן לעדכן מניות, חשבונית מכילה פריט ירידת משלוח."
 DocType: Newsletter,Test,מבחן
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'","כמו שיש עסקות מלאי קיימות עבור פריט זה, \ אתה לא יכול לשנות את הערכים של &#39;יש מספר סידורי&#39;, &#39;יש אצווה לא&#39;, &#39;האם פריט במלאי &quot;ו-&quot; שיטת הערכה &quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,מהיר יומן
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,אתה לא יכול לשנות את השיעור אם BOM ציינו agianst כל פריט
@@ -1893,7 +1914,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,אנא משלוח הערה ראשון
 DocType: Purchase Invoice,Currency and Price List,מטבע ומחיר מחירון
 DocType: Opportunity,Customer / Lead Name,לקוחות / שם עופרת
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,תאריך חיסול לא הוזכר
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,תאריך חיסול לא הוזכר
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,הפקה
 DocType: Item,Allow Production Order,לאפשר הפקה להזמין
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,{0} שורה: תאריך ההתחלה חייב להיות לפני תאריך הסיום
@@ -1903,7 +1924,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,"צבירה סה""כ"
 DocType: Purchase Receipt,Time at which materials were received,זמן שבו חומרים שהתקבלו
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,הכתובות שלי
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,הכתובות שלי
 DocType: Stock Ledger Entry,Outgoing Rate,דרג יוצא
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,אדון סניף ארגון.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,או
@@ -1972,7 +1993,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,ניהול קבוצת לקוחות עץ.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,שם מרכז העלות חדש
 DocType: Leave Control Panel,Leave Control Panel,השאר לוח הבקרה
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,אין תבנית כתובת ברירת מחדל מצאה. אנא ליצור אחד חדש מהגדרה> הדפסה ומיתוג> תבנית כתובת.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,אין תבנית כתובת ברירת מחדל מצאה. אנא ליצור אחד חדש מהגדרה> הדפסה ומיתוג> תבנית כתובת.
 DocType: Appraisal,HR User,משתמש HR
 DocType: Purchase Invoice,Taxes and Charges Deducted,מסים והיטלים שנוכה
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,נושאים
@@ -1989,7 +2010,7 @@
 ,Sales Browser,דפדפן מכירות
 DocType: Journal Entry,Total Credit,"סה""כ אשראי"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},אזהרה: נוסף {0} # {1} קיימת נגד כניסת מניית {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,מקומי
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,גדול
@@ -2008,7 +2029,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"יכולות להיות מתויגות כל עסקות המכירה מול אנשי מכירות ** ** מרובים, כך שאתה יכול להגדיר ולעקוב אחר מטרות."
 ,S.O. No.,SO מס '
 DocType: Production Order Operation,Make Time Log,הפוך זמן התחבר
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,אנא הגדר כמות הזמנה חוזרת
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},אנא ליצור לקוחות מהעופרת {0}
 DocType: Price List,Applicable for Countries,ישים עבור מדינות
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,מחשבים
@@ -2083,7 +2103,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,קבל ערכים רלוונטיים
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,כניסה לחשבונאות במלאי
 DocType: Sales Invoice,Sales Team1,Team1 מכירות
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,פריט {0} אינו קיים
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,פריט {0} אינו קיים
 DocType: Sales Invoice,Customer Address,כתובת הלקוח
 DocType: Payment Request,Recipient and Message,נמען ומסר
 DocType: Purchase Invoice,Apply Additional Discount On,החל נוסף דיסקונט ב
@@ -2125,7 +2145,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,שערי הערכת שווי
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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,שינוי שם התחבר
@@ -2163,7 +2183,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,נא להזין את הקלת מועד.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,השאר רק יישומים עם מעמד 'מאושר' ניתן להגיש
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,כותרת כתובת היא חובה.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,כותרת כתובת היא חובה.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"הזן את השם של מסע פרסום, אם המקור של החקירה הוא קמפיין"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,מוציאים לאור עיתון
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,בחר שנת כספים
@@ -2187,6 +2207,7 @@
 DocType: UOM,Must be Whole Number,חייב להיות מספר שלם
 DocType: Leave Control Panel,New Leaves Allocated (In Days),עלים חדשים המוקצים (בימים)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,מספר סידורי {0} אינו קיימות
+DocType: Sales Invoice Item,Customer Warehouse (Optional),גלריית לקוחות (אופציונלי)
 DocType: Pricing Rule,Discount Percentage,אחוז הנחה
 DocType: Payment Reconciliation Invoice,Invoice Number,מספר חשבונית
 apps/erpnext/erpnext/hooks.py +55,Orders,הזמנות
@@ -2296,7 +2317,7 @@
 DocType: Appraisal,Appraisal,הערכה
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,התאריך חוזר על עצמו
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,מורשה חתימה
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},השאר מאשר חייב להיות האחד {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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,זמן התחלה
@@ -2379,6 +2400,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,מחסן {0}: החברה היא חובה
 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.",עבור לקבוצה המתאימה (בדרך כלל מקור כספים&gt; התחייבויות שוטפות&gt; מסים וחובות וליצור חשבון חדש (על ידי לחיצה על הוסף לילדים) של &quot;מס&quot; סוג ולעשות להזכיר את שיעור המס.
 ,Payment Period Based On Invoice Date,תקופת תשלום מבוסס בתאריך החשבונית
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},שערי חליפין מטבע חסר עבור {0}
 DocType: Journal Entry,Stock Entry,מניית כניסה
 DocType: Account,Payable,משתלם
 DocType: Salary Slip,Arrear Amount,סכום חוֹב
@@ -2442,6 +2464,7 @@
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},שיעור: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,ניכוי תלוש משכורת
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,בחר צומת קבוצה ראשונה.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},למטרה צריך להיות אחד {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +109,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/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,פורום הקהילה
@@ -2456,13 +2479,14 @@
 DocType: Journal Entry,Write Off,לכתוב את
 DocType: Time Log,Operation ID,מבצע זיהוי
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","משתמש מערכת מזהה (התחברות). אם נקבע, הוא יהפוך לברירת מחדל עבור כל צורות HR."
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: החל מ- {1}
 DocType: Task,depends_on,תלוי ב
 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 +211,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,שם חשבון חדש. הערה: נא לא ליצור חשבונות ללקוחות וספקים
 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 +733,Show tax break-up,התפרקות מס הצג
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,התפרקות מס הצג
 apps/erpnext/erpnext/accounts/party.py +283,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',אם כרוך בפעילות ייצור. מאפשר פריט 'מיוצר'
@@ -2511,7 +2535,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,אנא שם חברה הקלד לאשר
@@ -2538,8 +2562,6 @@
 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,תאריך ההצטרפות חייב להיות גדול מ תאריך לידה
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,שכר מבנה
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","כלל מחיר מרובה קיים באותם קריטריונים, אנא לפתור \ סכסוך על ידי הקצאת עדיפות. כללי מחיר: {0}"
 DocType: Account,Bank,בנק
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,חברת תעופה
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,חומר נושא
@@ -2564,7 +2586,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ניירות ערך ובורסות סחורות
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ברירת מחדל של יחידת מדידה ולריאנט &#39;{0}&#39; חייבת להיות זהה בתבנית &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ברירת מחדל של יחידת מדידה ולריאנט &#39;{0}&#39; חייבת להיות זהה בתבנית &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,חישוב המבוסס על
 DocType: Delivery Note Item,From Warehouse,ממחסן
 DocType: Purchase Taxes and Charges,Valuation and Total,"הערכת שווי וסה""כ"
@@ -2573,7 +2595,7 @@
 DocType: Account,Purchase User,משתמש רכישה
 DocType: Notification Control,Customize the Notification,התאמה אישית של ההודעה
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,תזרים מזומנים מפעילות שוטף
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,תבנית כתובת ברירת מחדל לא ניתן למחוק
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,תבנית כתובת ברירת מחדל לא ניתן למחוק
 DocType: Sales Invoice,Shipping Rule,כלל משלוח
 DocType: Manufacturer,Limited to 12 characters,מוגבל ל -12 תווים
 DocType: Journal Entry,Print Heading,כותרת הדפסה
@@ -2666,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,נתוני פרויקט-חכם אינם זמינים להצעת מחיר
 DocType: Project,Expected End Date,תאריך סיום צפוי
 DocType: Appraisal Template,Appraisal Template Title,הערכת תבנית כותרת
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,מסחרי
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,שירותים מדהים
@@ -2685,7 +2707,7 @@
 DocType: Customer,Default Receivable Accounts,ברירת מחדל חשבונות חייבים
 DocType: Tax Rule,Billing State,מדינת חיוב
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,העברה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),תביא BOM התפוצץ (כולל תת מכלולים)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),תביא BOM התפוצץ (כולל תת מכלולים)
 DocType: Authorization Rule,Applicable To (Employee),כדי ישים (עובד)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,תאריך היעד הוא חובה
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,תוספת לתכונה {0} לא יכולה להיות 0
@@ -2718,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,שערי הערכה שליליים אינו מותר
 DocType: Holiday List,Weekly Off,Off השבועי
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","לדוגמה: 2012, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),רווח / הפסד זמני (אשראי)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),רווח / הפסד זמני (אשראי)
 DocType: Sales Invoice,Return Against Sales Invoice,חזור נגד חשבונית מכירות
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,פריט 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},אנא להגדיר את ערך ברירת מחדל {0} בחברת {1}
@@ -2749,12 +2771,14 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,הוסף לילדים
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,תפקיד רשאי לקבוע קפואים חשבונות ורשומים קפואים עריכה
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,לא ניתן להמיר מרכז עלות לחשבונות שכן יש צמתים ילד
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,ערך פתיחה
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,סידורי #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,עמלה על מכירות
 DocType: Offer Letter Term,Value / Description,ערך / תיאור
 DocType: Tax Rule,Billing Country,ארץ חיוב
 ,Customers Not Buying Since Long Time,לקוחות לא קונים מאז הרבה זמן
 DocType: Production Order,Expected Delivery Date,תאריך אספקה צפוי
+apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,חיוב אשראי לא שווה {0} # {1}. ההבדל הוא {2}.
 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 +191,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,גיל
@@ -2781,7 +2805,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,בהצלחה נמחק כל העסקות הקשורות לחברה זו!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,כבתאריך
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,מבחן
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,מחסן ברירת מחדל הוא חובה עבור פריט המניה.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},תשלום השכר עבור החודש {0} ושנה {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,הכנס אוטומטי שיעור מחירון אם חסר
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,"סכום ששולם סה""כ"
@@ -2817,7 +2840,7 @@
 DocType: Payment Tool,Set Matching Amounts,סכומי התאמת הגדר
 DocType: Purchase Invoice,Taxes and Charges Added,מסים והיטלים נוסף
 ,Sales Funnel,משפך מכירות
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,הקיצור הוא חובה
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,הקיצור הוא חובה
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,תודה לך על התעניינותך במנוי לעדכונים שלנו
 ,Qty to Transfer,כמות להעביר
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,ציטוטים להובלות או לקוחות.
@@ -2845,7 +2868,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,הצעת מחיר של ספק
 DocType: Quotation,In Words will be visible once you save the Quotation.,במילים יהיו גלוי לאחר שתשמרו את הצעת המחיר.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} הוא הפסיק
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},ברקוד {0} כבר השתמש בפריט {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,אירועים קרובים
@@ -2867,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,בחר שנת כספים ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,פרופיל קופה הנדרש כדי להפוך את קופה הכניסה
 DocType: Hub Settings,Name Token,שם אסימון
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,מכירה סטנדרטית
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,מכירה סטנדרטית
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Atleast מחסן אחד הוא חובה
 DocType: Serial No,Out of Warranty,מתוך אחריות
 DocType: BOM Replace Tool,Replace,החלף
@@ -2990,7 +3013,7 @@
 DocType: Sales Invoice,Paid Amount,סכום ששולם
 ,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,הגדרת תבנית כתובת זו כברירת מחדל כפי שאין ברירת מחדל אחרת
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,הגדרת תבנית כתובת זו כברירת מחדל כפי שאין ברירת מחדל אחרת
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","יתרת חשבון כבר בחיוב, שאינך מורשים להגדרה 'יתרה חייבים להיות' כמו 'אשראי'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,ניהול איכות
 DocType: Production Planning Tool,Filter based on customer,מסנן המבוסס על לקוחות
@@ -3000,6 +3023,7 @@
 DocType: Tax Rule,Purchase,רכישה
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,יתרת כמות
 DocType: Item Group,Parent Item Group,קבוצת פריט הורה
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} עבור {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,מרכזי עלות
 apps/erpnext/erpnext/config/stock.py +110,Warehouses.,מחסנים.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,קצב שבו ספק של מטבע מומר למטבע הבסיס של החברה
@@ -3090,7 +3114,7 @@
 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 +19,Shortage Qty,מחסור כמות
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
 DocType: Salary Slip,Salary Slip,שכר Slip
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'עד תאריך' נדרש
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","צור תלושי אריזה עבור חבילות שתימסר. נהג להודיע מספר חבילה, תוכן אריזה והמשקל שלה."
@@ -3101,7 +3125,7 @@
 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 +749,It is needed to fetch Item Details.,הוא צריך את זה כדי להביא פרטי פריט.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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} כבר קיבל
@@ -3127,6 +3151,7 @@
 DocType: BOM,Manufacturing User,משתמש ייצור
 DocType: Purchase Order,Raw Materials Supplied,חומרי גלם הסופק
 DocType: Purchase Invoice,Recurring Print Format,פורמט הדפסה חוזר
+DocType: C-Form,Series,סדרה
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,תאריך אספקה צפוי לא יכול להיות לפני תאריך הזמנת הרכש
 DocType: Appraisal,Appraisal Template,הערכת תבנית
 DocType: Item Group,Item Classification,סיווג פריט
@@ -3202,7 +3227,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},שורת {0}: כניסת סידור מחדש כבר קיימת למחסן זה {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.","לא יכול להכריז על שאבד כ, כי הצעת מחיר כבר עשתה."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,רכישת Master מנהל
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,ייצור להזמין {0} יש להגיש
@@ -3210,7 +3235,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,דוחות עיקריים
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,עד כה לא יכול להיות לפני מהמועד
 DocType: Purchase Receipt Item,Prevdoc DocType,DOCTYPE Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,להוסיף מחירים / עריכה
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,ההזמנות שלי
@@ -3256,8 +3281,9 @@
 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 +150,Row #{0}: Set Supplier for item {1},# השורה {0}: ספק הוגדר לפריט {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,לא ניתן למצוא תמונה באתר האינטרנט {0} המצורף לפריט {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,לא ניתן למצוא תמונה באתר האינטרנט {0} המצורף לפריט {1}
 DocType: Issue,Content Type,סוג תוכן
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,מחשב
 DocType: Item,List this Item in multiple groups on the website.,רשימת פריט זה במספר קבוצות באתר.
@@ -3271,7 +3297,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,"""יש מספר סידורי 'לא יכול להיות' כן 'ללא מוחזק במלאי פריט"
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'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,חשבון ראש
@@ -3282,6 +3308,7 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},זיהוי משתמש לא נקבע לעובדים {0}
 DocType: Stock Entry,Default Source Warehouse,מחסן מקור ברירת מחדל
 DocType: Item,Customer Code,קוד לקוח
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},תזכורת יום הולדת עבור {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,ימים מאז להזמין אחרון
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Balance Sheet account,חיוב החשבון חייב להיות חשבון מאזן
 DocType: Buying Settings,Naming Series,סדרת שמות
@@ -3296,7 +3323,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,סגירת חשבון {0} חייבת להיות אחריות / הון עצמי סוג
 DocType: Authorization Rule,Based On,המבוסס על
 DocType: Sales Order Item,Ordered Qty,כמות הורה
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,פריט {0} הוא נכים
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,פריט {0} הוא נכים
 DocType: Stock Settings,Stock Frozen Upto,המניה קפואה Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},תקופה ומתקופה לתאריכי חובה עבור חוזר {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,פעילות פרויקט / משימה.
@@ -3304,7 +3331,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","קנייה יש לבדוק, אם לישים שנבחרה הוא {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,דיסקונט חייב להיות פחות מ -100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),לכתוב את הסכום (חברת מטבע)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,# השורה {0}: אנא הגדר כמות הזמנה חוזרת
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,# השורה {0}: אנא הגדר כמות הזמנה חוזרת
 DocType: Landed Cost Voucher,Landed Cost Voucher,שובר עלות נחת
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},אנא הגדר {0}
 DocType: Purchase Invoice,Repeat on Day of Month,חזור על פעולה ביום בחודש
@@ -3376,7 +3403,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,צפה עכשיו
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,בחר את התקופה שבה החשבונית תופק באופן אוטומטי
 DocType: BOM,Raw Material Cost,עלות חומרי גלם
-DocType: Item,Re-Order Level,סדר מחדש רמה
+DocType: Item Reorder,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.,הזן פריטים וכמות מתוכננת עבורו ברצון להעלות הזמנות ייצור או להוריד חומרי גלם לניתוח.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,במשרה חלקית
 DocType: Employee,Applicable Holiday List,רשימת Holiday ישימה
@@ -3431,7 +3458,7 @@
 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 +573,Please specify Attribute Value for attribute {0},ציין מאפיין ערך עבור תכונת {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3510,7 +3537,7 @@
 DocType: Address,Office,משרד
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,כתב עת חשבונאות ערכים.
 DocType: Delivery Note Item,Available Qty at From Warehouse,כמות זמינה ממחסן
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,אנא בחר עובד רשומה ראשון.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,אנא בחר עובד רשומה ראשון.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,נא להזין את חשבון הוצאות
@@ -3585,7 +3612,7 @@
 DocType: Item Attribute,Numeric Values,ערכים מספריים
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,צרף לוגו
 DocType: Customer,Commission Rate,הוועדה שערי
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,הפוך Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,הפוך Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,יישומי חופשת בלוק על ידי מחלקה.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,עגלה ריקה
 DocType: Production Order,Actual Operating Cost,עלות הפעלה בפועל
@@ -3602,15 +3629,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item","כדי להגדיר רמת הזמנה חוזרת, פריט חייב להיות פריט רכישה או פריט ייצור"
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),(חצי יום)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(חצי יום)
 DocType: Supplier,Credit Days,ימי אשראי
 DocType: Leave Type,Is Carry Forward,האם להמשיך קדימה
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,קבל פריטים מBOM
diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index 5ce332f..80276cd 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% बिल
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),विनिमय दर के रूप में ही किया जाना चाहिए {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ग्राहक का नाम
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},बैंक खाते के रूप में नामित नहीं किया जा सकता {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},बैंक खाते के रूप में नामित नहीं किया जा सकता {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),बकाया {0} शून्य से भी कम नहीं किया जा सकता है के लिए ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,नई छुट्टी के लिए अर्जी
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,नई छुट्टी के लिए अर्जी
 apps/erpnext/erpnext/setup/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,भुगतान खाता का तरीका
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","क्रियाएँ का प्रवेश, बिलिंग समय पर नज़र रखने के लिए इस्तेमाल किया जा सकता है कि कार्यों के खिलाफ उपयोगकर्ताओं द्वारा प्रदर्शन किया।"
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},नई {0}: # {1}
 ,Sales Partners Commission,बिक्री पार्टनर्स आयोग
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,संक्षिप्त 5 से अधिक वर्ण की नहीं हो सकती
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,संक्षिप्त 5 से अधिक वर्ण की नहीं हो सकती
 DocType: Payment Request,Payment Request,भुगतान अनुरोध
 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.",मूल्य {0} {1} मद के रूप वेरिएंट \ से हटाया नहीं जा सकता गुण इस विशेषता के साथ मौजूद हैं।
@@ -196,6 +196,7 @@
 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 (%),मूल्य सूची दर पर डिस्काउंट (%)
 DocType: Offer Letter,Select Terms and Conditions,का चयन नियम और शर्तें
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,आउट मान
 DocType: Production Planning Tool,Sales Orders,बिक्री के आदेश
 DocType: Purchase Taxes and Charges,Valuation,मूल्याकंन
 ,Purchase Order Trends,आदेश रुझान खरीद
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,दूरदर्शन
 DocType: Production Order Operation,Updated via 'Time Log','टाइम प्रवेश' के माध्यम से अद्यतन
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},खाते {0} कंपनी से संबंधित नहीं है {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},अग्रिम राशि से अधिक नहीं हो सकता है {0} {1}
 DocType: Naming Series,Series List for this Transaction,इस लेन - देन के लिए सीरीज सूची
 DocType: Sales Invoice,Is Opening Entry,एंट्री खोल रहा है
 DocType: Customer Group,Mention if non-standard receivable account applicable,मेंशन गैर मानक प्राप्य खाते यदि लागू हो
@@ -227,7 +229,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,उपरोक्त मानदंडों के लिए वेतन पर्ची बनाता है.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,दिया का कोई विवरण नहीं
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,खरीद के लिए अनुरोध.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,केवल चयनित लीव अनुमोदक इस छुट्टी के लिए अर्जी प्रस्तुत कर सकते हैं
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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} सेटअप&gt; सेटिंग के माध्यम से&gt; नामकरण सीरीज के लिए सीरीज का नामकरण सेट करें
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},वेयरहाउस {0} से संबंधित नहीं है कंपनी {1}
 DocType: Item Website Specification,Item Website Specification,आइटम वेबसाइट विशिष्टता
 DocType: Payment Tool,Reference No,संदर्भ संक्या
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,अवरुद्ध छोड़ दो
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,अवरुद्ध छोड़ दो
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेयर सुलह आइटम
 DocType: Stock Entry,Sales Invoice No,बिक्री चालान नहीं
@@ -249,7 +251,7 @@
 DocType: Pricing Rule,Supplier Type,प्रदायक प्रकार
 DocType: Item,Publish in Hub,हब में प्रकाशित
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,सामग्री अनुरोध
 DocType: Bank Reconciliation,Update Clearance Date,अद्यतन क्लीयरेंस तिथि
 DocType: Item,Purchase Details,खरीद विवरण
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,बिलटी
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,करों की स्थापना
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,आप इसे खींचा बाद भुगतान एंट्री संशोधित किया गया है। इसे फिर से खींच कर दीजिये।
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} मद टैक्स में दो बार दर्ज
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,माह और वर्ष का चयन करें
@@ -329,7 +331,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,आपका ईमेल पता
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,लगाव को देखने के लिए धन्यवाद
 DocType: Purchase Order,% Received,% प्राप्त
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,सेटअप पहले से ही पूरा !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,सेटअप पहले से ही पूरा !
 ,Finished Goods,निर्मित माल
 DocType: Delivery Note,Instructions,निर्देश
 DocType: Quality Inspection,Inspected By,द्वारा निरीक्षण किया
@@ -354,14 +356,13 @@
 ,Purchase Register,इन पंजीकृत खरीद
 DocType: Landed Cost Item,Applicable Charges,लागू शुल्कों
 DocType: Workstation,Consumable Cost,उपभोज्य लागत
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) भूमिका होनी चाहिए 'लीव अनुमोदनकर्ता'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) भूमिका होनी चाहिए 'लीव अनुमोदनकर्ता'
 DocType: Purchase Receipt,Vehicle Date,वाहन की तारीख
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,चिकित्सा
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,खोने के लिए कारण
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},कार्य केंद्र छुट्टी सूची के अनुसार निम्नलिखित तारीखों पर बंद हो गया है: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,सुनहरे अवसर
 DocType: Employee,Single,एक
-DocType: Issue,Attachment,आसक्ति
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,बजट समूह लागत केंद्र के लिए सेट नहीं किया जा सकता है
 DocType: Account,Cost of Goods Sold,बेच माल की लागत
 DocType: Purchase Invoice,Yearly,वार्षिक
@@ -390,7 +391,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,गुण {0} गुण तालिका में कई बार चुना
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,गुण {0} गुण तालिका में कई बार चुना
 DocType: HR Settings,Employee record is created using selected field. ,कर्मचारी रिकॉर्ड चयनित क्षेत्र का उपयोग कर बनाया जाता है.
 DocType: Sales Order,Not Applicable,लागू नहीं
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,अवकाश मास्टर .
@@ -429,7 +430,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,प्रसाधन सामग्री
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items","मर्ज करने के लिए , निम्नलिखित गुण दोनों मदों के लिए ही होना चाहिए"
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","मर्ज करने के लिए , निम्नलिखित गुण दोनों मदों के लिए ही होना चाहिए"
 DocType: Shipping Rule,Net Weight,निवल भार
 DocType: Employee,Emergency Phone,आपातकालीन फोन
 ,Serial No Warranty Expiry,धारावाहिक नहीं वारंटी समाप्ति
@@ -440,7 +441,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,प्रबंध उप
 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,दर जिस पर मूल्य सूची मुद्रा कंपनी के बेस मुद्रा में परिवर्तित किया जाता है
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},खाते {0} कंपनी से संबंधित नहीं है: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},खाते {0} कंपनी से संबंधित नहीं है: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,संक्षिप्त पहले से ही एक और कंपनी के लिए इस्तेमाल किया
 DocType: Selling Settings,Default Customer Group,डिफ़ॉल्ट ग्राहक समूह
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","निष्क्रिय कर देते हैं, &#39;गोल कुल&#39; अगर क्षेत्र किसी भी लेन - देन में दिखाई नहीं देगा"
 DocType: BOM,Operating Cost,संचालन लागत
@@ -476,6 +478,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,चालान तालिका में कोई अभिलेख
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,पहले कंपनी और पार्टी के प्रकार का चयन करें
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,वित्तीय / लेखा वर्ष .
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,संचित मान
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","क्षमा करें, सीरियल नं विलय हो नहीं सकता"
 DocType: Project Task,Project Task,परियोजना के कार्य
 ,Lead Id,लीड ईद
@@ -497,7 +500,7 @@
 DocType: Quotation,Quotation To,करने के लिए कोटेशन
 DocType: Lead,Middle Income,मध्य आय
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),उद्घाटन (सीआर )
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,आप पहले से ही एक और UoM के साथ कुछ लेन-देन (एस) बना दिया है क्योंकि मद के लिए माप की मूलभूत इकाई {0} सीधे नहीं बदला जा सकता। आप एक अलग डिफ़ॉल्ट UoM का उपयोग करने के लिए एक नया आइटम बनाने की आवश्यकता होगी।
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,आप पहले से ही एक और UoM के साथ कुछ लेन-देन (एस) बना दिया है क्योंकि मद के लिए माप की मूलभूत इकाई {0} सीधे नहीं बदला जा सकता। आप एक अलग डिफ़ॉल्ट UoM का उपयोग करने के लिए एक नया आइटम बनाने की आवश्यकता होगी।
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,आवंटित राशि ऋणात्मक नहीं हो सकता
 DocType: Purchase Order Item,Billed Amt,बिल भेजा राशि
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,शेयर प्रविष्टियों बना रहे हैं जिसके खिलाफ एक तार्किक वेयरहाउस।
@@ -575,7 +578,7 @@
 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 +543,Item has variants.,आइटम वेरिएंट है।
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,पेड़ के प्रकार
@@ -588,6 +591,7 @@
 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 +33,Goods received from Suppliers.,माल आपूर्तिकर्ता से प्राप्त किया.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,मूल्य में
 DocType: Lead,Campaign Name,अभियान का नाम
 ,Reserved,आरक्षित
 DocType: Purchase Order,Supply Raw Materials,कच्चे माल की आपूर्ति
@@ -602,16 +606,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,मौजूदा लेन - देन के साथ खाता लेजर को परिवर्तित नहीं किया जा सकता है
 DocType: Delivery Note,Customer's Purchase Order No,ग्राहक की खरीद आदेश नहीं
 DocType: Employee,Cell Number,सेल नंबर
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,ऑटो सामग्री अनुरोध सृजित
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,ऑटो सामग्री अनुरोध सृजित
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,खोया
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,आप स्तंभ 'जर्नल प्रवेश के खिलाफ' में मौजूदा वाउचर प्रवेश नहीं कर सकते
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ऊर्जा
 DocType: Opportunity,Opportunity From,अवसर से
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,मासिक वेतन बयान.
 DocType: Item Group,Website Specifications,वेबसाइट निर्दिष्टीकरण
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},अपनी पता टेम्पलेट में कोई त्रुटि है {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,नया खाता
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: {0} प्रकार की {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,पंक्ति {0}: रूपांतरण कारक अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","एकाधिक मूल्य नियम एक ही मापदंड के साथ मौजूद है, प्राथमिकता बताए द्वारा संघर्ष का समाधान करें। मूल्य नियम: {0}"
 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.,लेखांकन प्रविष्टियों पत्ती नोड्स के खिलाफ किया जा सकता है। समूहों के खिलाफ प्रविष्टियों की अनुमति नहीं है।
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,निष्क्रिय या इसे अन्य BOMs के साथ जुड़ा हुआ है के रूप में बीओएम रद्द नहीं कर सकते
 DocType: Opportunity,Maintenance,रखरखाव
@@ -673,7 +679,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,मूल्य सूची चयनित नहीं
 DocType: Employee,Family Background,पारिवारिक पृष्ठभूमि
 DocType: Process Payroll,Send Email,ईमेल भेजें
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},चेतावनी: अमान्य अनुलग्नक {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},चेतावनी: अमान्य अनुलग्नक {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,अनुमति नहीं है
 DocType: Company,Default Bank Account,डिफ़ॉल्ट बैंक खाता
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","पार्टी के आधार पर फिल्टर करने के लिए, का चयन पार्टी पहले प्रकार"
@@ -703,13 +709,13 @@
 DocType: Production Planning Tool,Select Items,आइटम का चयन करें
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} विधेयक के खिलाफ {1} दिनांक {2}
 DocType: Maintenance Visit,Completion Status,समापन स्थिति
-DocType: Sales Invoice Item,Target Warehouse,लक्ष्य वेअरहाउस
+DocType: Production Order,Target Warehouse,लक्ष्य वेअरहाउस
 DocType: Item,Allow over delivery or receipt upto this percent,इस प्रतिशत तक प्रसव या रसीद से अधिक की अनुमति दें
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,उम्मीद की डिलीवरी की तारीख से पहले बिक्री आदेश तिथि नहीं हो सकता
 DocType: Upload Attendance,Import Attendance,आयात उपस्थिति
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,सभी आइटम समूहों
 DocType: Process Payroll,Activity Log,गतिविधि लॉग
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,शुद्ध लाभ / हानि
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,शुद्ध लाभ / हानि
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,स्वचालित रूप से लेनदेन के प्रस्तुत करने पर संदेश लिखें .
 DocType: Production Order,Item To Manufacture,आइटम करने के लिए निर्माण
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} स्थिति {2} है
@@ -717,7 +723,7 @@
 DocType: Sales Order Item,Projected Qty,अनुमानित मात्रा
 DocType: Sales Invoice,Payment Due Date,भुगतान की नियत तिथि
 DocType: Newsletter,Newsletter Manager,न्यूज़लैटर प्रबंधक
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,मद संस्करण {0} पहले से ही एक ही गुण के साथ मौजूद है
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,मद संस्करण {0} पहले से ही एक ही गुण के साथ मौजूद है
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;उद्घाटन&#39;
 DocType: Notification Control,Delivery Note Message,डिलिवरी नोट संदेश
 DocType: Expense Claim,Expenses,व्यय
@@ -727,7 +733,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,अनुसंधान एवं विकास
 ,Amount to Bill,बिल राशि
 DocType: Company,Registration Details,पंजीकरण के विवरण
-DocType: Item,Re-Order Qty,पुन: आदेश मात्रा
+DocType: Item Reorder,Re-Order Qty,पुन: आदेश मात्रा
 DocType: Leave Block List Date,Leave Block List Date,ब्लॉक सूची तिथि छोड़ दो
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},करने के लिए भेजने के लिए अनुसूचित {0}
 DocType: Pricing Rule,Price or Discount,मूल्य या डिस्काउंट
@@ -770,7 +776,7 @@
 DocType: Bank Reconciliation,Total Amount,कुल राशि
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,इंटरनेट प्रकाशन
 DocType: Production Planning Tool,Production Orders,उत्पादन के आदेश
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,शेष मूल्य
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,शेष मूल्य
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,बिक्री मूल्य सूची
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,आइटम सिंक करने के लिए प्रकाशित करें
 DocType: Bank Reconciliation,Account Currency,खाता मुद्रा
@@ -779,7 +785,7 @@
 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 +538,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
 DocType: Quality Inspection Reading,Reading 6,6 पढ़ना
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,चालान अग्रिम खरीद
 DocType: Address,Shop,दुकान
@@ -856,7 +862,7 @@
 DocType: POS Profile,Cash/Bank Account,नकद / बैंक खाता
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,मात्रा या मूल्य में कोई परिवर्तन से हटाया आइटम नहीं है।
 DocType: Delivery Note,Delivery To,करने के लिए डिलिवरी
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,गुण तालिका अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,छूट
@@ -884,7 +890,7 @@
 DocType: Tax Rule,Shipping State,जहाजरानी राज्य
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,आइटम बटन 'खरीद प्राप्तियों से आइटम प्राप्त' का उपयोग कर जोड़ा जाना चाहिए
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,बिक्री व्यय
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,मानक खरीद
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,मानक खरीद
 DocType: GL Entry,Against,के खिलाफ
 DocType: Item,Default Selling Cost Center,डिफ़ॉल्ट बिक्री लागत केंद्र
 DocType: Sales Partner,Implementation Partner,कार्यान्वयन साथी
@@ -926,7 +932,7 @@
 DocType: Sales Partner,Distributor,वितरक
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,शॉपिंग कार्ट नौवहन नियम
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन का आदेश {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',सेट &#39;पर अतिरिक्त छूट लागू करें&#39; कृपया
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',सेट &#39;पर अतिरिक्त छूट लागू करें&#39; कृपया
 ,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.,समय लॉग्स का चयन करें और एक नया बिक्री चालान बनाने के लिए भेजें.
@@ -994,9 +1000,9 @@
 DocType: Contact,User ID,प्रयोक्ता आईडी
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,देखें खाता बही
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,शीघ्रातिशीघ्र
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group","एक आइटम समूह में एक ही नाम के साथ मौजूद है , वस्तु का नाम बदलने के लिए या आइटम समूह का नाम बदलने के लिए कृपया"
 DocType: Production Order,Manufacture against Sales Order,बिक्री आदेश के खिलाफ निर्माण
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,शेष विश्व
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,सकल वेतन
@@ -1026,7 +1032,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","क्षमा करें, कंपनियों का विलय कर दिया नहीं किया जा सकता"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","क्षमा करें, कंपनियों का विलय कर दिया नहीं किया जा सकता"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,छोटा
 DocType: Employee,Employee Number,कर्मचारियों की संख्या
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},प्रकरण नहीं ( ओं) पहले से ही उपयोग में . प्रकरण नहीं से try {0}
@@ -1045,7 +1051,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,कृषि
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,अपने उत्पादों या सेवाओं
 DocType: Mode of Payment,Mode of Payment,भुगतान की रीति
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,वेबसाइट छवि एक सार्वजनिक फ़ाइल या वेबसाइट URL होना चाहिए
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,वेबसाइट छवि एक सार्वजनिक फ़ाइल या वेबसाइट URL होना चाहिए
 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,वेयरहाउस संपर्क जानकारी
@@ -1117,6 +1123,7 @@
 DocType: Address,Utilities,उपयोगिताएँ
 DocType: Purchase Invoice Item,Accounting,लेखांकन
 DocType: Features Setup,Features Setup,सुविधाएँ सेटअप
+DocType: Item,Is Service Item,सेवा आइटम
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,आवेदन की अवधि के बाहर छुट्टी के आवंटन की अवधि नहीं किया जा सकता
 DocType: Activity Cost,Projects,परियोजनाओं
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,वित्तीय वर्ष का चयन करें
@@ -1147,7 +1154,7 @@
 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 +465,cannot be greater than 100,100 से अधिक नहीं हो सकता
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
 DocType: Maintenance Visit,Unscheduled,अनिर्धारित
 DocType: Employee,Owned,स्वामित्व
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,बिना वेतन छुट्टी पर निर्भर करता है
@@ -1207,7 +1214,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,सरकार
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,आइटम वेरिएंट
 DocType: Company,Services,सेवाएं
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),कुल ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),कुल ({0})
 DocType: Cost Center,Parent Cost Center,माता - पिता लागत केंद्र
 DocType: Sales Invoice,Source,स्रोत
 DocType: Leave Type,Is Leave Without Pay,बिना वेतन छुट्टी है
@@ -1280,17 +1287,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,भुगतान ईमेल पुन: भेजें
 DocType: Dependent Task,Dependent Task,आश्रित टास्क
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},प्रकार की छुट्टी {0} से बड़ा नहीं हो सकता है {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,खपत राशि
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} देखें
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,नकद में शुद्ध परिवर्तन
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,नकद में शुद्ध परिवर्तन
 DocType: Salary Structure Deduction,Salary Structure Deduction,वेतन संरचना कटौती
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,मापने की इकाई {0} अधिक रूपांतरण कारक तालिका में एक बार से अधिक दर्ज किया गया है
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,मापने की इकाई {0} अधिक रूपांतरण कारक तालिका में एक बार से अधिक दर्ज किया गया है
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},भुगतान का अनुरोध पहले से मौजूद है {0}
 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 +182,Quantity must not be more than {0},मात्रा से अधिक नहीं होना चाहिए {0}
@@ -1352,7 +1359,7 @@
 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: Packed Item,To Warehouse (Optional),गोदाम के लिए (वैकल्पिक)
 DocType: Sales Invoice,Paid Amount (Company Currency),भुगतान की गई राशि (कंपनी मुद्रा)
 DocType: Purchase Invoice,Additional Discount,अतिरिक्त छूट
 DocType: Selling Settings,Selling Settings,सेटिंग्स बेचना
@@ -1361,7 +1368,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","कंपनी , महीना और वित्तीय वर्ष अनिवार्य है"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,विपणन व्यय
 ,Item Shortage Report,आइटम कमी की रिपोर्ट
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","वजन भी ""वजन UOM"" का उल्लेख कृपया \n, उल्लेख किया गया है"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","वजन भी ""वजन UOM"" का उल्लेख कृपया \n, उल्लेख किया गया है"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,इस स्टॉक एंट्री बनाने के लिए इस्तेमाल सामग्री अनुरोध
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,एक आइटम के एकल इकाई.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',समय लॉग बैच {0} ' प्रस्तुत ' होना चाहिए
@@ -1372,6 +1379,7 @@
 DocType: Employee,Date Of Retirement,सेवानिवृत्ति की तारीख
 DocType: Upload Attendance,Get Template,टेम्पलेट जाओ
 DocType: Address,Postal,डाक का
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext सेटअप पूरा हुआ!
 DocType: Item,Weightage,महत्व
 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,"ग्राहक समूह समान नाम के साथ पहले से मौजूद है, कृपया ग्राहक का नाम बदले या ग्राहक समूह का नाम बदले"
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,पहला {0} का चयन करें.
@@ -1400,12 +1408,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,बहुत अधिक कॉलम. रिपोर्ट निर्यात और एक स्प्रेडशीट अनुप्रयोग का उपयोग कर इसे मुद्रित.
 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 +139,Main,मुख्य
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,मुख्य
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,प्रकार
 DocType: Naming Series,Set prefix for numbering series on your transactions,अपने लेनदेन पर श्रृंखला नंबरिंग के लिए उपसर्ग सेट
 DocType: Employee Attendance Tool,Employees HTML,कर्मचारियों एचटीएमएल
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,रूका आदेश को रद्द नहीं किया जा सकता . रद्द करने के लिए आगे बढ़ाना .
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,डिफ़ॉल्ट बीओएम ({0}) इस मद या अपने टेम्पलेट के लिए सक्रिय होना चाहिए
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,वेरिएंट
@@ -1430,7 +1438,6 @@
 DocType: Sales Order,To Deliver and Bill,उद्धार और बिल के लिए
 DocType: GL Entry,Credit Amount in Account Currency,खाते की मुद्रा में ऋण राशि
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,विनिर्माण के लिए टाइम लॉग करता है।
-DocType: Item,Apply Warehouse-wise Reorder Level,गोदाम के लिहाज से पुनःक्रमित स्तर पर लागू करें
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,बीओएम {0} प्रस्तुत किया जाना चाहिए
 DocType: Authorization Control,Authorization Control,प्राधिकरण नियंत्रण
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},पंक्ति # {0}: मालगोदाम अस्वीकृत खारिज कर दिया मद के खिलाफ अनिवार्य है {1}
@@ -1529,6 +1536,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,पंक्ति # {0}: ऑपरेशन {1} उत्पादन में तैयार माल की {2} मात्रा के लिए पूरा नहीं है आदेश # {3}। टाइम लॉग्स के माध्यम से आपरेशन स्थिति अपडेट करें
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,निवेश
 DocType: Issue,Resolution Details,संकल्प विवरण
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,आवंटन
 DocType: Quality Inspection Reading,Acceptance Criteria,स्वीकृति मापदंड
 DocType: Item Attribute,Attribute Name,उत्तरदायी ठहराने के लिए नाम
 DocType: Item Group,Show In Website,वेबसाइट में दिखाएँ
@@ -1579,7 +1587,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,खर्च का दावा अनुमोदन के लिए लंबित है . केवल खर्च अनुमोदक स्थिति अपडेट कर सकते हैं .
 DocType: Purchase Invoice,Additional Discount Amount,अतिरिक्त छूट राशि
 DocType: Leave Block List Allow,Leave Block List Allow,छोड़ दो ब्लॉक सूची की अनुमति दें
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr खाली या स्थान नहीं हो सकता
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr खाली या स्थान नहीं हो सकता
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,गैर-समूह के लिए समूह
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,खेल
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,वास्तविक कुल
@@ -1620,7 +1628,7 @@
 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**.,** वित्त वर्ष ** एक वित्तीय वर्ष का प्रतिनिधित्व करता है। सभी लेखा प्रविष्टियों और अन्य प्रमुख लेनदेन ** ** वित्त वर्ष के खिलाफ ट्रैक किए गए हैं।
 DocType: Opportunity,Customer / Lead Address,ग्राहक / लीड पता
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},चेतावनी: कुर्की पर अवैध एसएसएल प्रमाणपत्र {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},चेतावनी: कुर्की पर अवैध एसएसएल प्रमाणपत्र {0}
 DocType: Production Order Operation,Actual Operation Time,वास्तविक ऑपरेशन टाइम
 DocType: Authorization Rule,Applicable To (User),के लिए लागू (उपयोगकर्ता)
 DocType: Purchase Taxes and Charges,Deduct,घटाना
@@ -1769,7 +1777,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,मुकदमा संख्या 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,यदि आप बिक्री टीम और बिक्री (चैनल पार्टनर्स) पार्टनर्स वे चिह्नित किया जा सकता है और बिक्री गतिविधि में बनाए रखने के लिए उनके योगदान
 DocType: Item,Show a slideshow at the top of the page,पृष्ठ के शीर्ष पर एक स्लाइड शो दिखाएँ
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,भंडार
+DocType: Item,"Allow in Sales Order of type ""Service""",प्रकार &quot;सेवा&quot; की बिक्री आदेश में अनुमति दें
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,भंडार
 DocType: Time Log,Projects Manager,परियोजनाओं के प्रबंधक
 DocType: Serial No,Delivery Time,सुपुर्दगी समय
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,के आधार पर बूढ़े
@@ -1794,7 +1803,7 @@
 ,Financial Analytics,वित्तीय विश्लेषिकी
 DocType: Quality Inspection,Verified By,द्वारा सत्यापित
 DocType: Address,Subsidiary,सहायक
-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.","मौजूदा लेनदेन कर रहे हैं , क्योंकि कंपनी के डिफ़ॉल्ट मुद्रा में परिवर्तन नहीं कर सकते हैं . लेनदेन डिफ़ॉल्ट मुद्रा बदलने के लिए रद्द कर दिया जाना चाहिए ."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","मौजूदा लेनदेन कर रहे हैं , क्योंकि कंपनी के डिफ़ॉल्ट मुद्रा में परिवर्तन नहीं कर सकते हैं . लेनदेन डिफ़ॉल्ट मुद्रा बदलने के लिए रद्द कर दिया जाना चाहिए ."
 DocType: Quality Inspection,Purchase Receipt No,रसीद खरीद नहीं
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,बयाना राशि
 DocType: Process Payroll,Create Salary Slip,वेतनपर्ची बनाएँ
@@ -1842,7 +1851,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,कच्चे माल खाली नहीं किया जा सकता।
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","शेयर अद्यतन नहीं कर सका, चालान ड्रॉप शिपिंग आइटम शामिल हैं।"
 DocType: Newsletter,Test,परीक्षण
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'","मौजूदा स्टॉक लेनदेन आप के मूल्यों को बदल नहीं सकते \ इस मद के लिए वहाँ के रूप में &#39;सीरियल नहीं है&#39;, &#39;बैच है,&#39; नहीं &#39;शेयर मद है&#39; और &#39;मूल्यांकन पद्धति&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,त्वरित जर्नल प्रविष्टि
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,बीओएम किसी भी आइटम agianst उल्लेख अगर आप दर में परिवर्तन नहीं कर सकते
@@ -1951,7 +1960,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,कृपया डिलिवरी नोट पहले
 DocType: Purchase Invoice,Currency and Price List,मुद्रा और मूल्य सूची
 DocType: Opportunity,Customer / Lead Name,ग्राहक / लीड नाम
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,क्लीयरेंस तिथि का उल्लेख नहीं
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,क्लीयरेंस तिथि का उल्लेख नहीं
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,उत्पादन
 DocType: Item,Allow Production Order,उत्पादन का आदेश दें
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,पंक्ति {0} : आरंभ तिथि समाप्ति तिथि से पहले होना चाहिए
@@ -1961,7 +1970,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,कुल अर्जन
 DocType: Purchase Receipt,Time at which materials were received,जो समय पर सामग्री प्राप्त हुए थे
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,मेरे पते
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,मेरे पते
 DocType: Stock Ledger Entry,Outgoing Rate,आउटगोइंग दर
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,संगठन शाखा मास्टर .
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,या
@@ -2030,7 +2039,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,ग्राहक समूह ट्री प्रबंधन .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,नए लागत केन्द्र का नाम
 DocType: Leave Control Panel,Leave Control Panel,नियंत्रण कक्ष छोड़ दो
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,कोई डिफ़ॉल्ट पता खाका पाया. सेटअप> मुद्रण और ब्रांडिंग से एक नया एक> पता टेम्पलेट बनाने के लिए धन्यवाद.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,कोई डिफ़ॉल्ट पता खाका पाया. सेटअप> मुद्रण और ब्रांडिंग से एक नया एक> पता टेम्पलेट बनाने के लिए धन्यवाद.
 DocType: Appraisal,HR User,मानव संसाधन उपयोगकर्ता
 DocType: Purchase Invoice,Taxes and Charges Deducted,कर और शुल्क कटौती
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,मुद्दे
@@ -2047,7 +2056,7 @@
 ,Sales Browser,बिक्री ब्राउज़र
 DocType: Journal Entry,Total Credit,कुल क्रेडिट
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: एक और {0} # {1} शेयर प्रविष्टि के खिलाफ मौजूद है {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,स्थानीय
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,बड़ा
@@ -2066,7 +2075,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,आप सेट और लक्ष्यों की निगरानी कर सकते हैं ताकि सभी बिक्री लेनदेन कई ** बिक्री व्यक्तियों ** खिलाफ टैग किया जा सकता है।
 ,S.O. No.,बिक्री आदेश संख्या
 DocType: Production Order Operation,Make Time Log,समय लॉग बनाओ
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,पुनःक्रमित मात्रा सेट करें
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},लीड से ग्राहक बनाने कृपया {0}
 DocType: Price List,Applicable for Countries,देशों के लिए लागू
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,कंप्यूटर्स
@@ -2153,7 +2161,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,प्रासंगिक प्रविष्टियां प्राप्त करें
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,शेयर के लिए लेखा प्रविष्टि
 DocType: Sales Invoice,Sales Team1,Team1 बिक्री
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,आइटम {0} मौजूद नहीं है
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,आइटम {0} मौजूद नहीं है
 DocType: Sales Invoice,Customer Address,ग्राहक पता
 DocType: Payment Request,Recipient and Message,प्राप्तकर्ता और संदेश
 DocType: Purchase Invoice,Apply Additional Discount On,अतिरिक्त छूट पर लागू होते हैं
@@ -2195,7 +2203,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,मूल्यांकन दर
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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,प्रवेश का नाम बदलें
@@ -2233,7 +2241,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,तारीख से राहत दर्ज करें.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,राशि
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,केवल प्रस्तुत किया जा सकता है 'स्वीकृत' स्थिति के साथ आवेदन छोड़ दो
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,पता शीर्षक अनिवार्य है .
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,पता शीर्षक अनिवार्य है .
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,अभियान का नाम दर्ज़ अगर जांच के स्रोत अभियान
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,अखबार के प्रकाशक
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,वित्तीय वर्ष का चयन करें
@@ -2257,6 +2265,7 @@
 DocType: UOM,Must be Whole Number,पूर्ण संख्या होनी चाहिए
 DocType: Leave Control Panel,New Leaves Allocated (In Days),नई पत्तियों आवंटित (दिनों में)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,धारावाहिक नहीं {0} मौजूद नहीं है
+DocType: Sales Invoice Item,Customer Warehouse (Optional),ग्राहक गोदाम (वैकल्पिक)
 DocType: Pricing Rule,Discount Percentage,डिस्काउंट प्रतिशत
 DocType: Payment Reconciliation Invoice,Invoice Number,चालान क्रमांक
 apps/erpnext/erpnext/hooks.py +55,Orders,आदेश
@@ -2366,7 +2375,7 @@
 DocType: Appraisal,Appraisal,मूल्यांकन
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,तिथि दोहराया है
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,अधिकृत हस्ताक्षरकर्ता
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},छोड़ दो सरकारी गवाह से एक होना चाहिए {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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,समय शुरू
@@ -2535,7 +2544,7 @@
 DocType: BOM Replace Tool,BOM Replace Tool,बीओएम बदलें उपकरण
 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 +733,Show tax break-up,शो कर तोड़-अप
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,शो कर तोड़-अप
 apps/erpnext/erpnext/accounts/party.py +283,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',आप विनिर्माण गतिविधि में शामिल हैं .
@@ -2585,7 +2594,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,फिर से लिखें कंपनी के नाम की पुष्टि के लिए कृपया
@@ -2612,9 +2621,6 @@
 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,शामिल होने की तिथि जन्म तिथि से अधिक होना चाहिए
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,वेतन संरचना
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","एकाधिक मूल्य नियम एक ही मापदंड के साथ मौजूद है, प्राथमिकता बताए द्वारा \
- संघर्ष का समाधान करें। मूल्य नियम: {0}"
 DocType: Account,Bank,बैंक
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,एयरलाइन
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,मुद्दा सामग्री
@@ -2639,7 +2645,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,प्रतिभूति एवं कमोडिटी एक्सचेंजों
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',संस्करण के लिए उपाय की मूलभूत इकाई &#39;{0}&#39; खाका के रूप में ही होना चाहिए &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',संस्करण के लिए उपाय की मूलभूत इकाई &#39;{0}&#39; खाका के रूप में ही होना चाहिए &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,के आधार पर गणना करें
 DocType: Delivery Note Item,From Warehouse,गोदाम से
 DocType: Purchase Taxes and Charges,Valuation and Total,मूल्यांकन और कुल
@@ -2648,7 +2654,7 @@
 DocType: Account,Purchase User,क्रय उपयोगकर्ता
 DocType: Notification Control,Customize the Notification,अधिसूचना को मनपसंद
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,आपरेशन से नकद प्रवाह
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,डिफ़ॉल्ट पता खाका हटाया नहीं जा सकता
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,डिफ़ॉल्ट पता खाका हटाया नहीं जा सकता
 DocType: Sales Invoice,Shipping Rule,नौवहन नियम
 DocType: Manufacturer,Limited to 12 characters,12 अक्षरों तक सीमित
 DocType: Journal Entry,Print Heading,शीर्षक प्रिंट
@@ -2742,7 +2748,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,परियोजना के लिहाज से डेटा उद्धरण के लिए उपलब्ध नहीं है
 DocType: Project,Expected End Date,उम्मीद समाप्ति तिथि
 DocType: Appraisal Template,Appraisal Template Title,मूल्यांकन टेम्पलेट शीर्षक
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,वाणिज्यिक
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,बहुत बढ़िया सेवाएं
@@ -2761,7 +2767,7 @@
 DocType: Customer,Default Receivable Accounts,प्राप्य लेखा चूक
 DocType: Tax Rule,Billing State,बिलिंग राज्य
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,हस्तांतरण
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),( उप असेंबलियों सहित) विस्फोट बीओएम लायें
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),( उप असेंबलियों सहित) विस्फोट बीओएम लायें
 DocType: Authorization Rule,Applicable To (Employee),के लिए लागू (कर्मचारी)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,नियत तिथि अनिवार्य है
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,गुण के लिए वेतन वृद्धि {0} 0 नहीं किया जा सकता
@@ -2794,7 +2800,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,नकारात्मक मूल्यांकन दर की अनुमति नहीं है
 DocType: Holiday List,Weekly Off,ऑफ साप्ताहिक
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","जैसे 2012, 2012-13 के लिए"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),अनंतिम लाभ / हानि (क्रेडिट)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),अनंतिम लाभ / हानि (क्रेडिट)
 DocType: Sales Invoice,Return Against Sales Invoice,के खिलाफ बिक्री चालान लौटें
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,आइटम 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},कंपनी में डिफ़ॉल्ट मान {0} सेट करें {1}
@@ -2825,6 +2831,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,बाल जोड़ें
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,भूमिका जमे लेखा एवं संपादित जमे प्रविष्टियां सेट करने की अनुमति
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,यह बच्चे नोड्स के रूप में खाता बही के लिए लागत केंद्र बदला नहीं जा सकता
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,उद्घाटन मूल्य
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,सीरियल #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,बिक्री पर कमीशन
 DocType: Offer Letter Term,Value / Description,मूल्य / विवरण
@@ -2858,7 +2865,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,सफलतापूर्वक इस कंपनी से संबंधित सभी लेन-देन को नष्ट कर दिया!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,आज की तारीख में
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,परिवीक्षा
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,डिफ़ॉल्ट गोदाम स्टॉक मद के लिए अनिवार्य है .
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},महीने के वेतन का भुगतान {0} और वर्ष {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ऑटो डालने मूल्य सूची दर लापता यदि
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,कुल भुगतान की गई राशि
@@ -2894,7 +2900,7 @@
 DocType: Payment Tool,Set Matching Amounts,सेट मिलान राशियाँ
 DocType: Purchase Invoice,Taxes and Charges Added,कर और शुल्क जोड़ा
 ,Sales Funnel,बिक्री कीप
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,संक्षिप्त अनिवार्य है
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,संक्षिप्त अनिवार्य है
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,हमारे अद्यतन करने के लिए सदस्यता लेने में आपकी रुचि के लिए धन्यवाद
 ,Qty to Transfer,स्थानांतरण करने के लिए मात्रा
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,सुराग या ग्राहक के लिए उद्धरण.
@@ -2922,7 +2928,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,प्रदायक कोटेशन
 DocType: Quotation,In Words will be visible once you save the Quotation.,शब्दों में दिखाई हो सकता है एक बार आप उद्धरण बचाने के लिए होगा.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} बंद कर दिया है
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},बारकोड {0} पहले से ही मद में इस्तेमाल {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,आगामी कार्यक्रम
@@ -2945,7 +2951,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,वित्तीय वर्ष का चयन करें ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,पीओएस प्रोफ़ाइल पीओएस एंट्री बनाने के लिए आवश्यक
 DocType: Hub Settings,Name Token,नाम टोकन
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,मानक बेच
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,मानक बेच
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,कम से कम एक गोदाम अनिवार्य है
 DocType: Serial No,Out of Warranty,वारंटी के बाहर
 DocType: BOM Replace Tool,Replace,बदलें
@@ -3068,7 +3074,7 @@
 DocType: Sales Invoice,Paid Amount,राशि भुगतान
 ,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,कोई अन्य डिफ़ॉल्ट रूप में वहाँ डिफ़ॉल्ट के रूप में इस का पता खाका स्थापना
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,कोई अन्य डिफ़ॉल्ट रूप में वहाँ डिफ़ॉल्ट के रूप में इस का पता खाका स्थापना
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","खाते की शेष राशि पहले से ही डेबिट में है, कृपया आप शेष राशि को क्रेडिट के रूप में ही रखें"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,गुणवत्ता प्रबंधन
 DocType: Production Planning Tool,Filter based on customer,ग्राहकों के आधार पर फ़िल्टर
@@ -3169,7 +3175,7 @@
 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 +19,Shortage Qty,कमी मात्रा
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
 DocType: Salary Slip,Salary Slip,वेतनपर्ची
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,तिथि करने के लिए आवश्यक है
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","संकुल वितरित किए जाने के लिए निकल जाता है पैकिंग उत्पन्न करता है। पैकेज संख्या, पैकेज सामग्री और अपने वजन को सूचित किया।"
@@ -3180,7 +3186,7 @@
 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.",", एक चेक किए गए लेनदेन के किसी भी &quot;प्रस्तुत कर रहे हैं&quot; पॉप - अप ईमेल स्वचालित रूप से जुड़े है कि सौदे में &quot;संपर्क&quot; के लिए एक ईमेल भेजने के लिए, एक अनुलग्नक के रूप में लेन - देन के साथ खोला. उपयोगकर्ता या ईमेल भेजने के लिए नहीं हो सकता."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,वैश्विक सेटिंग्स
 DocType: Employee Education,Employee Education,कर्मचारी शिक्षा
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,यह आइटम विवरण लाने की जरूरत है।
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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} पहले से ही प्राप्त हो गया है
@@ -3206,6 +3212,7 @@
 DocType: BOM,Manufacturing User,विनिर्माण प्रयोक्ता
 DocType: Purchase Order,Raw Materials Supplied,कच्चे माल की आपूर्ति
 DocType: Purchase Invoice,Recurring Print Format,आवर्ती प्रिंट प्रारूप
+DocType: C-Form,Series,कई
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,उम्मीद की डिलीवरी तिथि खरीद आदेश तिथि से पहले नहीं हो सकता
 DocType: Appraisal,Appraisal Template,मूल्यांकन टेम्पलेट
 DocType: Item Group,Item Classification,आइटम वर्गीकरण
@@ -3292,7 +3299,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},पंक्ति {0}: एक पुनःक्रमित प्रविष्टि पहले से ही इस गोदाम के लिए मौजूद है {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.","खो के रूप में उद्धरण बना दिया गया है , क्योंकि घोषणा नहीं कर सकते हैं ."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,क्रय मास्टर प्रबंधक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,उत्पादन का आदेश {0} प्रस्तुत किया जाना चाहिए
@@ -3300,7 +3307,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,मुख्य रिपोर्ट
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,तिथि करने के लिए तिथि से पहले नहीं हो सकता
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,/ संपादित कीमतों में जोड़ें
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,मेरे आदेश
@@ -3348,7 +3355,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},पंक्ति # {0}: आइटम के लिए सेट प्रदायक {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,मद {1} से जुड़ी वेबसाइट छवि {0} पाया नहीं जा सकता
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,मद {1} से जुड़ी वेबसाइट छवि {0} पाया नहीं जा सकता
 DocType: Issue,Content Type,सामग्री प्रकार
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,कंप्यूटर
 DocType: Item,List this Item in multiple groups on the website.,कई समूहों में वेबसाइट पर इस मद की सूची.
@@ -3362,7 +3369,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,गैर स्टॉक आइटम के लिए क्रमांक 'हाँ' नहीं हो सकता
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'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,लेखाशीर्ष
@@ -3388,7 +3395,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,खाते {0} समापन प्रकार दायित्व / इक्विटी का होना चाहिए
 DocType: Authorization Rule,Based On,के आधार पर
 DocType: Sales Order Item,Ordered Qty,मात्रा का आदेश दिया
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,मद {0} अक्षम हो जाता है
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,मद {0} अक्षम हो जाता है
 DocType: Stock Settings,Stock Frozen Upto,स्टॉक तक जमे हुए
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},से और अवधि आवर्ती के लिए अनिवार्य तिथियाँ तक की अवधि के {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,परियोजना / कार्य कार्य.
@@ -3396,7 +3403,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","लागू करने के लिए के रूप में चुना जाता है तो खरीदना, जाँच की जानी चाहिए {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,सबसे कम से कम 100 होना चाहिए
 DocType: Purchase Invoice,Write Off Amount (Company Currency),राशि से लिखें (कंपनी मुद्रा)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,पंक्ति # {0}: पुनःक्रमित मात्रा सेट करें
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,पंक्ति # {0}: पुनःक्रमित मात्रा सेट करें
 DocType: Landed Cost Voucher,Landed Cost Voucher,उतरा लागत वाउचर
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},सेट करें {0}
 DocType: Purchase Invoice,Repeat on Day of Month,महीने का दिन पर दोहराएँ
@@ -3469,7 +3476,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,अब देखें
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,अवधि का चयन करें जब चालान स्वतः उत्पन्न हो जाएगा
 DocType: BOM,Raw Material Cost,कच्चे माल की लागत
-DocType: Item,Re-Order Level,स्तर पुनः क्रमित करें
+DocType: Item Reorder,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.,"वस्तुओं और योजना बनाई मात्रा दर्ज करें, जिसके लिए आप उत्पादन के आदेश को बढ़ाने या विश्लेषण के लिए कच्चे माल के डाउनलोड करना चाहते हैं."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,अंशकालिक
 DocType: Employee,Applicable Holiday List,लागू अवकाश सूची
@@ -3524,7 +3531,7 @@
 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 +573,Please specify Attribute Value for attribute {0},विशेषता के लिए विशेषता मान निर्दिष्ट करें {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3603,7 +3610,7 @@
 DocType: Address,Office,कार्यालय
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,लेखा पत्रिका प्रविष्टियों.
 DocType: Delivery Note Item,Available Qty at From Warehouse,गोदाम से पर उपलब्ध मात्रा
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,पहले कर्मचारी रिकॉर्ड का चयन करें।
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,पहले कर्मचारी रिकॉर्ड का चयन करें।
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,व्यय खाते में प्रवेश करें
@@ -3678,7 +3685,7 @@
 DocType: Item Attribute,Numeric Values,संख्यात्मक मान
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,लोगो अटैच
 DocType: Customer,Commission Rate,आयोग दर
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,संस्करण बनाओ
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,संस्करण बनाओ
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,विभाग द्वारा आवेदन छोड़ मै.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,कार्ट खाली है
 DocType: Production Order,Actual Operating Cost,वास्तविक ऑपरेटिंग कॉस्ट
@@ -3695,15 +3702,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item","पुनःक्रमित स्तर सेट करने के लिए, आइटम एक क्रय मद या विनिर्माण आइटम होना चाहिए"
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),(आधा दिन)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(आधा दिन)
 DocType: Supplier,Credit Days,क्रेडिट दिन
 DocType: Leave Type,Is Carry Forward,क्या आगे ले जाना
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,बीओएम से आइटम प्राप्त
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index 3be5668..55de842 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% Naplaćeno
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Tečaj mora biti ista kao {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Naziv klijenta
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Bankovni račun ne može biti imenovan kao {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Bankovni račun ne može biti imenovan kao {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Izvanredna za {0} ne može biti manji od nule ( {1} )
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Novi dopust Primjena
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Novi dopust Primjena
 apps/erpnext/erpnext/setup/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
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Zapis aktivnosti korisnika vezanih uz zadatke koji se mogu koristiti za praćenje vremena, naplate."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Novi {0}: #{1}
 ,Sales Partners Commission,Provizija prodajnih partnera
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Kratica ne može imati više od 5 znakova
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Kratica ne može imati više od 5 znakova
 DocType: Payment Request,Payment Request,Zahtjev za plaćanje
 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.",Značajke Vrijednost {0} nije moguće ukloniti iz {1} kao točka varijante \ postoje s ovim atributom.
@@ -196,6 +196,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,Odaberite Uvjeti
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,Iz vrijednost
 DocType: Production Planning Tool,Sales Orders,Narudžbe kupca
 DocType: Purchase Taxes and Charges,Valuation,Procjena
 ,Purchase Order Trends,Trendovi narudžbenica kupnje
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizija
 DocType: Production Order Operation,Updated via 'Time Log',Ažurirano putem 'Time Log'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Račun {0} ne pripada tvrtki {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Advance iznos ne može biti veći od {0} {1}
 DocType: Naming Series,Series List for this Transaction,Serija Popis za ovu transakciju
 DocType: Sales Invoice,Is Opening Entry,Je Otvaranje unos
 DocType: Customer Group,Mention if non-standard receivable account applicable,Spomenuti ako nestandardni potraživanja računa primjenjivo
@@ -227,7 +229,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Stvara plaće slip za gore navedene kriterije.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Nema opisa
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Zahtjev za kupnju.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/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&gt; Postavke&gt; Imenovanje serije
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Skladište {0} ne pripada tvrtki {1}
 DocType: Item Website Specification,Item Website Specification,Specifikacija web stranice proizvoda
 DocType: Payment Tool,Reference No,Referentni broj
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Neodobreno odsustvo
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Neodobreno odsustvo
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,Annual,godišnji
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock pomirenje točka
 DocType: Stock Entry,Sales Invoice No,Prodajni račun br
@@ -249,7 +251,7 @@
 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 +606,Item {0} is cancelled,Proizvod {0} je otkazan
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Proizvod {0} je otkazan
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Zahtjev za robom
 DocType: Bank Reconciliation,Update Clearance Date,Ažurirajte provjeri datum
 DocType: Item,Purchase Details,Kupnja Detalji
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Otpremnica
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Postavljanje Porezi
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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
@@ -329,7 +331,7 @@
 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 +215,Please see attachment,Pogledajte prilog
 DocType: Purchase Order,% Received,% Zaprimljeno
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Postavke su već kompletne!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Postavke su već kompletne!
 ,Finished Goods,Gotovi proizvodi
 DocType: Delivery Note,Instructions,Instrukcije
 DocType: Quality Inspection,Inspected By,Pregledati
@@ -354,14 +356,13 @@
 ,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 +169,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) mora imati ulogu ""Odobritelj odsustva '"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{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/setup_wizard/install_fixtures.py +39,Medical,Liječnički
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razlog gubitka
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Radna stanica je zatvorena na sljedeće datume po Holiday Popis: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Mogućnosti
 DocType: Employee,Single,Singl
-DocType: Issue,Attachment,Vezanost
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Proračun se ne može postaviti za grupe troška
 DocType: Account,Cost of Goods Sold,Troškovi prodane robe
 DocType: Purchase Invoice,Yearly,Godišnji
@@ -390,7 +391,7 @@
 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 +564,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 +550,Attribute {0} selected multiple times in Attributes Table,Osobina {0} izabrani više puta u Svojstva tablice
 DocType: HR Settings,Employee record is created using selected field. ,Zaposlenika rekord je stvorio pomoću odabranog polja.
 DocType: Sales Order,Not Applicable,Nije primjenjivo
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Majstor za odmor .
@@ -429,7 +430,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,kozmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
 DocType: Shipping Rule,Net Weight,Neto težina
 DocType: Employee,Emergency Phone,Telefon hitne službe
 ,Serial No Warranty Expiry,Istek jamstva serijskog broja
@@ -440,7 +441,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Upravljanje podugovaranje
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Račun {0} ne pripada tvrtki: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Račun {0} ne pripada tvrtki: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Naziv već koristi za drugu tvrtku
 DocType: Selling Settings,Default Customer Group,Zadana grupa kupaca
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ako onemogućite, &#39;Ukupno&#39; Zaobljeni polje neće biti vidljiv u bilo kojoj transakciji"
 DocType: BOM,Operating Cost,Operativni troškovi
@@ -474,6 +476,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Nisu pronađeni zapisi u tablici računa
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Odaberite Društvo i Zabava Tip prvi
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Financijska / obračunska godina.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Akumulirani Vrijednosti
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Žao nam je , Serial Nos ne mogu spojiti"
 DocType: Project Task,Project Task,Zadatak projekta
 ,Lead Id,Id potencijalnog kupca
@@ -495,7 +498,7 @@
 DocType: Quotation,Quotation To,Ponuda za
 DocType: Lead,Middle Income,Srednji Prihodi
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Otvaranje ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Zadana mjerna jedinica za točke {0} se ne može mijenjati izravno, jer ste već napravili neke transakcije (e) s drugim UOM. Morat ćete stvoriti novu stavku za korištenje drugačiji Default UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Zadana mjerna jedinica za točke {0} se ne može mijenjati izravno, jer ste već napravili neke transakcije (e) s drugim UOM. Morat ćete stvoriti novu stavku za korištenje drugačiji Default UOM."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
 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.
@@ -573,7 +576,7 @@
 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 +543,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -586,6 +589,7 @@
 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 +33,Goods received from Suppliers.,Roba dobijena od dobavljača.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,u vrijednost
 DocType: Lead,Campaign Name,Naziv kampanje
 ,Reserved,Rezervirano
 DocType: Purchase Order,Supply Raw Materials,Supply sirovine
@@ -600,16 +604,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Račun s postojećom transakcijom ne može se pretvoriti u glavnu knjigu
 DocType: Delivery Note,Customer's Purchase Order No,Kupca Narudžbenica br
 DocType: Employee,Cell Number,Mobitel Broj
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto materijala Zahtjevi generiran
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Auto materijala Zahtjevi generiran
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Izgubljen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,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/setup_wizard/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.
 DocType: Item Group,Website Specifications,Web Specifikacije
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Došlo je do pogreške u vašem adresnoj predložak {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Novi račun
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} od {1} tipa
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Više Pravila Cijena postoji sa istim kriterijima, molimo rješavanje sukoba dodjeljivanjem prioriteta. Pravila Cijena: {0}"
 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.,Računovodstvo Prijave se mogu podnijeti protiv lisnih čvorova. Prijave protiv grupe nije dopušteno.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne može deaktivirati ili otkazati BOM kao što je povezano s drugim sastavnicama
 DocType: Opportunity,Maintenance,Održavanje
@@ -671,7 +677,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,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/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nemate dopuštenje
 DocType: Company,Default Bank Account,Zadani bankovni račun
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Za filtriranje se temelji na stranke, odaberite stranka Upišite prvi"
@@ -701,13 +707,13 @@
 DocType: Production Planning Tool,Select Items,Odaberite proizvode
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} u odnosu na račun {1} s datumom {2}
 DocType: Maintenance Visit,Completion Status,Završetak Status
-DocType: Sales Invoice Item,Target Warehouse,Ciljana galerija
+DocType: Production Order,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 +50,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/setup_wizard/install_fixtures.py +17,All Item Groups,Sve skupine proizvoda
 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,Neto dobit / gubitak
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Neto dobit / gubitak
 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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status {2}
@@ -715,7 +721,7 @@
 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
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Stavka Varijanta {0} već postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Stavka Varijanta {0} već postoji s istim atributima
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Otvaranje &#39;
 DocType: Notification Control,Delivery Note Message,Otpremnica - poruka
 DocType: Expense Claim,Expenses,troškovi
@@ -725,7 +731,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Istraživanje i razvoj
 ,Amount to Bill,Iznositi Billa
 DocType: Company,Registration Details,Registracija Brodu
-DocType: Item,Re-Order Qty,Re-order Kom
+DocType: Item Reorder,Re-Order Qty,Re-order Kom
 DocType: Leave Block List Date,Leave Block List Date,Datum popisa neodobrenih odsustava
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planirano za slanje na {0}
 DocType: Pricing Rule,Price or Discount,Cijena i popust
@@ -768,7 +774,7 @@
 DocType: Bank Reconciliation,Total Amount,Ukupan iznos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet izdavaštvo
 DocType: Production Planning Tool,Production Orders,Nalozi
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Vrijednost bilance
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Vrijednost bilance
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Prodajni cjenik
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Objavi sinkronizirati stavke
 DocType: Bank Reconciliation,Account Currency,Valuta računa
@@ -777,7 +783,7 @@
 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 +538,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -854,7 +860,7 @@
 DocType: POS Profile,Cash/Bank Account,Novac / bankovni račun
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Osobina stol je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Popust
@@ -882,7 +888,7 @@
 DocType: Tax Rule,Shipping State,Državna dostava
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Stavka mora biti dodana pomoću 'se predmeti od kupnje primitaka' gumb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Prodajni troškovi
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Standardna kupnju
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Standardna kupnju
 DocType: GL Entry,Against,Protiv
 DocType: Item,Default Selling Cost Center,Zadani trošak prodaje
 DocType: Sales Partner,Implementation Partner,Provedba partner
@@ -924,7 +930,7 @@
 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 +210,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/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Molimo postavite &quot;Primijeni dodatni popust na &#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Molimo postavite &quot;Primijeni dodatni popust na &#39;
 ,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.
@@ -992,9 +998,9 @@
 DocType: Contact,User ID,Korisnički ID
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Pogledaj Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najstarije
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Proizvodnja protiv prodaje Reda
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Ostatak svijeta
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1024,7 +1030,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Mali
 DocType: Employee,Employee Number,Broj zaposlenika
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Slučaj Ne ( i) je već u uporabi . Pokušajte s predmetu broj {0}
@@ -1043,7 +1049,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Poljoprivreda
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Vaši proizvodi ili usluge
 DocType: Mode of Payment,Mode of Payment,Način plaćanja
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Web slika bi trebala biti javna datoteke ili URL web stranice
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Web slika bi trebala biti javna datoteke ili URL web stranice
 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
@@ -1115,6 +1121,7 @@
 DocType: Address,Utilities,Komunalne usluge
 DocType: Purchase Invoice Item,Accounting,Knjigovodstvo
 DocType: Features Setup,Features Setup,Značajke postavki
+DocType: Item,Is Service Item,Je usluga
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Razdoblje prijava ne može biti izvan dopusta raspodjele
 DocType: Activity Cost,Projects,Projekti
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Odaberite Fiskalna godina
@@ -1145,7 +1152,7 @@
 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 +465,cannot be greater than 100,ne može biti veće od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Proizvod {0} nije skladišni proizvod
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1205,7 +1212,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Vlada
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Stavka Varijante
 DocType: Company,Services,Usluge
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Ukupno ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Ukupno ({0})
 DocType: Cost Center,Parent Cost Center,Nadređeni troškovni centar
 DocType: Sales Invoice,Source,Izvor
 DocType: Leave Type,Is Leave Without Pay,Je Ostavite bez plaće
@@ -1278,17 +1285,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ponovno slanje plaćanja Email
 DocType: Dependent Task,Dependent Task,Ovisno zadatak
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Pogledaj
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Neto promjena u gotovini
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Neto promjena u gotovini
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plaća Struktura Odbitak
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Zahtjev za plaćanje već postoji {0}
 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 +182,Quantity must not be more than {0},Količina ne smije biti veća od {0}
@@ -1350,7 +1357,7 @@
 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: Packed 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
@@ -1359,7 +1366,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Tvrtka , Mjesec i Fiskalna godina je obvezno"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Troškovi marketinga
 ,Item Shortage Report,Nedostatak izvješća za proizvod
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spomenuto, \n Molimo spomenuti ""težinu UOM"" previše"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spomenuto, \n Molimo spomenuti ""težinu UOM"" previše"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Zahtjev za robom korišten za izradu ovog ulaza robe
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Jedna jedinica stavku.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',"Vrijeme Log Batch {0} mora biti "" Postavio '"
@@ -1370,6 +1377,7 @@
 DocType: Employee,Date Of Retirement,Datum odlaska u mirovinu
 DocType: Upload Attendance,Get Template,Kreiraj predložak
 DocType: Address,Postal,Poštanski
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext dovršeno!
 DocType: Item,Weightage,Weightage
 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.
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Odaberite {0} na prvom mjestu.
@@ -1398,12 +1406,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Previše stupovi. Izvesti izvješće i ispisati pomoću aplikacije za proračunske tablice.
 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 +139,Main,Glavni
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Glavni
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Varijanta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Postavite prefiks za numeriranje niza na svoje transakcije
 DocType: Employee Attendance Tool,Employees HTML,Zaposlenici HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,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 +367,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/stock/doctype/item/item.py +361,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
@@ -1428,7 +1436,6 @@
 DocType: Sales Order,To Deliver and Bill,Za isporuku i Bill
 DocType: GL Entry,Credit Amount in Account Currency,Kreditna Iznos u valuti računa
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Vrijeme Trupci za proizvodnju.
-DocType: Item,Apply Warehouse-wise Reorder Level,Nanesite skladište mudar preuredili razine
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} mora biti podnesen
 DocType: Authorization Control,Authorization Control,Kontrola autorizacije
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Red # {0}: Odbijen Skladište je obvezna protiv odbijena točka {1}
@@ -1527,6 +1534,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Red # {0}: {1} Operacija nije završeno za {2} kom gotovih proizvoda u proizvodnji Naručite # {3}. Molimo ažurirati status rada preko Vrijeme Trupci
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investicije
 DocType: Issue,Resolution Details,Rezolucija o Brodu
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,izdvajanja
 DocType: Quality Inspection Reading,Acceptance Criteria,Kriterij prihvaćanja
 DocType: Item Attribute,Attribute Name,Ime atributa
 DocType: Item Group,Show In Website,Pokaži na web stranici
@@ -1577,7 +1585,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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
 DocType: Leave Block List Allow,Leave Block List Allow,Odobrenje popisa neodobrenih odsustava
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr ne može biti prazno ili prostora
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr ne može biti prazno ili prostora
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grupa ne-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportovi
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Ukupno Stvarni
@@ -1618,7 +1626,7 @@
 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**.
 DocType: Opportunity,Customer / Lead Address,Kupac / Olovo Adresa
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL potvrda o vezanosti {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL potvrda o vezanosti {0}
 DocType: Production Order Operation,Actual Operation Time,Stvarni Operacija vrijeme
 DocType: Authorization Rule,Applicable To (User),Odnosi se na (Upute)
 DocType: Purchase Taxes and Charges,Deduct,Odbiti
@@ -1767,7 +1775,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Slučaj broj ne može 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,Ako imate prodajnog tima i prodaja partnerima (partneri) mogu biti označene i održavati svoj doprinos u prodajne aktivnosti
 DocType: Item,Show a slideshow at the top of the page,Prikaži slideshow na vrhu stranice
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,prodavaonice
+DocType: Item,"Allow in Sales Order of type ""Service""",Dopusti u prodajni nalog tipa &quot;usluge&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,prodavaonice
 DocType: Time Log,Projects Manager,Projekti Manager
 DocType: Serial No,Delivery Time,Vrijeme isporuke
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Starenje temelju On
@@ -1792,7 +1801,7 @@
 ,Financial Analytics,Financijska analitika
 DocType: Quality Inspection,Verified By,Ovjeren od strane
 DocType: Address,Subsidiary,Podružnica
-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 mogu promijeniti tvrtke zadanu valutu , jer postoje neki poslovi . Transakcije mora biti otkazana promijeniti zadanu valutu ."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Ne mogu promijeniti tvrtke zadanu valutu , jer postoje neki poslovi . Transakcije mora biti otkazana promijeniti zadanu valutu ."
 DocType: Quality Inspection,Purchase Receipt No,Primka br.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,kapara
 DocType: Process Payroll,Create Salary Slip,Stvaranje plaće Slip
@@ -1840,7 +1849,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Sirovine ne može biti prazno.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Ne može se ažurirati zaliha, fakture sadrži drop shipping stavke."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 &#39;Je rednim&#39;, &#39;Je batch Ne&#39;, &#39;Je kataloški Stavka &quot;i&quot; Vrednovanje metoda&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Brzo Temeljnica
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti cijenu ako je sastavnica spomenuta u bilo kojem proizvodu
@@ -1949,7 +1958,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Molimo Isporuka Napomena prvo
 DocType: Purchase Invoice,Currency and Price List,Valuta i cjenik
 DocType: Opportunity,Customer / Lead Name,Kupac / Potencijalni kupac
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Razmak Datum nije spomenuo
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Razmak Datum nije spomenuo
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Proizvodnja
 DocType: Item,Allow Production Order,Dopustite proizvodni nalog
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Red {0} : Datum početka mora biti prije datuma završetka
@@ -1959,7 +1968,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Nadređeni tip
 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 +118,My Addresses,Moje Adrese
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Moje Adrese
 DocType: Stock Ledger Entry,Outgoing Rate,Odlazni Ocijenite
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Organizacija grana majstor .
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,ili
@@ -2028,7 +2037,7 @@
 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 +302,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 +95,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.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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
 DocType: Purchase Invoice,Taxes and Charges Deducted,Porezi i naknade oduzeti
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Pitanja
@@ -2045,7 +2054,7 @@
 ,Sales Browser,prodaja preglednik
 DocType: Journal Entry,Total Credit,Ukupna kreditna
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} # {1} postoji protiv ulaska dionicama {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Lokalno
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Veliki
@@ -2064,7 +2073,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Sve prodajnih transakcija može biti označene protiv više osoba ** prodaje **, tako da možete postaviti i pratiti ciljeve."
 ,S.O. No.,N.K.br.
 DocType: Production Order Operation,Make Time Log,Napravi vrijeme prijave
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Molimo postavite naručivanja količinu
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Molimo stvoriti kupac iz Olovo {0}
 DocType: Price List,Applicable for Countries,Primjenjivo za zemlje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Računala
@@ -2151,7 +2159,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Kreiraj relevantne ulaze
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Knjiženje na skladištu
 DocType: Sales Invoice,Sales Team1,Prodaja Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Proizvod {0} ne postoji
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Proizvod {0} ne postoji
 DocType: Sales Invoice,Customer Address,Kupac Adresa
 DocType: Payment Request,Recipient and Message,Primatelj i poruka
 DocType: Purchase Invoice,Apply Additional Discount On,Nanesite dodatni popust na
@@ -2193,7 +2201,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Stopa vrednovanja
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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
@@ -2231,7 +2239,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Unesite olakšavanja datum .
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Samo zahtjev za odsustvom sa statusom ""Odobreno"" se može potvrditi"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Naziv adrese je obavezan.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Naziv adrese je obavezan.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Unesite naziv kampanje, ako je izvor upit je kampanja"
 apps/erpnext/erpnext/setup/setup_wizard/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
@@ -2255,6 +2263,7 @@
 DocType: UOM,Must be Whole Number,Mora biti cijeli broj
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Novi Lišće alociran (u danima)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serijski Ne {0} ne postoji
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Kupac skladišta (po izboru)
 DocType: Pricing Rule,Discount Percentage,Postotak popusta
 DocType: Payment Reconciliation Invoice,Invoice Number,Račun broj
 apps/erpnext/erpnext/hooks.py +55,Orders,Narudžbe
@@ -2364,7 +2373,7 @@
 DocType: Appraisal,Appraisal,Procjena
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum se ponavlja
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Ovlašteni potpisnik
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,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 +184,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
@@ -2533,7 +2542,7 @@
 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
 DocType: Sales Order Item,Supplier delivers to Customer,Dobavljač dostavlja Kupcu
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Pokaži porez raspada
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Pokaži porez raspada
 apps/erpnext/erpnext/accounts/party.py +283,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 '
@@ -2583,7 +2592,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,Ponovno upišite naziv tvrtke za potvrdu
@@ -2610,9 +2619,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Plaća Struktura
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Višestruki Cijena postoji pravilo s istim kriterijima, molimo rješavanje sukoba \
- dodjeljivanjem prioriteta. Cijena Pravila: {0}"
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aviokompanija
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Izdavanje materijala
@@ -2637,7 +2643,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vrijednosni papiri i robne razmjene
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Zadana mjerna jedinica za Variant &#39;{0}&#39; mora biti isti kao u predložak &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Zadana mjerna jedinica za Variant &#39;{0}&#39; mora biti isti kao u predložak &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun temeljen na
 DocType: Delivery Note Item,From Warehouse,Iz skladišta
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednovanje i Total
@@ -2646,7 +2652,7 @@
 DocType: Account,Purchase User,Kupnja Korisnik
 DocType: Notification Control,Customize the Notification,Prilagodi obavijest
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Novčani tijek iz redovnog poslovanja
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Zadani predložak adrese ne može se izbrisati
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Zadani predložak adrese ne može se izbrisati
 DocType: Sales Invoice,Shipping Rule,Dostava Pravilo
 DocType: Manufacturer,Limited to 12 characters,Ograničiti na 12 znakova
 DocType: Journal Entry,Print Heading,Ispis naslova
@@ -2740,7 +2746,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,trgovački
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Super usluge
@@ -2759,7 +2765,7 @@
 DocType: Customer,Default Receivable Accounts,Default receivable račune
 DocType: Tax Rule,Billing State,Državna naplate
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Prijenos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,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 +95,Due Date is mandatory,Datum dospijeća je obavezno
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Pomak za Osobina {0} ne može biti 0
@@ -2792,7 +2798,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Privremeni dobit / gubitak (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Privremeni dobit / gubitak (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Povratak protiv prodaje fakturu
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Stavka 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Molimo postavite zadanu vrijednost {0} u Društvu {1}
@@ -2823,6 +2829,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Dodaj dijete
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Uloga dopušteno postavljanje blokada računa i uređivanje Frozen Entries
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Ne može se pretvoriti troška za knjigu , kao da ima djece čvorova"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Otvaranje vrijednost
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serijski #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Komisija za prodaju
 DocType: Offer Letter Term,Value / Description,Vrijednost / Opis
@@ -2856,7 +2863,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Uspješno izbrisati sve transakcije vezane uz ovu tvrtku!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kao i na datum
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probni rad
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Glavno skladište je obvezno za skladišni proizvod.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Isplata plaće za mjesec {0} i godina {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto umetak Cjenik stopa ako nedostaje
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Ukupno uplaćeni iznos
@@ -2892,7 +2898,7 @@
 DocType: Payment Tool,Set Matching Amounts,Postavite Odgovarajući Iznosi
 DocType: Purchase Invoice,Taxes and Charges Added,Porezi i naknade Dodano
 ,Sales Funnel,prodaja dimnjak
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Naziv je obavezno
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Naziv je obavezno
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Hvala vam na interesu za pretplate na naše ažuriranja
 ,Qty to Transfer,Količina za prijenos
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Ponude za kupce ili potencijalne kupce.
@@ -2920,7 +2926,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} je zaustavljen
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Barkod {0} se već koristi u proizvodu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Nadolazeći događaji
@@ -2943,7 +2949,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Odaberite fiskalnu godinu ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS Profil potrebna da bi POS unos
 DocType: Hub Settings,Name Token,Naziv tokena
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Standardna prodaja
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Standardna prodaja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -3023,7 +3029,7 @@
 DocType: Address,Shipping,Utovar
 DocType: Stock Ledger Entry,Stock Ledger Entry,Upis u glavnu knjigu
 DocType: Department,Leave Block List,Popis neodobrenih odsustva
-DocType: Customer,Tax ID,Porezni broj
+DocType: Customer,Tax ID,OIB
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Stavka {0} nije setup za serijski brojevi Stupac mora biti prazan
 DocType: Accounts Settings,Accounts Settings,Postavke računa
 DocType: Customer,Sales Partner and Commission,Prodaja partner i komisija
@@ -3066,7 +3072,7 @@
 DocType: Sales Invoice,Paid Amount,Plaćeni iznos
 ,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"
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,"Postavljanje Ova adresa predloška kao zadano, jer nema drugog zadano"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje računa već u zaduženje, ne smiju postaviti 'ravnoteža se mora' kao 'kreditne'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Upravljanje kvalitetom
 DocType: Production Planning Tool,Filter based on customer,Filtriranje prema kupcima
@@ -3167,7 +3173,7 @@
 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 +19,Shortage Qty,Nedostatak Kom
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Do datuma ' je potrebno
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Izradi pakiranje gaćice za pakete biti isporučena. Koristi se za obavijesti paket broj, sadržaj paketa i njegovu težinu."
@@ -3178,7 +3184,7 @@
 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 &quot;Postavio&quot;, e-mail pop-up automatski otvorio poslati e-mail na povezane &quot;Kontakt&quot; 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 +749,It is needed to fetch Item Details.,To je potrebno kako bi dohvatili Stavka Pojedinosti.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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
@@ -3204,6 +3210,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: C-Form,Series,Serija
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,Klasifikacija predmeta
@@ -3290,7 +3297,7 @@
 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 +434,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 +420,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."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kupnja Master Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Proizvodnja Red {0} mora biti podnesen
@@ -3298,7 +3305,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Glavno izvješće
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Do danas ne može biti prije od datuma
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Dodaj / Uredi cijene
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Moje narudžbe
@@ -3346,7 +3353,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Red # {0}: Postavite dobavljač za stavke {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Web stranica slike {0} prilogu točki {1} Ne mogu naći
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Web stranica slike {0} prilogu točki {1} Ne mogu naći
 DocType: Issue,Content Type,Vrsta sadržaja
 apps/erpnext/erpnext/setup/setup_wizard/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.
@@ -3360,7 +3367,7 @@
 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 +357,'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 +351,'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
@@ -3386,7 +3393,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Zatvaranje računa {0} mora biti tipa odgovornosti / Equity
 DocType: Authorization Rule,Based On,Na temelju
 DocType: Sales Order Item,Ordered Qty,Naručena kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Stavka {0} je onemogućen
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +168,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.
@@ -3394,7 +3401,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Kupnja treba biti provjerena, ako je primjenjivo za odabrano kao {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Popust mora biti manji od 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Otpis iznos (Društvo valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Red # {0}: Molimo postavite naručivanja količinu
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Red # {0}: Molimo postavite naručivanja količinu
 DocType: Landed Cost Voucher,Landed Cost Voucher,Nalog zavisnog troška
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Molimo postavite {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ponovite na dan u mjesecu
@@ -3467,7 +3474,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Pogledaj sada
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Odaberite razdoblje kada faktura će biti generiran automatski
 DocType: BOM,Raw Material Cost,Troškova sirovine
-DocType: Item,Re-Order Level,Ponovno bi razini
+DocType: Item Reorder,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.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Privemeno (nepuno radno vrijeme)
 DocType: Employee,Applicable Holiday List,Primjenjivo odmor Popis
@@ -3522,7 +3529,7 @@
 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 +573,Please specify Attribute Value for attribute {0},Navedite značajke vrijednost za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3601,7 +3608,7 @@
 DocType: Address,Office,Ured
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Knjigovodstvene temeljnice
 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 +226,Please select Employee Record first.,Odaberite zaposlenika rekord prvi.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,Odaberite zaposlenika rekord prvi.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,Unesite trošak računa
@@ -3676,7 +3683,7 @@
 DocType: Item Attribute,Numeric Values,Brojčane vrijednosti
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Pričvrstite Logo
 DocType: Customer,Commission Rate,Komisija Stopa
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Napravite varijanta
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Napravite varijanta
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Blok ostaviti aplikacija odjelu.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Košarica je prazna
 DocType: Production Order,Actual Operating Cost,Stvarni operativni trošak
@@ -3693,15 +3700,14 @@
 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 +380,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 +419,"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 +408,"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 +380, (Half Day),(Pola dana)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv
index ff166a1..d2853c0 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% számlázva
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Az Exchange Rate meg kell egyeznie a {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Vevő neve
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},A bankszámla nem nevezhetjük {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},A bankszámla nem nevezhetjük {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),"Kiemelkedő {0} nem lehet kevesebb, mint nulla ({1})"
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Új Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Új Leave Application
 apps/erpnext/erpnext/setup/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
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Bejelentkezés végzett tevékenységek, amelyeket a felhasználók ellen feladatok, melyek az adatok nyomon követhetők időt, számlázási."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Új {0}: # {1}
 ,Sales Partners Commission,Értékesítő partner jutaléka
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,"Rövidítése nem lehet több, mint 5 karakter"
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,"Rövidítése nem lehet több, mint 5 karakter"
 DocType: Payment Request,Payment Request,Kifizetési kérelem
 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.","Jellemző értéke {0} nem távolítható el {1}, mint Besorolás változatok \ létezni ezzel a tulajdonsággal."
@@ -195,6 +195,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,Válassza ki Feltételek
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,ki érték
 DocType: Production Planning Tool,Sales Orders,Vevőmegrendelés
 DocType: Purchase Taxes and Charges,Valuation,Értékelés
 ,Purchase Order Trends,Megrendelés Trends
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televízió
 DocType: Production Order Operation,Updated via 'Time Log',"Frissítve keresztül ""Idő Log"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Account {0} nem tartozik Company {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},"Advance összege nem lehet nagyobb, mint {0} {1}"
 DocType: Naming Series,Series List for this Transaction,Sorozat List ehhez a tranzakcióhoz
 DocType: Sales Invoice,Is Opening Entry,Ez nyitó tétel?
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Beszélve, ha nem szabványos követelés véve az alkalmazandó"
@@ -226,17 +228,17 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Bérlap létrehozása a fenti kritériumok alapján.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Nem megadott leírás
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Kérheti a vásárlást.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/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&gt; Beállítások&gt; 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 +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 +178,Warehouse {0} does not belong to company {1},Warehouse {0} nem tartozik a cég {1}
+apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},{0} raktár nem tartozik a {1} céghez
 DocType: Item Website Specification,Item Website Specification,Az anyag weboldala
 DocType: Payment Tool,Reference No,Hivatkozási szám
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Hagyja Blokkolt
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Hagyja Blokkolt
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,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
@@ -248,7 +250,7 @@
 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 +606,Item {0} is cancelled,{0} elem törölve
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,{0} elem törölve
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,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
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Szállítólevél
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Beállítása Adók
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} belépett kétszer tétel adó
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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"
@@ -327,7 +329,7 @@
 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 +215,Please see attachment,"Kérjük, olvassa mellékletet"
 DocType: Purchase Order,% Received,% fogadva
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Beállítás Már Komplett !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Beállítás Már Komplett !!
 ,Finished Goods,Készáru
 DocType: Delivery Note,Instructions,Utasítások
 DocType: Quality Inspection,Inspected By,Megvizsgálta
@@ -352,14 +354,13 @@
 ,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 +169,{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 +189,{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/setup_wizard/install_fixtures.py +39,Medical,Orvosi
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Veszteség indoka
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Munkaállomás zárva a következő időpontokban per Nyaralás listája: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Lehetőségek
 DocType: Employee,Single,Egyedülálló
-DocType: Issue,Attachment,Attachment
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Költségvetést nem lehet beállítani Group Cost Center
 DocType: Account,Cost of Goods Sold,Az eladott áruk beszerzési
 DocType: Purchase Invoice,Yearly,Évi
@@ -388,7 +389,7 @@
 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 +564,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 +550,Attribute {0} selected multiple times in Attributes Table,Képesség {0} kiválasztott többször attribútumok táblázat
 DocType: HR Settings,Employee record is created using selected field. ,Munkavállalói rekord jön létre a kiválasztott mező.
 DocType: Sales Order,Not Applicable,Nem értelmezhető
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Nyaralás mester.
@@ -427,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Kozmetikum
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"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: 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
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Ügyvezető alvállalkozói munkák
 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"
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Account {0} nem tartozik a cég: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Account {0} nem tartozik a cég: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Rövidítése már használja egy másik cég
 DocType: Selling Settings,Default Customer Group,Alapértelmezett Vásárlói csoport
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ha kikapcsolod, a 'Kerekített összesen' mező nem fog látszódni sehol sem"
 DocType: BOM,Operating Cost,A működési költségek
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Nincs bejegyzés találat a számlatáblázat
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Kérjük, válasszon Társaság és a Party Type első"
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Pénzügyi / számviteli év.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Halmozott értékek
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sajnáljuk, Serial Nos nem lehet összevonni,"
 DocType: Project Task,Project Task,Projekt feladat
 ,Lead Id,Célpont ID
@@ -492,7 +495,7 @@
 DocType: Quotation,Quotation To,Árajánlat az ő részére
 DocType: Lead,Middle Income,Közepes jövedelmű
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Alapértelmezett mértékegysége pont {0} nem lehet megváltoztatni közvetlenül, mert már tett néhány tranzakció (k) másik UOM. Szükséged lesz egy új tétel, hogy egy másik Alapértelmezett UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Alapértelmezett mértékegysége pont {0} nem lehet megváltoztatni közvetlenül, mert már tett néhány tranzakció (k) másik UOM. Szükséged lesz egy új tétel, hogy egy másik Alapértelmezett UOM."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Elkülönített összeg nem lehet negatív
 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.
@@ -570,7 +573,7 @@
 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 +543,Item has variants.,Tételnek változatok.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -583,6 +586,7 @@
 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 +33,Goods received from Suppliers.,Áruk szállítóktól kapott.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,Az Érték
 DocType: Lead,Campaign Name,Kampány neve
 ,Reserved,Fenntartott
 DocType: Purchase Order,Supply Raw Materials,Supply nyersanyagok
@@ -597,16 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Véve a meglévő tranzakciós nem lehet átalakítani főkönyvi
 DocType: Delivery Note,Customer's Purchase Order No,A Vevő rendelésének száma
 DocType: Employee,Cell Number,Mobilszám
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Anyag kéréseket
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Auto Anyag kéréseket
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Elveszett
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,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/setup_wizard/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.
 DocType: Item Group,Website Specifications,Honlapok
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Van egy hiba a Címsablon {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,New Account
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: A {0} típusú {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor kötelező
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Több Ár szabályzat létezik azonos kritériumok, kérjük megoldani konfliktus elsőbbséget. Ár Szabályok: {0}"
 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.,Könyvelési tételek nem lehet neki felróni az ágakat. Bejegyzés elleni csoportjai nem engedélyezettek.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nem lehet kikapcsolni vagy törölni BOM mivel kapcsolódik más Darabjegyzékeket
 DocType: Opportunity,Maintenance,Karbantartás
@@ -649,7 +655,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,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/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Figyelmeztetés: Érvénytelen Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Figyelmeztetés: Érvénytelen Attachment {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nincs jogosultság
 DocType: Company,Default Bank Account,Alapértelmezett bankszámlaszám
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Kiszűrni alapuló párt, válasszuk a párt Írja első"
@@ -679,13 +685,13 @@
 DocType: Production Planning Tool,Select Items,Válassza ki az elemeket
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} ellen Bill {1} kelt {2}
 DocType: Maintenance Visit,Completion Status,Készültségi állapot
-DocType: Sales Invoice Item,Target Warehouse,Cél raktár
+DocType: Production Order,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 +50,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/setup_wizard/install_fixtures.py +17,All Item Groups,Minden tétel Csoportok
 DocType: Process Payroll,Activity Log,Tevékenység
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Nettó nyereség / veszteség
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Nettó nyereség / veszteség
 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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} állapot {2}
@@ -693,7 +699,7 @@
 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
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Elem Variant {0} már létezik azonos tulajdonságú
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Elem Variant {0} már létezik azonos tulajdonságú
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',"""Nyitás"""
 DocType: Notification Control,Delivery Note Message,Szállítólevél szövege
 DocType: Expense Claim,Expenses,Költségek
@@ -703,7 +709,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Kutatás és fejlesztés
 ,Amount to Bill,Összeget számlázni
 DocType: Company,Registration Details,Regisztrációs adatok
-DocType: Item,Re-Order Qty,Re-Order Mennyiség
+DocType: Item Reorder,Re-Order Qty,Re-Order Mennyiség
 DocType: Leave Block List Date,Leave Block List Date,Hagyja Block List dátuma
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Ütemezett küldeni a {0}
 DocType: Pricing Rule,Price or Discount,Árazás vagy engedmény
@@ -746,7 +752,7 @@
 DocType: Bank Reconciliation,Total Amount,Összesen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Gyártási rendelések
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balance Érték
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Balance Érték
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Értékesítési árlista
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Közzé szinkronizálni tételek
 DocType: Bank Reconciliation,Account Currency,A fiók pénzneme
@@ -755,7 +761,7 @@
 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 +538,Item Variants {0} updated,Elem változatok {0} frissített
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -832,7 +838,7 @@
 DocType: POS Profile,Cash/Bank Account,Cash / Bank Account
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Attribútum tábla kötelező
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Kedvezmény
@@ -860,7 +866,7 @@
 DocType: Tax Rule,Shipping State,Szállítási állam
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Elemet kell hozzá az 'hogy elemeket vásárlása bevételek ""gombot"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Az értékesítési költségek
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Normál vásárlás
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Normál vásárlás
 DocType: GL Entry,Against,Ellen
 DocType: Item,Default Selling Cost Center,Alapértelmezett Selling Cost Center
 DocType: Sales Partner,Implementation Partner,Kivitelező partner
@@ -902,7 +908,7 @@
 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 +210,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/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',"Kérjük, állítsa be az &quot;Apply További kedvezmény&quot;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',"Kérjük, állítsa be az &quot;Apply További kedvezmény&quot;"
 ,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.
@@ -970,9 +976,9 @@
 DocType: Contact,User ID,Felhasználó ID
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Kilátás Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Legkorábbi
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Gyártás ellen Vevői
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,A világ többi része
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1002,7 +1008,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Sajnáljuk, a vállalatok nem lehet összevonni,"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Sajnáljuk, a vállalatok nem lehet összevonni,"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Kis
 DocType: Employee,Employee Number,Munkavállalói száma
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Case szám (ok) már használatban van. Próbálja a Case {0}
@@ -1021,7 +1027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Mezőgazdaság
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,A termékek vagy szolgáltatások
 DocType: Mode of Payment,Mode of Payment,Fizetési mód
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Weboldal kép legyen nyilvános fájl vagy weboldal URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Weboldal kép legyen nyilvános fájl vagy weboldal URL
 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ó
@@ -1093,6 +1099,7 @@
 DocType: Address,Utilities,Segédletek
 DocType: Purchase Invoice Item,Accounting,Könyvelés
 DocType: Features Setup,Features Setup,Funkciók beállítása
+DocType: Item,Is Service Item,A szolgáltatás Elem
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Jelentkezési határidő nem lehet kívülről szabadság kiosztási időszak
 DocType: Activity Cost,Projects,Projektek
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Kérjük, válasszon pénzügyi év"
@@ -1123,7 +1130,7 @@
 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 +465,cannot be greater than 100,"nem lehet nagyobb, mint 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Elem {0} nem Stock tétel
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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"
@@ -1182,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Kormány
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Elem változatok
 DocType: Company,Services,Szolgáltatások
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Összesen ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Összesen ({0})
 DocType: Cost Center,Parent Cost Center,Szülő Cost Center
 DocType: Sales Invoice,Source,Forrás
 DocType: Leave Type,Is Leave Without Pay,A fizetés nélküli szabadságon
@@ -1255,17 +1262,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Küldje el újra Fizetési E-mail
 DocType: Dependent Task,Dependent Task,Függő Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} megtekintése
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Nettó Cash
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Nettó Cash
 DocType: Salary Structure Deduction,Salary Structure Deduction,Bérszerkeztet levonása
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Kifizetési kérelmet már létezik: {0}
 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 +182,Quantity must not be more than {0},"Mennyiség nem lehet több, mint {0}"
@@ -1327,7 +1334,7 @@
 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: Packed 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
@@ -1336,7 +1343,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Cég, hónap és költségvetési évben kötelező"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Marketing költségek
 ,Item Shortage Report,Elem Hiány jelentés
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Súly említik, \ nKérlek beszélve ""Súly UOM"" túl"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Súly említik, \ nKérlek beszélve ""Súly UOM"" túl"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Anyaga Request használják e Stock Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Egy darab anyag.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',"A(z) {0} időnapló gyűjtőt be kell ""Küldeni"""
@@ -1347,6 +1354,7 @@
 DocType: Employee,Date Of Retirement,A nyugdíjazás
 DocType: Upload Attendance,Get Template,Get Template
 DocType: Address,Postal,Postai
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext beállítása befejeződött!
 DocType: Item,Weightage,Súlyozás
 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"
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,"Kérjük, válassza ki a {0} először."
@@ -1375,12 +1383,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,"Túl sok oszlop. Exportálja a jelentést, és nyomtassa ki táblázatkezelő program segítségével."
 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 +139,Main,Legfontosabb
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Legfontosabb
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variáns
 DocType: Naming Series,Set prefix for numbering series on your transactions,Előtagja a számozás sorozat a tranzakciók
 DocType: Employee Attendance Tool,Employees HTML,Alkalmazottak HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,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 +367,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/stock/doctype/item/item.py +361,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
@@ -1405,7 +1413,6 @@
 DocType: Sales Order,To Deliver and Bill,Szállítani és Bill
 DocType: GL Entry,Credit Amount in Account Currency,A hitel összege a számla pénzneme
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Time Naplók gyártás.
-DocType: Item,Apply Warehouse-wise Reorder Level,Alkalmazni Warehouse-bölcs Reorder Level
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} kell benyújtani
 DocType: Authorization Control,Authorization Control,Felhatalmazásvezérlés
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Sor # {0}: Elutasítva Warehouse kötelező elleni elutasított elem {1}
@@ -1503,6 +1510,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,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} nem fejeződik be a {2} Mennyiség késztermékek a gyártási utasítás # {3}. Kérjük, frissítse az operációs státuszt keresztül Time Naplók"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Befektetések
 DocType: Issue,Resolution Details,Megoldás részletei
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,A kiosztandó
 DocType: Quality Inspection Reading,Acceptance Criteria,Elfogadási határ
 DocType: Item Attribute,Attribute Name,Jellemző neve
 DocType: Item Group,Show In Website,Weboldalon megjelenjen
@@ -1553,7 +1561,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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
 DocType: Leave Block List Allow,Leave Block List Allow,Hagyja Block List engedélyezése
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Rövidített nem lehet üres vagy hely
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Rövidített nem lehet üres vagy hely
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Csoport Csoporton kívüli
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Összesen Aktuális
@@ -1594,7 +1602,7 @@
 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 **."
 DocType: Opportunity,Customer / Lead Address,Vevő / Célpont címe
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Figyelmeztetés: Érvénytelen SSL tanúsítvány mellékletet {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Figyelmeztetés: Érvénytelen SSL tanúsítvány mellékletet {0}
 DocType: Production Order Operation,Actual Operation Time,Aktuális üzemidő
 DocType: Authorization Rule,Applicable To (User),Alkalmazandó (Felhasználó)
 DocType: Purchase Taxes and Charges,Deduct,Levonási
@@ -1743,7 +1751,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case Nem. Nem lehet 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,"Ha értékesítési csapat és eladó Partners (Channel Partners) akkor kell jelölni, és megtartják hozzájárulást az értékesítési tevékenység"
 DocType: Item,Show a slideshow at the top of the page,Mutass egy slideshow a lap tetején
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Üzletek
+DocType: Item,"Allow in Sales Order of type ""Service""",Hagyjuk a vevői rendelés típusú &quot;Service&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Üzletek
 DocType: Time Log,Projects Manager,Projekt menedzser
 DocType: Serial No,Delivery Time,Szállítási idő
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing alapszik
@@ -1768,7 +1777,7 @@
 ,Financial Analytics,Pénzügyi analitika
 DocType: Quality Inspection,Verified By,Ellenőrizte
 DocType: Address,Subsidiary,Leányvállalat
-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.","Nem lehet megváltoztatni cég alapértelmezett valuta, mert már vannak tranzakciókat. Tranzakciók törölni kell változtatni az alapértelmezett pénznem."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nem lehet megváltoztatni cég alapértelmezett valuta, mert már vannak tranzakciókat. Tranzakciók törölni kell változtatni az alapértelmezett pénznem."
 DocType: Quality Inspection,Purchase Receipt No,Vásárlási nyugta nincs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Keresett pénz
 DocType: Process Payroll,Create Salary Slip,Bérlap létrehozása
@@ -1816,7 +1825,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Nyersanyagok nem lehet üres.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Nem sikerült frissíteni a készletek, számla tartalmaz csepp szállítási elemet."
 DocType: Newsletter,Test,Teszt
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 &quot;Has Serial No&quot;, &quot;a kötegelt Nem&quot;, &quot;Úgy Stock pont&quot; és &quot;értékelési módszer&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Gyors Naplókönyvelés
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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"
@@ -1905,7 +1914,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,"Kérjük, szállítólevél első"
 DocType: Purchase Invoice,Currency and Price List,Pénznem és árlista
 DocType: Opportunity,Customer / Lead Name,Vevő / Célpont neve
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Távolság dátuma nem szerepel
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Távolság dátuma nem szerepel
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Termelés
 DocType: Item,Allow Production Order,Gyártási rendelés engedélyezése
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: kezdő dátumot kell lennie a befejezés dátuma
@@ -1915,7 +1924,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 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 +118,My Addresses,Saját címek
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Saját címek
 DocType: Stock Ledger Entry,Outgoing Rate,Kimenő Rate
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Szervezet ága mester.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,vagy
@@ -1984,7 +1993,7 @@
 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 +302,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 +95,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."
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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ó
 DocType: Purchase Invoice,Taxes and Charges Deducted,Levont adók és költségek
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Problémák
@@ -2001,7 +2010,7 @@
 ,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 +499,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/setup_wizard/setup_wizard.py +392,Local,Helyi
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Nagy
@@ -2020,7 +2029,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Minden értékesítési tranzakciók lehet címkézett ellen több ** értékesítők ** így, és kövesse nyomon célokat."
 ,S.O. No.,SO No.
 DocType: Production Order Operation,Make Time Log,Legyen ideje Bejelentkezés
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,"Kérjük, állítsa újrarendezésből mennyiség"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},"Kérjük, hozzon létre Ügyfél a Lead {0}"
 DocType: Price List,Applicable for Countries,Alkalmazható Országok
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Számítógépek
@@ -2095,7 +2103,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Get vonatkozó bejegyzései
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Számviteli könyvelése Stock
 DocType: Sales Invoice,Sales Team1,Értékesítő csapat1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Elem {0} nem létezik
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Elem {0} nem létezik
 DocType: Sales Invoice,Customer Address,Vevő címe
 DocType: Payment Request,Recipient and Message,A címzett és a Message
 DocType: Purchase Invoice,Apply Additional Discount On,Alkalmazza További kedvezmény
@@ -2137,7 +2145,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Becsült érték
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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ó
@@ -2175,7 +2183,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Kérjük, adja enyhíti a dátumot."
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Csak Hagyd alkalmazások állapotát ""Elfogadott"" lehet benyújtani"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Address Cím kötelező.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Address Cím kötelező.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Adja meg nevét kampányt, ha a forrása a vizsgálódás kampány"
 apps/erpnext/erpnext/setup/setup_wizard/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
@@ -2199,6 +2207,7 @@
 DocType: UOM,Must be Whole Number,Egész számnak kell lennie
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Új szabadság lefoglalása (napokban)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,A {0} sorozatszám nem létezik
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Ügyfél Warehouse (opcionális)
 DocType: Pricing Rule,Discount Percentage,Kedvezmény százaléka
 DocType: Payment Reconciliation Invoice,Invoice Number,Számla száma
 apps/erpnext/erpnext/hooks.py +55,Orders,Rendelés
@@ -2308,7 +2317,7 @@
 DocType: Appraisal,Appraisal,Teljesítmény értékelés
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Dátum megismétlődik
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Az aláírásra jogosult
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,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 +184,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
@@ -2388,7 +2397,7 @@
 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"
 DocType: Sales Order Item,Sales Order Date,Vevői rendelés dátuma
 DocType: Sales Invoice Item,Delivered Qty,Kiszállított mennyiség
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Warehouse {0}: Cég kötelező
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,{0} raktár: Cég megadása kötelező
 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.","Tovább a megfelelő csoportba (általában forrása alapok&gt; Rövid lejáratú kötelezettségek&gt; Adók és Illetékek és hozzon létre egy új fiók (kattintva Add Child) típusú &quot;adó&quot;, és nem beszélve az adókulcs."
 ,Payment Period Based On Invoice Date,Fizetési határidő számla alapján dátuma
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Hiányzó valutaárfolyamok: {0}
@@ -2477,7 +2486,7 @@
 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
 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 +733,Show tax break-up,Mutass adókedvezmény-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Mutass adókedvezmény-up
 apps/erpnext/erpnext/accounts/party.py +283,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"""
@@ -2526,7 +2535,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,"Kérjük ismíteld cég nevét, hogy erősítse"
@@ -2553,8 +2562,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Bérrendszer
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"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/setup_wizard/industry_type.py +9,Airline,Légitársaság
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Kérdés Anyag
@@ -2579,7 +2586,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & árutőzsdén
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Alapértelmezett mértékegysége Variant &#39;{0}&#39; meg kell egyeznie a sablon &quot;{1}&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Alapértelmezett mértékegysége Variant &#39;{0}&#39; meg kell egyeznie a sablon &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,A számítás ezen alapul
 DocType: Delivery Note Item,From Warehouse,Raktárról
 DocType: Purchase Taxes and Charges,Valuation and Total,Értékelési és Total
@@ -2588,7 +2595,7 @@
 DocType: Account,Purchase User,Vásárlási Felhasználó
 DocType: Notification Control,Customize the Notification,Értesítés testreszabása
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,A működésből származó pénzáramlás
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Alapértelmezett Címsablon nem lehet törölni
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Alapértelmezett Címsablon nem lehet törölni
 DocType: Sales Invoice,Shipping Rule,Szállítási lehetőség
 DocType: Manufacturer,Limited to 12 characters,Legfeljebb 12 karakter
 DocType: Journal Entry,Print Heading,Nyomtatás címsor
@@ -2681,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,Kereskedelmi
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Döbbenetes szolgáltatások
@@ -2700,7 +2707,7 @@
 DocType: Customer,Default Receivable Accounts,Default Követelés számlák
 DocType: Tax Rule,Billing State,Számlázási állam
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Átutalás
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,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 +642,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 +95,Due Date is mandatory,Due Date kötelező
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Növekménye Képesség {0} nem lehet 0
@@ -2733,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Ideiglenes nyereség / veszteség (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Ideiglenes nyereség / veszteség (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Return Against Értékesítési számlák
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,5. pont
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Kérjük alapértelmezett értéke {0} Company {1}
@@ -2764,6 +2771,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Add Child
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Szerepe lehet élesíteni befagyasztott számlák és szerkesztése Frozen bejegyzések
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Nem lehet átalakítani költséghely főkönyvi hiszen a gyermek csomópontok
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,nyitó érték
 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,Eladási jutalékok
 DocType: Offer Letter Term,Value / Description,Érték / Leírás
@@ -2797,7 +2805,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Sikeresen törölve valamennyi ügylet a vállalattal kapcsolatos!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Mivel a dátum
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Próbaidő
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Alapértelmezett Warehouse kötelező Stock tétel.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Kifizetését fizetése a hónap {0} és az év {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto insert árjegyzéke mértéke, ha hiányzik"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Teljes befizetett összeg
@@ -2833,7 +2840,7 @@
 DocType: Payment Tool,Set Matching Amounts,Állítsa Matching összegek
 DocType: Purchase Invoice,Taxes and Charges Added,Adók és költségek hozzáadása
 ,Sales Funnel,Értékesítési csatorna
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Rövidítése kötelező
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Rövidítése kötelező
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,"Köszönjük, hogy érdeklődik a feliratkozást a frissítések"
 ,Qty to Transfer,Mennyiség Transfer
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Idézetek a vezetéket vagy ügyfelek.
@@ -2861,7 +2868,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} megállt
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},A vonalkód {0} már használt a {1} Tételnél
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Közelgő események
@@ -2883,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Válassza ki Fiscal Year ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS Profil köteles a POS Entry
 DocType: Hub Settings,Name Token,Név Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Normál Ajánló
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Normál Ajánló
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -2988,14 +2995,14 @@
 DocType: Journal Entry Account,Exchange Rate,Átváltási arány
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Sales Order {0} is not submitted,Vevői {0} nem nyújtják be
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +689,Add items from,Add tárgyak
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Parent véve {1} nem Bolong a cég {2}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},{0} raktár: a szülő számla {1} nem kapcsolódik a {2} céghez
 DocType: BOM,Last Purchase Rate,Utolsó beszerzési ár
 DocType: Account,Asset,Vagyontárgy
 DocType: Project Task,Task ID,Feladat ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,"e.g. ""MC""","pl. ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Állomány nem létezik tétel {0} óta van változatok
 ,Sales Person-wise Transaction Summary,Sales Person-bölcs Tranzakciós összefoglalása
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Warehouse {0} nem létezik
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,{0} raktár nem létezik
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Regisztráció az ERPNext Hub–hoz
 DocType: Monthly Distribution,Monthly Distribution Percentages,Havi Distribution százalékok
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,A kiválasztott elem nem lehet Batch
@@ -3006,7 +3013,7 @@
 DocType: Sales Invoice,Paid Amount,Fizetett összeg
 ,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"
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,"Ha ezt Címsablon alapértelmezett, mivel nincs más alapértelmezett"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Számlaegyenleg már terhelés, akkor nem szabad beállítani ""egyensúlyt kell"", mint ""Credit"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
 DocType: Production Planning Tool,Filter based on customer,A szűrő ügyfélen alapul
@@ -3107,7 +3114,7 @@
 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 +19,Shortage Qty,Hiány Mennyiség
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Elem változat {0} létezik azonos tulajdonságokkal
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Időpontig"" szükséges"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Létrehoz csomagolás kombiné a csomagokat szállítani. Használt értesíteni csomag számát, a doboz tartalma, és a súlya."
@@ -3118,7 +3125,7 @@
 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 +749,It is needed to fetch Item Details.,"Erre azért van szükség, hogy hozza Termék részletek."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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
@@ -3144,6 +3151,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: C-Form,Series,Sorszám
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,Elem osztályozás
@@ -3219,7 +3227,7 @@
 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 +434,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 +420,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."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Vásárlási mester menedzser
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Gyártási rendelés {0} kell benyújtani
@@ -3227,7 +3235,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Főbb jelentések
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,"A mai napig nem lehet, mielőtt a dátumot"
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Add / Edit árak
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Saját rendelések
@@ -3275,7 +3283,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Sor # {0}: Állítsa Szállító jogcím {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Weboldal kép {0} csatolt tétel {1} nem található
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Weboldal kép {0} csatolt tétel {1} nem található
 DocType: Issue,Content Type,Tartalom típusa
 apps/erpnext/erpnext/setup/setup_wizard/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.
@@ -3289,7 +3297,7 @@
 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 +357,'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 +351,'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
@@ -3315,7 +3323,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Záró számla {0} típusú legyen kötelezettség / saját tőke
 DocType: Authorization Rule,Based On,Alapuló
 DocType: Sales Order Item,Ordered Qty,Rendelt menny.
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Elem {0} van tiltva
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +168,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.
@@ -3323,7 +3331,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Vásárlási ellenőrizni kell, amennyiben alkalmazható a kiválasztott {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,"A kedvezménynek kisebbnek kell lennie, mint 100"
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Írj egy egyszeri összeget (Társaság Currency)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,"Sor # {0}: Kérjük, állítsa újrarendezésből mennyiség"
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,"Sor # {0}: Kérjük, állítsa újrarendezésből mennyiség"
 DocType: Landed Cost Voucher,Landed Cost Voucher,Beszerzési költség utalvány
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Kérjük, állítsa {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Ismételje meg a hónap napja
@@ -3395,7 +3403,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Tekintse meg most
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Válassza ki az időszak, amikor a számla automatikusan generálja"
 DocType: BOM,Raw Material Cost,Nyersanyagköltsége
-DocType: Item,Re-Order Level,Re-Order Level
+DocType: Item Reorder,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."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Részidős
 DocType: Employee,Applicable Holiday List,Alkalmazható Nyaralás listája
@@ -3450,7 +3458,7 @@
 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 +573,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 +559,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}
@@ -3529,7 +3537,7 @@
 DocType: Address,Office,Iroda
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Számviteli naplóbejegyzések.
 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 +226,Please select Employee Record first.,"Kérjük, válassza ki a dolgozó Record első."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,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 +191,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 +240,Please enter Expense Account,"Kérjük, adja áfás számlát"
@@ -3604,7 +3612,7 @@
 DocType: Item Attribute,Numeric Values,Numerikus értékek
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Logo csatolása
 DocType: Customer,Commission Rate,Jutalék mértéke
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Győződjön Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Győződjön Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Blokk szabadság alkalmazások osztály.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,A kosár üres
 DocType: Production Order,Actual Operating Cost,Tényleges működési költség
@@ -3621,15 +3629,14 @@
 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 +380,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 +419,"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 +408,"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 +380, (Half Day),(Fél Nap)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Elemek áthozása Anyagjegyzékből
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index 73818e1..88d891a 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,Ditagih %
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Kurs harus sama dengan {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nama nasabah
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Rekening bank tidak dapat disebut sebagai {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Rekening bank tidak dapat disebut sebagai {0}
 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 yang diekspor seperti mata uang, nilai tukar, total, grand total dll terdapat di Nota Pengiriman, POS, Penawaran, Faktur Penjualan, Sales Order 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 +173,Outstanding for {0} cannot be less than zero ({1}),Posisi untuk {0} tidak bisa kurang dari nol ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Tinggalkan Aplikasi Baru
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Tinggalkan Aplikasi Baru
 apps/erpnext/erpnext/setup/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
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log Kegiatan yang dilakukan oleh pengguna terhadap Tugas yang dapat digunakan untuk waktu pelacakan, penagihan."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Baru {0}: # {1}
 ,Sales Partners Commission,Penjualan Mitra Komisi
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Singkatan (Abbr) tidak boleh melebihi 5 karakter
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Singkatan (Abbr) tidak boleh melebihi 5 karakter
 DocType: Payment Request,Payment Request,Permintaan pembayaran
 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.",Atribut Nilai {0} tidak dapat dihapus dari {1} sebagai Barang Varian \ eksis dengan Atribut ini.
@@ -196,6 +196,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,Pilih Syarat dan Ketentuan
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,out Nilai
 DocType: Production Planning Tool,Sales Orders,Penjualan Pesanan
 DocType: Purchase Taxes and Charges,Valuation,Valuation
 ,Purchase Order Trends,Pesanan Pembelian Trends
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisi
 DocType: Production Order Operation,Updated via 'Time Log',Diperbarui melalui 'Time Log'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Akun {0} bukan milik Perusahaan {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Jumlah muka tidak dapat lebih besar dari {0} {1}
 DocType: Naming Series,Series List for this Transaction,Daftar Series Transaksi ini
 DocType: Sales Invoice,Is Opening Entry,Apakah Masuk Membuka
 DocType: Customer Group,Mention if non-standard receivable account applicable,Sebutkan jika non-standar piutang yang berlaku
@@ -227,7 +229,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Membuat Slip gaji untuk kriteria yang disebutkan di atas.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Tidak diberikan deskripsi
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Permintaan pembelian.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/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&gt; Pengaturan&gt; Penamaan Seri
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Gudang {0} bukan milik perusahaan {1}
 DocType: Item Website Specification,Item Website Specification,Item Situs Spesifikasi
 DocType: Payment Tool,Reference No,Referensi Tidak
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Tinggalkan Diblokir
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Tinggalkan Diblokir
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Item {0} telah mencapai akhir hidupnya pada {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Tahunan
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Bursa Rekonsiliasi Barang
 DocType: Stock Entry,Sales Invoice No,Penjualan Faktur ada
@@ -249,7 +251,7 @@
 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 +606,Item {0} is cancelled,Item {0} dibatalkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Item {0} dibatalkan
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Permintaan Material
 DocType: Bank Reconciliation,Update Clearance Date,Perbarui Izin Tanggal
 DocType: Item,Purchase Details,Rincian pembelian
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Pengiriman Note
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Menyiapkan Pajak
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} dimasukan dua kali dalam Pajak Barang
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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
@@ -329,7 +331,7 @@
 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 +215,Please see attachment,Silakan lihat lampiran
 DocType: Purchase Order,% Received,% Diterima
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Pengaturan Sudah Selesai!!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Pengaturan Sudah Selesai!!
 ,Finished Goods,Barang Jadi
 DocType: Delivery Note,Instructions,Instruksi
 DocType: Quality Inspection,Inspected By,Diperiksa Oleh
@@ -354,14 +356,13 @@
 ,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 +169,{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 +189,{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/setup_wizard/install_fixtures.py +39,Medical,Medis
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Alasan untuk kehilangan
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation ditutup pada tanggal berikut sesuai Liburan Daftar: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Peluang
 DocType: Employee,Single,Tunggal
-DocType: Issue,Attachment,Lampiran
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Anggaran tidak dapat ditetapkan untuk kelompok Biaya Pusat
 DocType: Account,Cost of Goods Sold,Harga Pokok Penjualan
 DocType: Purchase Invoice,Yearly,Tahunan
@@ -390,7 +391,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,Atribut {0} karena beberapa kali dalam Atribut Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Atribut {0} karena beberapa kali dalam Atribut Tabel
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Tidak Berlaku
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Master Holiday.
@@ -429,7 +430,7 @@
 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,Biaya Operasi Tambahan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut harus sama untuk kedua item"
 DocType: Shipping Rule,Net Weight,Berat Bersih
 DocType: Employee,Emergency Phone,Darurat Telepon
 ,Serial No Warranty Expiry,Serial No Garansi kadaluarsa
@@ -440,7 +441,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Mengelola Subkontrak
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Akun {0} bukan milik perusahaan: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Akun {0} bukan milik perusahaan: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Singkatan sudah digunakan untuk perusahaan lain
 DocType: Selling Settings,Default Customer Group,Bawaan Pelanggan Grup
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Jika disable, lapangan 'Rounded Jumlah' tidak akan terlihat dalam setiap transaksi"
 DocType: BOM,Operating Cost,Biaya Operasi
@@ -476,6 +478,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Tidak ada catatan yang ditemukan dalam tabel Faktur
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Silakan pilih Perusahaan dan Partai Jenis pertama
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Keuangan / akuntansi tahun.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Nilai akumulasi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Maaf, Serial Nos tidak dapat digabungkan"
 DocType: Project Task,Project Task,Proyek Tugas
 ,Lead Id,Timbal Id
@@ -497,7 +500,7 @@
 DocType: Quotation,Quotation To,Quotation Untuk
 DocType: Lead,Middle Income,Penghasilan Tengah
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Pembukaan (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standar Satuan Ukur untuk Item {0} tidak dapat diubah secara langsung karena Anda telah membuat beberapa transaksi (s) dengan UOM lain. Anda akan perlu untuk membuat item baru menggunakan default UOM berbeda.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standar Satuan Ukur untuk Item {0} tidak dapat diubah secara langsung karena Anda telah membuat beberapa transaksi (s) dengan UOM lain. Anda akan perlu untuk membuat item baru menggunakan default UOM berbeda.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Jumlah yang dialokasikan tidak dijinkan negatif
 DocType: Purchase Order Item,Billed Amt,Jumlah tagihan
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Sebuah Gudang logis terhadap entri stok yang dibuat.
@@ -575,7 +578,7 @@
 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 +543,Item has variants.,Item memiliki varian.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -588,6 +591,7 @@
 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 +33,Goods received from Suppliers.,Barang yang diterima dari pemasok.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,Nilai
 DocType: Lead,Campaign Name,Nama Promosi
 ,Reserved,Reserved
 DocType: Purchase Order,Supply Raw Materials,Pasokan Bahan Baku
@@ -602,16 +606,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Akun dengan transaksi yang ada tidak dapat dikonversi ke buku besar
 DocType: Delivery Note,Customer's Purchase Order No,Nasabah Purchase Order No
 DocType: Employee,Cell Number,Nomor Cell
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Permintaan Auto Generated Material
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Permintaan Auto Generated Material
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Tersesat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,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/setup_wizard/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.
 DocType: Item Group,Website Specifications,Website Spesifikasi
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Ada kesalahan dalam Template Alamat Anda {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Akun baru
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Dari {0} tipe {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor Konversi adalah wajib
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Beberapa Aturan Harga ada dengan kriteria yang sama, silahkan menyelesaikan konflik dengan menetapkan prioritas. Harga Aturan: {0}"
 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.,Entri akunting hanya dapat dilakukan terhadap akun anggota. Entri terhadap Grup tidak diperbolehkan.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,Tidak bisa menonaktifkan atau membatalkan BOM seperti yang terkait dengan BOMs lainnya
 DocType: Opportunity,Maintenance,Pemeliharaan
@@ -673,7 +679,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,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/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Peringatan: tidak valid Lampiran {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Peringatan: tidak valid Lampiran {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Tidak ada Izin
 DocType: Company,Default Bank Account,Standar Rekening Bank
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Untuk menyaring berdasarkan Party, pilih Partai Ketik pertama"
@@ -703,13 +709,13 @@
 DocType: Production Planning Tool,Select Items,Pilih Produk
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} terhadap Bill {1} tanggal {2}
 DocType: Maintenance Visit,Completion Status,Status Penyelesaian
-DocType: Sales Invoice Item,Target Warehouse,Target Gudang
+DocType: Production Order,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 +50,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/setup_wizard/install_fixtures.py +17,All Item Groups,Semua Grup Barang/Item
 DocType: Process Payroll,Activity Log,Log Aktivitas
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Laba / Rugi
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Laba / Rugi
 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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Status adalah {2}
@@ -717,7 +723,7 @@
 DocType: Sales Order Item,Projected Qty,Proyeksi Jumlah
 DocType: Sales Invoice,Payment Due Date,Tanggal Jatuh Tempo Pembayaran
 DocType: Newsletter,Newsletter Manager,Newsletter Manajer
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Item Varian {0} sudah ada dengan atribut yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Item Varian {0} sudah ada dengan atribut yang sama
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Awal'
 DocType: Notification Control,Delivery Note Message,Pengiriman Note Pesan
 DocType: Expense Claim,Expenses,Beban
@@ -727,7 +733,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Penelitian & Pengembangan
 ,Amount to Bill,Sebesar Bill
 DocType: Company,Registration Details,Detail Pendaftaran
-DocType: Item,Re-Order Qty,Re-order Qty
+DocType: Item Reorder,Re-Order Qty,Re-order Qty
 DocType: Leave Block List Date,Leave Block List Date,Tinggalkan Block List Tanggal
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Dijadwalkan untuk mengirim ke {0}
 DocType: Pricing Rule,Price or Discount,Harga atau Diskon
@@ -770,7 +776,7 @@
 DocType: Bank Reconciliation,Total Amount,Jumlah Total
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Penerbitan Internet
 DocType: Production Planning Tool,Production Orders,Pesanan Produksi
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Nilai Saldo
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Nilai Saldo
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Daftar Harga Jual
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikasikan untuk sinkronisasi item
 DocType: Bank Reconciliation,Account Currency,Akun Mata Uang
@@ -779,7 +785,7 @@
 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 +538,Item Variants {0} updated,Item Varian {0} diperbarui
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -856,7 +862,7 @@
 DocType: POS Profile,Cash/Bank Account,Rekening Kas / Bank
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Tabel atribut wajib
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Diskon
@@ -884,7 +890,7 @@
 DocType: Tax Rule,Shipping State,Pengiriman Negara
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Item harus ditambahkan dengan menggunakan 'Dapatkan Produk dari Pembelian Penerimaan' tombol
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Beban Penjualan
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Standard Membeli
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Standard Membeli
 DocType: GL Entry,Against,Terhadap
 DocType: Item,Default Selling Cost Center,Default Jual Biaya Pusat
 DocType: Sales Partner,Implementation Partner,Implementasi Mitra
@@ -926,7 +932,7 @@
 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 +210,Production Order {0} must be cancelled before cancelling this Sales Order,Pesanan produksi {0} harus dibatalkan sebelum membatalkan Sales Order ini
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Silahkan mengatur &#39;Terapkan Diskon tambahan On&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Silahkan mengatur &#39;Terapkan Diskon tambahan On&#39;
 ,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.
@@ -994,9 +1000,9 @@
 DocType: Contact,User ID,ID Pemakai
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,View Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Terlama
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Industri melawan Sales Order
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Istirahat Of The World
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1026,7 +1032,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Maaf, perusahaan tidak dapat digabungkan"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Maaf, perusahaan tidak dapat digabungkan"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Kecil
 DocType: Employee,Employee Number,Jumlah Karyawan
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Kasus ada (s) sudah digunakan. Coba dari Case ada {0}
@@ -1045,7 +1051,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Pertanian
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Produk atau Jasa
 DocType: Mode of Payment,Mode of Payment,Mode Pembayaran
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Website Image harus file umum atau URL situs
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Website Image harus file umum atau URL situs
 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
@@ -1117,6 +1123,7 @@
 DocType: Address,Utilities,Keperluan
 DocType: Purchase Invoice Item,Accounting,Akuntansi
 DocType: Features Setup,Features Setup,Fitur Pengaturan
+DocType: Item,Is Service Item,Apakah Layanan Barang
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Periode aplikasi tidak bisa periode alokasi cuti di luar
 DocType: Activity Cost,Projects,Proyek
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Silahkan pilih Tahun Anggaran
@@ -1147,7 +1154,7 @@
 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 +465,cannot be greater than 100,tidak dapat lebih besar dari 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Item {0} bukan merupakan saham Barang
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1207,7 +1214,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,pemerintahan
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Item Varian
 DocType: Company,Services,Layanan
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Jumlah ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Jumlah ({0})
 DocType: Cost Center,Parent Cost Center,Parent Biaya Pusat
 DocType: Sales Invoice,Source,Sumber
 DocType: Leave Type,Is Leave Without Pay,Apakah Tinggalkan Tanpa Bayar
@@ -1280,17 +1287,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Kirim ulang Pembayaran Email
 DocType: Dependent Task,Dependent Task,Tugas Dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} View
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Perubahan bersih dalam kas
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Perubahan bersih dalam kas
 DocType: Salary Structure Deduction,Salary Structure Deduction,Struktur Gaji Pengurangan
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Permintaan pembayaran sudah ada {0}
 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 +182,Quantity must not be more than {0},Kuantitas tidak boleh lebih dari {0}
@@ -1352,7 +1359,7 @@
 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: Packed 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
@@ -1361,7 +1368,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Perusahaan, Bulan dan Tahun Anggaran adalah wajib"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Beban Pemasaran
 ,Item Shortage Report,Item Kekurangan Laporan
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \n Sebutkan ""Berat UOM"" terlalu"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \n Sebutkan ""Berat UOM"" terlalu"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Permintaan bahan yang digunakan untuk membuat Masuk Bursa ini
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Unit tunggal Item.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Waktu Log Batch {0} harus 'Dikirim'
@@ -1372,6 +1379,7 @@
 DocType: Employee,Date Of Retirement,Tanggal Of Pensiun
 DocType: Upload Attendance,Get Template,Dapatkan Template
 DocType: Address,Postal,Pos
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext Pengaturan Selesai!
 DocType: Item,Weightage,Weightage
 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"
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Silahkan pilih {0} pertama.
@@ -1400,12 +1408,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Terlalu banyak kolom. Mengekspor laporan dan mencetaknya menggunakan aplikasi spreadsheet.
 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 +139,Main,Utama
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Utama
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variasi
 DocType: Naming Series,Set prefix for numbering series on your transactions,Mengatur awalan untuk penomoran seri pada transaksi Anda
 DocType: Employee Attendance Tool,Employees HTML,Karyawan HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,Agar Berhenti tidak dapat dibatalkan. Unstop untuk membatalkan.
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,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/stock/doctype/item/item.py +361,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
@@ -1430,7 +1438,6 @@
 DocType: Sales Order,To Deliver and Bill,Untuk Memberikan dan Bill
 DocType: GL Entry,Credit Amount in Account Currency,Jumlah kredit di Akun Mata Uang
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Waktu Log untuk manufaktur.
-DocType: Item,Apply Warehouse-wise Reorder Level,Terapkan Gudang-bijaksana Susun ulang Tingkat
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} harus diserahkan
 DocType: Authorization Control,Authorization Control,Pengendalian Otorisasi
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Ditolak Gudang adalah wajib terhadap ditolak Barang {1}
@@ -1529,6 +1536,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,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}: Operasi {1} tidak selesai untuk {2} qty barang jadi di Produksi Orde # {3}. Silakan update status operasi via Waktu Log
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investasi
 DocType: Issue,Resolution Details,Detail Resolusi
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alokasi
 DocType: Quality Inspection Reading,Acceptance Criteria,Kriteria Penerimaan
 DocType: Item Attribute,Attribute Name,Nama Atribut
 DocType: Item Group,Show In Website,Tampilkan Di Website
@@ -1579,7 +1587,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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,Jumlah Diskon Tambahan
 DocType: Leave Block List Allow,Leave Block List Allow,Tinggalkan Block List Izinkan
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr tidak boleh kosong atau spasi
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr tidak boleh kosong atau spasi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Kelompok Non-kelompok
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Olahraga
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total Aktual
@@ -1620,7 +1628,7 @@
 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 ** **.
 DocType: Opportunity,Customer / Lead Address,Pelanggan / Lead Alamat
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Peringatan: sertifikat SSL tidak valid pada lampiran {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Peringatan: sertifikat SSL tidak valid pada lampiran {0}
 DocType: Production Order Operation,Actual Operation Time,Waktu Operasi Aktual
 DocType: Authorization Rule,Applicable To (User),Berlaku Untuk (User)
 DocType: Purchase Taxes and Charges,Deduct,Mengurangi
@@ -1769,7 +1777,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Kasus No tidak bisa 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,Jika Anda memiliki Tim Penjualan dan Penjualan Mitra (Mitra Channel) mereka dapat ditandai dan mempertahankan kontribusi mereka dalam aktivitas penjualan
 DocType: Item,Show a slideshow at the top of the page,Tampilkan slideshow di bagian atas halaman
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Toko
+DocType: Item,"Allow in Sales Order of type ""Service""",Memungkinkan di Sales Order jenis &quot;Service&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Toko
 DocType: Time Log,Projects Manager,Proyek Manajer
 DocType: Serial No,Delivery Time,Waktu Pengiriman
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Umur Berdasarkan
@@ -1794,7 +1803,7 @@
 ,Financial Analytics,Analytics keuangan
 DocType: Quality Inspection,Verified By,Diverifikasi oleh
 DocType: Address,Subsidiary,Anak Perusahaan
-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.","Tidak dapat mengubah mata uang default perusahaan, karena ada transaksi yang ada. Transaksi harus dibatalkan untuk mengubah mata uang default."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Tidak dapat mengubah mata uang default perusahaan, karena ada transaksi yang ada. Transaksi harus dibatalkan untuk mengubah mata uang default."
 DocType: Quality Inspection,Purchase Receipt No,Penerimaan Pembelian ada
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Uang Earnest
 DocType: Process Payroll,Create Salary Slip,Buat Slip Gaji
@@ -1842,7 +1851,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Bahan baku tidak boleh kosong.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Tidak bisa update saham, faktur berisi penurunan barang pengiriman."
 DocType: Newsletter,Test,tes
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 &#39;Memiliki Serial No&#39;, &#39;Apakah Batch Tidak&#39;, &#39;Apakah Stok Item&#39; dan &#39;Metode Penilaian&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Cepat Journal Masuk
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Anda tidak dapat mengubah kurs jika BOM disebutkan atas tiap barang
@@ -1951,7 +1960,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Silakan Pengiriman Catatan pertama
 DocType: Purchase Invoice,Currency and Price List,Mata Uang dan Daftar Harga
 DocType: Opportunity,Customer / Lead Name,Pelanggan / Lead Nama
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Izin Tanggal tidak disebutkan
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Izin Tanggal tidak disebutkan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Produksi
 DocType: Item,Allow Production Order,Izinkan Pesanan Produksi
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Tanggal awal harus sebelum Tanggal Akhir
@@ -1961,7 +1970,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 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 +118,My Addresses,Alamat saya
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Alamat saya
 DocType: Stock Ledger Entry,Outgoing Rate,Tingkat keluar
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Cabang master organisasi.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,atau
@@ -2030,7 +2039,7 @@
 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 +302,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 +95,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.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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
 DocType: Purchase Invoice,Taxes and Charges Deducted,Pajak dan Biaya Dikurangi
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Isu
@@ -2047,7 +2056,7 @@
 ,Sales Browser,Penjualan Browser
 DocType: Journal Entry,Total Credit,Jumlah Kredit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Peringatan: lain {0} # {1} ada terhadap masuknya saham {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,[Daerah
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Besar
@@ -2066,7 +2075,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Semua Transaksi Penjualan dapat ditandai terhadap beberapa ** Orang Penjualan ** sehingga Anda dapat mengatur dan memonitor target.
 ,S.O. No.,SO No
 DocType: Production Order Operation,Make Time Log,Membuat Waktu Log
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Silahkan mengatur kuantitas menyusun ulang
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Silakan membuat pelanggan dari Lead {0}
 DocType: Price List,Applicable for Countries,Berlaku untuk Negara
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Komputer
@@ -2153,7 +2161,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Dapatkan Entries Relevan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Entri Akunting untuk Stok
 DocType: Sales Invoice,Sales Team1,Penjualan team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Item {0} tidak ada
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Item {0} tidak ada
 DocType: Sales Invoice,Customer Address,Alamat pelanggan
 DocType: Payment Request,Recipient and Message,Penerima dan Pesan
 DocType: Purchase Invoice,Apply Additional Discount On,Terapkan tambahan Diskon Pada
@@ -2195,7 +2203,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Tingkat Penilaian
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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
@@ -2233,7 +2241,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Silahkan masukkan menghilangkan date.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Hanya Tinggalkan Aplikasi status 'Disetujui' dapat diajukan
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Wajib masukan Judul Alamat.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Wajib masukan Judul Alamat.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Masukkan nama kampanye jika sumber penyelidikan adalah kampanye
 apps/erpnext/erpnext/setup/setup_wizard/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
@@ -2257,6 +2265,7 @@
 DocType: UOM,Must be Whole Number,Harus Nomor Utuh
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Daun baru Dialokasikan (Dalam Hari)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial ada {0} tidak ada
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Gudang Customer (pilihan)
 DocType: Pricing Rule,Discount Percentage,Persentase Diskon
 DocType: Payment Reconciliation Invoice,Invoice Number,Nomor Faktur
 apps/erpnext/erpnext/hooks.py +55,Orders,Pesanan
@@ -2366,7 +2375,7 @@
 DocType: Appraisal,Appraisal,Penilaian
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Tanggal diulang
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Penandatangan yang sah
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},Tinggalkan approver harus menjadi salah satu {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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
@@ -2535,7 +2544,7 @@
 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
 DocType: Sales Order Item,Supplier delivers to Customer,Pemasok memberikan kepada Nasabah
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Tampilkan pajak break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Tampilkan pajak break-up
 apps/erpnext/erpnext/accounts/party.py +283,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'
@@ -2585,7 +2594,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,Mohon tipe nama perusahaan untuk mengkonfirmasi
@@ -2612,9 +2621,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Struktur Gaji
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Beberapa Aturan Harga ada dengan kriteria yang sama, silakan menyelesaikan \
- konflik dengan menetapkan prioritas. Harga Aturan: {0}"
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Maskapai Penerbangan
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Isu Material
@@ -2639,7 +2645,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Efek & Bursa Komoditi
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standar Satuan Ukur untuk Variant &#39;{0}&#39; harus sama seperti di Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standar Satuan Ukur untuk Variant &#39;{0}&#39; harus sama seperti di Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Hitung Berbasis On
 DocType: Delivery Note Item,From Warehouse,Dari Gudang
 DocType: Purchase Taxes and Charges,Valuation and Total,Penilaian dan Total
@@ -2648,7 +2654,7 @@
 DocType: Account,Purchase User,Pembelian Pengguna
 DocType: Notification Control,Customize the Notification,Sesuaikan Pemberitahuan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Arus Kas dari Operasi
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Template Default Address tidak bisa dihapus
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Template Default Address tidak bisa dihapus
 DocType: Sales Invoice,Shipping Rule,Aturan Pengiriman
 DocType: Manufacturer,Limited to 12 characters,Terbatas untuk 12 karakter
 DocType: Journal Entry,Print Heading,Cetak Pos
@@ -2742,7 +2748,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,Komersial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Layanan mengagumkan
@@ -2761,7 +2767,7 @@
 DocType: Customer,Default Receivable Accounts,Standar Piutang Account
 DocType: Tax Rule,Billing State,Negara penagihan
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Fetch meledak BOM (termasuk sub-rakitan)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,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 +95,Due Date is mandatory,Due Date adalah wajib
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Kenaikan untuk Atribut {0} tidak dapat 0
@@ -2794,7 +2800,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Laba Provisional / Rugi (Kredit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Laba Provisional / Rugi (Kredit)
 DocType: Sales Invoice,Return Against Sales Invoice,Kembali Terhadap Penjualan Faktur
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Butir 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Silakan set nilai default {0} di Perusahaan {1}
@@ -2825,6 +2831,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Tambah Anak
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Peran Diizinkan Set Beku Account & Edit Frozen Entri
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Tidak dapat mengkonversi Biaya Center untuk buku karena memiliki node anak
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Nilai pembukaan
 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,Komisi Penjualan
 DocType: Offer Letter Term,Value / Description,Nilai / Keterangan
@@ -2858,7 +2865,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Berhasil dihapus semua transaksi yang terkait dengan perusahaan ini!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Seperti pada Tanggal
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Percobaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Standar Warehouse adalah wajib bagi saham Barang.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pembayaran gaji untuk bulan {0} dan tahun {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Insert auto tingkat Daftar Harga jika hilang
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Jumlah Total Dibayar
@@ -2894,7 +2900,7 @@
 DocType: Payment Tool,Set Matching Amounts,Set Jumlah Matching
 DocType: Purchase Invoice,Taxes and Charges Added,Pajak dan Biaya Ditambahkan
 ,Sales Funnel,Penjualan Saluran
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Singkatan (Abbr) wajib diisi
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Singkatan (Abbr) wajib diisi
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Terima kasih atas minat Anda untuk berlangganan update kami
 ,Qty to Transfer,Jumlah Transfer
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Harga untuk Memimpin atau Pelanggan.
@@ -2922,7 +2928,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} dihentikan
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Barcode {0} sudah digunakan dalam Butir {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Acara Mendatang
@@ -2945,7 +2951,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Pilih Tahun Anggaran ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS Profil diperlukan untuk membuat POS Masuk
 DocType: Hub Settings,Name Token,Nama Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Standard Jual
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Standard Jual
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -3068,7 +3074,7 @@
 DocType: Sales Invoice,Paid Amount,Dibayar Jumlah
 ,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
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,Mengatur Template Alamat ini sebagai default karena tidak ada standar lainnya
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo rekening sudah berada di Debit, Anda tidak diizinkan untuk mengatur 'Balance Harus' sebagai 'Kredit'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Manajemen Kualitas
 DocType: Production Planning Tool,Filter based on customer,Filter berdasarkan pelanggan
@@ -3169,7 +3175,7 @@
 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 +19,Shortage Qty,Kekurangan Jumlah
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Sampai Tanggal' harus diisi
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Menghasilkan kemasan slip paket yang akan dikirimkan. Digunakan untuk memberitahu nomor paket, isi paket dan berat."
@@ -3180,7 +3186,7 @@
 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 +749,It is needed to fetch Item Details.,Hal ini diperlukan untuk mengambil Item detail.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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
@@ -3206,6 +3212,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: C-Form,Series,Seri
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,Klasifikasi Barang
@@ -3292,7 +3299,7 @@
 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 +434,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 +420,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."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Pembelian Guru Manajer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Pesanan produksi {0} harus diserahkan
@@ -3300,7 +3307,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Laporan Utama
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Sampai saat ini tidak dapat sebelumnya dari tanggal
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Tambah / Edit Harga
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Pesanan saya
@@ -3348,7 +3355,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Row # {0}: Set Pemasok untuk item {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Website Image {0} melekat Butir {1} tidak dapat ditemukan
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Website Image {0} melekat Butir {1} tidak dapat ditemukan
 DocType: Issue,Content Type,Content Type
 apps/erpnext/erpnext/setup/setup_wizard/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.
@@ -3362,7 +3369,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,"""Memiliki Nomor Serial' tidak bisa 'dipilih' untuk item non-stok"
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,"""Memiliki Nomor Serial' tidak bisa 'dipilih' untuk item non-stok"
 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
@@ -3388,7 +3395,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Penutupan Rekening {0} harus dari jenis Kewajiban / Ekuitas
 DocType: Authorization Rule,Based On,Berdasarkan
 DocType: Sales Order Item,Ordered Qty,Memerintahkan Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Item {0} dinonaktifkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Item {0} dinonaktifkan
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +168,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.
@@ -3396,7 +3403,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Membeli harus dicentang, jika ""Berlaku Untuk"" dipilih sebagai {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Diskon harus kurang dari 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Menulis Off Jumlah (Perusahaan Mata Uang)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Row # {0}: Silakan mengatur kuantitas menyusun ulang
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Row # {0}: Silakan mengatur kuantitas menyusun ulang
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Biaya mendarat
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Silakan set {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ulangi pada Hari Bulan
@@ -3469,7 +3476,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Lihat Sekarang
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Pilih periode ketika invoice akan dibuat secara otomatis
 DocType: BOM,Raw Material Cost,Biaya Bahan Baku
-DocType: Item,Re-Order Level,Re-order Tingkat
+DocType: Item Reorder,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.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Daftar hari libur yang berlaku
@@ -3524,7 +3531,7 @@
 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 Barang di Sales Order
-apps/erpnext/erpnext/stock/doctype/item/item.py +573,Please specify Attribute Value for attribute {0},Silakan tentukan Atribut Nilai untuk atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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),Tanggal Akhir Aktual (via Log Waktu)
 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}
@@ -3603,7 +3610,7 @@
 DocType: Address,Office,Kantor
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Pencatatan Jurnal akuntansi.
 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 +226,Please select Employee Record first.,Silakan pilih Rekam Karyawan pertama.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,Silakan pilih Rekam Karyawan pertama.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,Masukkan Beban Akun
@@ -3678,7 +3685,7 @@
 DocType: Item Attribute,Numeric Values,Nilai numerik
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Pasang Logo
 DocType: Customer,Commission Rate,Komisi Tingkat
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Membuat Varian
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Membuat Varian
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Memblokir aplikasi cuti berdasarkan departemen.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Cart adalah Kosong
 DocType: Production Order,Actual Operating Cost,Biaya Operasi Aktual
@@ -3695,15 +3702,14 @@
 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 +380,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 +419,"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 +408,"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 +380, (Half Day),(Setengah Hari)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Dapatkan item dari BOM
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index cf0c759..c824d39 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% Fatturato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Tasso di cambio deve essere uguale a {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nome Cliente
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Conto bancario non può essere nominato come {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Conto bancario non può essere nominato come {0}
 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.,Soci (o società) per le quali le scritture contabili sono fatte e i saldi vengono mantenuti.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +173,Outstanding for {0} cannot be less than zero ({1}),Eccezionale per {0} non può essere inferiore a zero ( {1} )
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Nuovo Lascia Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Nuovo Lascia Application
 apps/erpnext/erpnext/setup/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
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log delle attività svolte dagli utenti contro le attività che possono essere utilizzati per il monitoraggio in tempo, la fatturazione."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Nuova {0}: # {1}
 ,Sales Partners Commission,Vendite Partners Commissione
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Le abbreviazioni non possono avere più di 5 caratteri
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Le abbreviazioni non possono avere più di 5 caratteri
 DocType: Payment Request,Payment Request,Richiesta di pagamento
 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.",Attributo Valore {0} non può essere rimosso dal {1} come Voce Varianti \ esiste con questo attributo.
@@ -196,6 +196,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,Selezionare i Termini e Condizioni
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,Valore out
 DocType: Production Planning Tool,Sales Orders,Ordini di vendita
 DocType: Purchase Taxes and Charges,Valuation,Valorizzazione
 ,Purchase Order Trends,Acquisto Tendenze Ordine
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,televisione
 DocType: Production Order Operation,Updated via 'Time Log',Aggiornato con 'Time Log'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Il Conto {0} non appartiene alla società {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},importo anticipato non può essere maggiore di {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista Serie per questa transazione
 DocType: Sales Invoice,Is Opening Entry,Sta aprendo Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Menzione se conto credito non standard applicabile
@@ -227,7 +229,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea busta paga per i criteri sopra menzionati.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Nessuna descrizione fornita
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Richiesta di acquisto.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Solo il responsabile ferie scelto può sottoporre questa richiesta di ferie
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,Only the selected Leave Approver can submit this Leave Application,Solo il responsabile ferie scelto può sottoporre questa richiesta di ferie
 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/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&gt; Impostazioni&gt; Serie Naming
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Warehouse {0} non appartiene a società {1}
 DocType: Item Website Specification,Item Website Specification,Specifica da Sito Web dell'articolo
 DocType: Payment Tool,Reference No,Di riferimento
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Lascia Bloccato
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Lascia Bloccato
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,Annual,annuale
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voce Riconciliazione Giacenza
 DocType: Stock Entry,Sales Invoice No,Fattura di Vendita n.
@@ -249,7 +251,7 @@
 DocType: Pricing Rule,Supplier Type,Tipo Fornitore
 DocType: Item,Publish in Hub,Pubblicare in Hub
 ,Terretory,Territorio
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,L'articolo {0} è annullato
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,L'articolo {0} è annullato
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Richiesta materiale
 DocType: Bank Reconciliation,Update Clearance Date,Aggiornare Liquidazione Data
 DocType: Item,Purchase Details,"Acquisto, i dati"
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Nota Consegna
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Impostazione Tasse
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} inserito due volte in tassazione articolo
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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
@@ -328,7 +330,7 @@
 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 +215,Please see attachment,Si prega di vedere allegato
 DocType: Purchase Order,% Received,% Ricevuto
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Setup già completo !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Setup già completo !
 ,Finished Goods,Beni finiti
 DocType: Delivery Note,Instructions,Istruzione
 DocType: Quality Inspection,Inspected By,Verifica a cura di
@@ -353,14 +355,13 @@
 ,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 +169,{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 +189,{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/setup_wizard/install_fixtures.py +39,Medical,Medico
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Motivo per Perdere
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation è chiuso nei seguenti giorni secondo l'elenco di vacanza: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Opportunità
 DocType: Employee,Single,Singolo
-DocType: Issue,Attachment,Attaccamento
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Bilancio non può essere impostato per Gruppo centro di costo
 DocType: Account,Cost of Goods Sold,Costo del venduto
 DocType: Purchase Invoice,Yearly,Annuale
@@ -389,7 +390,7 @@
 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 al
 DocType: SMS Log,Sent On,Inviata il
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Attribute {0} selected multiple times in Attributes Table,Attributo {0} selezionato più volte in Attributi Tabella
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Attributo {0} selezionato più volte in Attributi Tabella
 DocType: HR Settings,Employee record is created using selected field. ,Record dipendente viene creato utilizzando campo selezionato.
 DocType: Sales Order,Not Applicable,Non Applicabile
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Vacanza principale.
@@ -428,7 +429,7 @@
 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 esercizio
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,cosmetici
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"To merge, following properties must be same for both items","Per unire , seguenti proprietà devono essere uguali per entrambe le voci"
 DocType: Shipping Rule,Net Weight,Peso netto
 DocType: Employee,Emergency Phone,Telefono di emergenza
 ,Serial No Warranty Expiry,Serial No Garanzia di scadenza
@@ -439,7 +440,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Gestione subfornitura / terzista
 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&#39;azienda
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Il Conto {0} non appartiene alla società: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Il Conto {0} non appartiene alla società: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Abbreviazione già utilizzato da un&#39;altra società
 DocType: Selling Settings,Default Customer Group,Gruppo Clienti Predefinito
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Se disabilitare, &#39;Rounded totale&#39; campo non sarà visibile in qualsiasi transazione"
 DocType: BOM,Operating Cost,Costo di gestione
@@ -473,6 +475,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Nessun record trovato nella tabella Fattura
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Selezionare prego e Partito Tipo primo
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Esercizio finanziario / contabile .
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,valori accumulati
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Siamo spiacenti , Serial Nos non può essere fusa"
 DocType: Project Task,Project Task,Progetto Task
 ,Lead Id,Id Contatto
@@ -494,7 +497,7 @@
 DocType: Quotation,Quotation To,Preventivo Per
 DocType: Lead,Middle Income,Reddito Medio
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Opening ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unità di misura predefinita per la voce {0} non può essere modificato direttamente perché si è già fatto qualche operazione (s) con un altro UOM. Sarà necessario creare una nuova voce per utilizzare un diverso UOM predefinito.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unità di misura predefinita per la voce {0} non può essere modificato direttamente perché si è già fatto qualche operazione (s) con un altro UOM. Sarà necessario creare una nuova voce per utilizzare un diverso UOM predefinito.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Importo concesso non può essere negativo
 DocType: Purchase Order Item,Billed Amt,Importo Fatturato
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Magazzino logico utilizzato per l'entrata giacenza.
@@ -572,7 +575,7 @@
 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 +543,Item has variants.,Articolo ha varianti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -585,6 +588,7 @@
 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 +33,Goods received from Suppliers.,Merce ricevuta dai fornitori.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,in Valore
 DocType: Lead,Campaign Name,Nome Campagna
 ,Reserved,riservato
 DocType: Purchase Order,Supply Raw Materials,Fornire Materie Prime
@@ -599,16 +603,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Account con transazione registrate non può essere convertito in libro mastro
 DocType: Delivery Note,Customer's Purchase Order No,Ordine Acquisto Cliente N.
 DocType: Employee,Cell Number,Numero di Telefono
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Richieste Materiale Auto generata
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Richieste Materiale Auto generata
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,perso
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Non è possibile inserire il buono nella colonna 'Against Journal Entry'
 apps/erpnext/erpnext/setup/setup_wizard/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.
 DocType: Item Group,Website Specifications,Website Specifiche
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},C&#39;è un errore nel vostro indirizzo template {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Nuovo Account
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Da {0} di tipo {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Riga {0}: fattore di conversione è obbligatoria
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Più regole Prezzo esiste con stessi criteri, si prega di risolvere i conflitti tramite l&#39;assegnazione di priorità. Regole Prezzo: {0}"
 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.,Le voci di contabilità può essere fatta contro nodi foglia. Non sono ammesse le voci contro gruppi.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,Impossibile disattivare o cancellare distinta in quanto è collegata con altri BOM
 DocType: Opportunity,Maintenance,Manutenzione
@@ -670,7 +676,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,Listino Prezzi non selezionati
 DocType: Employee,Family Background,Sfondo Famiglia
 DocType: Process Payroll,Send Email,Invia Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Attenzione: L&#39;allegato non valido {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Attenzione: L&#39;allegato non valido {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nessuna autorizzazione
 DocType: Company,Default Bank Account,Conto Banca Predefinito
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Per filtrare sulla base del partito, selezionare Partito Digitare prima"
@@ -700,13 +706,13 @@
 DocType: Production Planning Tool,Select Items,Selezionare Elementi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} per fattura {1} in data {2}
 DocType: Maintenance Visit,Completion Status,Stato Completamento
-DocType: Sales Invoice Item,Target Warehouse,Obiettivo Warehouse
+DocType: Production Order,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 +50,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/setup_wizard/install_fixtures.py +17,All Item Groups,Tutti i gruppi di articoli
 DocType: Process Payroll,Activity Log,Registro attività
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Utile / Perdita
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Utile / Perdita
 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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} stato è {2}
@@ -714,7 +720,7 @@
 DocType: Sales Order Item,Projected Qty,Qtà Proiettata
 DocType: Sales Invoice,Payment Due Date,Pagamento Due Date
 DocType: Newsletter,Newsletter Manager,Newsletter Manager
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Prodotto Modello {0} esiste già con gli stessi attributi
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Prodotto Modello {0} esiste già con gli stessi attributi
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Apertura'
 DocType: Notification Control,Delivery Note Message,Nota Messaggio Consegna
 DocType: Expense Claim,Expenses,Spese
@@ -724,7 +730,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Ricerca & Sviluppo
 ,Amount to Bill,Importo da Bill
 DocType: Company,Registration Details,Dettagli di registrazione
-DocType: Item,Re-Order Qty,Quantità Ri-ordino
+DocType: Item Reorder,Re-Order Qty,Quantità Ri-ordino
 DocType: Leave Block List Date,Leave Block List Date,Lascia Block List Data
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programmato per inviare {0}
 DocType: Pricing Rule,Price or Discount,Prezzo o Sconto
@@ -767,7 +773,7 @@
 DocType: Bank Reconciliation,Total Amount,Totale Importo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Ordini di produzione
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Valore Saldo
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Valore Saldo
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista Prezzo di vendita
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Pubblica sincronizzare gli elementi
 DocType: Bank Reconciliation,Account Currency,Valuta del saldo
@@ -776,7 +782,7 @@
 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 +538,Item Variants {0} updated,Voce Varianti {0} aggiornato
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -853,7 +859,7 @@
 DocType: POS Profile,Cash/Bank Account,Conto Cassa/Banca
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Tavolo attributo è obbligatorio
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Sconto
@@ -881,7 +887,7 @@
 DocType: Tax Rule,Shipping State,Stato Spedizione
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,L'oggetto deve essere aggiunto utilizzando 'ottenere elementi dal Receipts Purchase pulsante
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Spese di vendita
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Comprare standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Comprare standard
 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
@@ -923,7 +929,7 @@
 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 +210,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/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Impostare &#39;Applica ulteriore sconto On&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Impostare &#39;Applica ulteriore sconto On&#39;
 ,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.
@@ -991,9 +997,9 @@
 DocType: Contact,User ID,ID utente
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,vista Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,La prima
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Produzione su Ordine di vendita
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Resto del Mondo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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 Lotto
 ,Budget Variance Report,Report Variazione Budget
 DocType: Salary Slip,Gross Pay,Paga lorda
@@ -1023,7 +1029,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Siamo spiacenti , le aziende non possono essere unite"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Siamo spiacenti , le aziende non possono essere unite"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Piccolo
 DocType: Employee,Employee Number,Numero Dipendente
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Caso n ( s) già in uso . Prova da Caso n {0}
@@ -1042,7 +1048,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,agricoltura
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,I vostri prodotti o servizi
 DocType: Mode of Payment,Mode of Payment,Modalità di Pagamento
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Website Immagine dovrebbe essere un file o URL del sito web pubblico
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Website Immagine dovrebbe essere un file o URL del sito web pubblico
 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
@@ -1114,6 +1120,7 @@
 DocType: Address,Utilities,Utilità
 DocType: Purchase Invoice Item,Accounting,Contabilità
 DocType: Features Setup,Features Setup,Configurazione Funzioni
+DocType: Item,Is Service Item,È il servizio Voce
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Periodo di applicazione non può essere periodo di assegnazione congedo di fuori
 DocType: Activity Cost,Projects,Progetti
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Si prega di selezionare l'anno fiscale
@@ -1144,7 +1151,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Piano dei Conti
 DocType: Material Request,Terms and Conditions Content,Termini e condizioni contenuti
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +465,cannot be greater than 100,non può essere superiore a 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,L'articolo {0} non è in Giagenza
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1204,7 +1211,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Governo
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Varianti Voce
 DocType: Company,Services,Servizi
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Totale ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Totale ({0})
 DocType: Cost Center,Parent Cost Center,Parent Centro di costo
 DocType: Sales Invoice,Source,Fonte
 DocType: Leave Type,Is Leave Without Pay,È lasciare senza stipendio
@@ -1277,17 +1284,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Invia di nuovo pagamento Email
 DocType: Dependent Task,Dependent Task,Task dipendente
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Vista
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Variazione netta delle disponibilità
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Variazione netta delle disponibilità
 DocType: Salary Structure Deduction,Salary Structure Deduction,Struttura salariale Deduzione
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Richiesta di pagamento già esistente {0}
 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 +182,Quantity must not be more than {0},Quantità non deve essere superiore a {0}
@@ -1349,7 +1356,7 @@
 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: Packed 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
@@ -1358,7 +1365,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Società , mese e anno fiscale è obbligatoria"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Spese di Marketing
 ,Item Shortage Report,Report Carenza Articolo
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Il peso è menzionato, \n prega di citare ""Peso UOM"" troppo"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Il peso è menzionato, \n prega di citare ""Peso UOM"" troppo"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Richiesta di materiale usata per l'entrata giacenza
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Unità singola di un articolo.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Tempo Log Lotto {0} deve essere ' inoltrata '
@@ -1369,6 +1376,7 @@
 DocType: Employee,Date Of Retirement,Data di Pensionamento
 DocType: Upload Attendance,Get Template,Ottieni Modulo
 DocType: Address,Postal,Postale
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,Installazione ERPNext completa!
 DocType: Item,Weightage,Weightage
 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"
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Si prega di selezionare {0} prima.
@@ -1397,12 +1405,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Troppe colonne. Esportare il report e stamparlo utilizzando un foglio di calcolo.
 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 +139,Main,principale
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,principale
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Impostare prefisso per numerazione serie sulle transazioni
 DocType: Employee Attendance Tool,Employees HTML,Dipendenti HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,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 +367,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/stock/doctype/item/item.py +361,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
@@ -1427,7 +1435,6 @@
 DocType: Sales Order,To Deliver and Bill,Per Consegnare e Bill
 DocType: GL Entry,Credit Amount in Account Currency,Importo del credito Account Valuta
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Registri di tempo per la produzione.
-DocType: Item,Apply Warehouse-wise Reorder Level,Usa le informazioni di Magazziono per determinare livello di riordino
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} deve essere presentata
 DocType: Authorization Control,Authorization Control,Controllo Autorizzazioni
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: Rifiutato Warehouse è obbligatoria per la voce respinto {1}
@@ -1526,6 +1533,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,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}: Operazione {1} non è completato per {2} qty di prodotti finiti in ordine di produzione # {3}. Si prega di aggiornare lo stato di funzionamento tramite registri Tempo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investimenti
 DocType: Issue,Resolution Details,Dettagli risoluzione
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Accantonamenti
 DocType: Quality Inspection Reading,Acceptance Criteria,Criterio  di accettazione
 DocType: Item Attribute,Attribute Name,Nome Attributo
 DocType: Item Group,Show In Website,Mostra Nel Sito Web
@@ -1576,7 +1584,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,Rimborso spese in attesa di approvazione. Solo il Responsabile Spese può modificarne lo stato.
 DocType: Purchase Invoice,Additional Discount Amount,Ulteriori Importo Sconto
 DocType: Leave Block List Allow,Leave Block List Allow,Lascia Block List Consentire
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,L'abbr. non può essere vuota o spazio
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,L'abbr. non può essere vuota o spazio
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Gruppo di Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportivo
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Totale Actual
@@ -1617,7 +1625,7 @@
 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 le altre operazioni importanti sono tracciati per **Anno Fiscale**.
 DocType: Opportunity,Customer / Lead Address,Indirizzo Cliente / Contatto
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Attenzione: certificato SSL non valido sull&#39;attaccamento {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Attenzione: certificato SSL non valido sull&#39;attaccamento {0}
 DocType: Production Order Operation,Actual Operation Time,Tempo lavoro effettiva
 DocType: Authorization Rule,Applicable To (User),Applicabile a (Utente)
 DocType: Purchase Taxes and Charges,Deduct,Detrarre
@@ -1766,7 +1774,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Caso No. Non può essere 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,Se si dispone di team di vendita e vendita Partners (Partner di canale) possono essere taggati e mantenere il loro contributo per l&#39;attività di vendita
 DocType: Item,Show a slideshow at the top of the page,Visualizzare una presentazione in cima alla pagina
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,negozi
+DocType: Item,"Allow in Sales Order of type ""Service""",Lasciare in Vendita a distanza di tipo &quot;Servizio&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,negozi
 DocType: Time Log,Projects Manager,Responsabile Progetti
 DocType: Serial No,Delivery Time,Tempo Consegna
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Invecchiamento Basato Su
@@ -1791,7 +1800,7 @@
 ,Financial Analytics,Analisi Finanziaria
 DocType: Quality Inspection,Verified By,Verificato da
 DocType: Address,Subsidiary,Sussidiario
-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.","Non è possibile cambiare la valuta di default dell'azienda , perché ci sono le transazioni esistenti . Le operazioni devono essere cancellate per cambiare la valuta di default ."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Non è possibile cambiare la valuta di default dell'azienda , perché ci sono le transazioni esistenti . Le operazioni devono essere cancellate per cambiare la valuta di default ."
 DocType: Quality Inspection,Purchase Receipt No,RICEVUTA No
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,caparra
 DocType: Process Payroll,Create Salary Slip,Creare busta paga
@@ -1839,7 +1848,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Materie prime non può essere vuoto.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Impossibile aggiornare magazzino, fattura contiene articoli di trasporto di goccia."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 +459,Quick Journal Entry,Breve diario
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Non è possibile cambiare tariffa se la distinta (BOM) è già assegnata a un articolo
@@ -1948,7 +1957,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Si prega di Consegna Nota prima
 DocType: Purchase Invoice,Currency and Price List,Valuta e Lista Prezzi
 DocType: Opportunity,Customer / Lead Name,Nome Cliente / Contatto
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Liquidazione data non menzionato
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Liquidazione data non menzionato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,produzione
 DocType: Item,Allow Production Order,Consentire Ordine Produzione
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Riga {0} : Data di inizio deve essere precedente Data di fine
@@ -1958,7 +1967,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
 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 +118,My Addresses,I miei indirizzi
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,I miei indirizzi
 DocType: Stock Ledger Entry,Outgoing Rate,Tasso di uscita
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Ramo Organizzazione master.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,oppure
@@ -2027,7 +2036,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Gestire cliente con raggruppamento ad albero
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,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 +95,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.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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
 DocType: Purchase Invoice,Taxes and Charges Deducted,Tasse e oneri dedotti
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Questioni
@@ -2044,7 +2053,7 @@
 ,Sales Browser,Browser vendite
 DocType: Journal Entry,Total Credit,Totale credito
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Attenzione: Un altro {0} # {1} esiste per l'entrata Giacenza {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Locale
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Grande
@@ -2063,7 +2072,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Tutte le transazioni di vendita possono essere etichettati contro più persone ** ** di vendita in modo da poter impostare e monitorare gli obiettivi.
 ,S.O. No.,S.O. No.
 DocType: Production Order Operation,Make Time Log,Crea resoconto orario
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Si prega di impostare la quantità di riordino
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Si prega di creare Cliente da Contatto {0}
 DocType: Price List,Applicable for Countries,Applicabile per i paesi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,computer
@@ -2150,7 +2158,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Prendi le voci rilevanti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Voce contabilità per giacenza
 DocType: Sales Invoice,Sales Team1,Vendite Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,L'articolo {0} non esiste
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,L'articolo {0} non esiste
 DocType: Sales Invoice,Customer Address,Indirizzo Cliente
 DocType: Payment Request,Recipient and Message,Destinatario e il messaggio
 DocType: Purchase Invoice,Apply Additional Discount On,Applicare Sconto Ulteriori On
@@ -2192,7 +2200,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Tasso Valutazione
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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
@@ -2230,7 +2238,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Inserisci la data alleviare .
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Lasciare solo applicazioni con stato ' approvato ' possono essere presentate
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Titolo Indirizzo è obbligatorio.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Titolo Indirizzo è obbligatorio.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Inserisci il nome della Campagna se la sorgente di indagine è la campagna
 apps/erpnext/erpnext/setup/setup_wizard/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
@@ -2254,6 +2262,7 @@
 DocType: UOM,Must be Whole Number,Deve essere un Numero Intero
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nuove foglie attribuiti (in giorni)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial No {0} non esiste
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Magazzino del cliente (opzionale)
 DocType: Pricing Rule,Discount Percentage,Percentuale di sconto
 DocType: Payment Reconciliation Invoice,Invoice Number,Numero di fattura
 apps/erpnext/erpnext/hooks.py +55,Orders,Ordini
@@ -2363,7 +2372,7 @@
 DocType: Appraisal,Appraisal,Valutazione
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,La Data si Ripete
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Firma autorizzata
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},Il responsabile ferie deve essere uno fra {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,Leave approver must be one of {0},Il responsabile ferie deve essere uno fra {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
@@ -2532,7 +2541,7 @@
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Strumento di sostituzione
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modelli Country saggio di default Indirizzo
 DocType: Sales Order Item,Supplier delivers to Customer,Fornitore garantisce al Cliente
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Mostra fiscale break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Mostra fiscale break-up
 apps/erpnext/erpnext/accounts/party.py +283,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 '
@@ -2582,7 +2591,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,Si prega di digitare nuovamente il nome della società per confermare
@@ -2609,9 +2618,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Struttura salariale
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Multipla Regola Prezzo esiste con stessi criteri, si prega di risolvere \
- conflitto assegnando priorità. Regole Prezzo: {0}"
 DocType: Account,Bank,Banca
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,linea aerea
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Fornire Materiale
@@ -2636,7 +2642,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & borse merci
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unità di misura predefinita per la variante &#39;{0}&#39; deve essere lo stesso in Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unità di misura predefinita per la variante &#39;{0}&#39; deve essere lo stesso in Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcola in base a
 DocType: Delivery Note Item,From Warehouse,Dal magazzino
 DocType: Purchase Taxes and Charges,Valuation and Total,Valutazione e Total
@@ -2645,7 +2651,7 @@
 DocType: Account,Purchase User,Acquisto utente
 DocType: Notification Control,Customize the Notification,Personalizzare Notifica
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Cash flow operativo
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Indirizzo modello predefinito non può essere eliminato
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Indirizzo modello predefinito non può essere eliminato
 DocType: Sales Invoice,Shipping Rule,Spedizione Rule
 DocType: Manufacturer,Limited to 12 characters,Limitato a 12 caratteri
 DocType: Journal Entry,Print Heading,Stampa Rubrica
@@ -2739,7 +2745,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,commerciale
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servizi di punta
@@ -2758,7 +2764,7 @@
 DocType: Customer,Default Receivable Accounts,Predefinito Contabilità clienti
 DocType: Tax Rule,Billing State,Stato di fatturazione
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Trasferimento
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Fetch BOM esplosa ( inclusi sottoassiemi )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,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 +95,Due Date is mandatory,Data di scadenza è obbligatoria
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Incremento per attributo {0} non può essere 0
@@ -2791,7 +2797,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Risultato provvisorio / Perdita (credito)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Risultato provvisorio / Perdita (credito)
 DocType: Sales Invoice,Return Against Sales Invoice,Di ritorno contro fattura di vendita
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Articolo 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Si prega di impostare il valore predefinito {0} in azienda {1}
@@ -2822,6 +2828,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Aggiungi una sottovoce
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Ruolo permesso di impostare conti congelati e modificare le voci congelati
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Impossibile convertire centro di costo a registro come ha nodi figlio
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Valore di apertura
 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,Commissione sulle vendite
 DocType: Offer Letter Term,Value / Description,Valore / Descrizione
@@ -2855,7 +2862,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Cancellato con successo tutte le operazioni relative a questa società!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Come in data
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,prova
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Magazino predefinito necessario per articolo in Giacenza.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Il pagamento dello stipendio del mese {0} e l'anno {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Inserimento automatico tasso Listino se mancante
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Importo totale pagato
@@ -2891,7 +2897,7 @@
 DocType: Payment Tool,Set Matching Amounts,Impostare Importi abbinabili
 DocType: Purchase Invoice,Taxes and Charges Added,Tasse e spese aggiuntive
 ,Sales Funnel,imbuto di vendita
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,L'abbreviazione è obbligatoria
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,L'abbreviazione è obbligatoria
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Grazie per il vostro interesse per sottoscrivere i nostri aggiornamenti
 ,Qty to Transfer,Qtà da Trasferire
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Preventivo a clienti o contatti.
@@ -2919,7 +2925,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} è fermato
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Codice a barre {0} già utilizzato nel Prodotto {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Prossimi eventi
@@ -2941,7 +2947,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Selezionare l'anno fiscale ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS Profilo tenuto a POS Entry
 DocType: Hub Settings,Name Token,Nome Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Selling standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Selling standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Almeno un Magazzino è obbligatorio
 DocType: Serial No,Out of Warranty,Fuori Garanzia
 DocType: BOM Replace Tool,Replace,Sostituire
@@ -3064,7 +3070,7 @@
 DocType: Sales Invoice,Paid Amount,Importo pagato
 ,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
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo a bilancio già nel debito, non è permesso impostare il 'Saldo Futuro' come 'credito'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestione della qualità
 DocType: Production Planning Tool,Filter based on customer,Filtro basato sul cliente
@@ -3165,7 +3171,7 @@
 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),Indirizzo di posta in arrivo per l'assistenza (p. es. suppor@example.com )
 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 +578,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
 DocType: Salary Slip,Salary Slip,Busta paga
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Alla Data' è obbligatorio
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generare documenti di trasporto per i pacchetti da consegnare. Utilizzato per comunicare il numero del pacchetto, contenuto della confezione e il suo peso."
@@ -3176,7 +3182,7 @@
 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 &quot;inviati&quot;, una e-mail a comparsa visualizzata automaticamente per inviare una e-mail agli associati &quot;Contatto&quot; in tale operazione, con la transazione come allegato. L&#39;utente può o non può inviare l&#39;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 +749,It is needed to fetch Item Details.,E &#39;necessario per recuperare Dettagli elemento.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,It is needed to fetch Item Details.,E &#39;necessario per recuperare Dettagli elemento.
 DocType: Salary Slip,Net Pay,Retribuzione Netta
 DocType: Account,Account,Account
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial No {0} è già stato ricevuto
@@ -3202,6 +3208,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: C-Form,Series,serie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,Classificazione Articolo
@@ -3288,7 +3295,7 @@
 DocType: Workstation,Operating Costs,Costi operativi
 DocType: Employee Leave Approver,Employee Leave Approver,Responsabile / Approvatore Ferie
 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 +434,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 +420,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."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Acquisto Maestro Direttore
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Ordine di produzione {0} deve essere presentata
@@ -3296,7 +3303,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Rapporti principali
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,'A Data' deve essere successiva a 'Da Data'
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Aggiungi / Modifica prezzi
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,I Miei Ordini
@@ -3344,7 +3351,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Fila # {0}: Impostare fornitore per voce {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Website Immagine {0} collegata alla voce {1} non può essere trovato
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Website Immagine {0} collegata alla voce {1} non può essere trovato
 DocType: Issue,Content Type,Tipo Contenuto
 apps/erpnext/erpnext/setup/setup_wizard/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.
@@ -3358,7 +3365,7 @@
 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 +357,'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 +351,'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,Riferimento del conto
@@ -3384,7 +3391,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Chiusura account {0} deve essere di tipo Responsabilità / Patrimonio netto
 DocType: Authorization Rule,Based On,Basato su
 DocType: Sales Order Item,Ordered Qty,Quantità ordinato
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Voce {0} è disattivato
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Voce {0} è disattivato
 DocType: Stock Settings,Stock Frozen Upto,Giacenza Bloccate Fino
 apps/erpnext/erpnext/controllers/recurring_document.py +168,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.
@@ -3392,7 +3399,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","L'acquisto deve essere controllato, se ""applicabile per"" bisogna selezionarlo come {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Sconto deve essere inferiore a 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Scrivi Off Importo (Società valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Fila # {0}: Si prega di impostare la quantità di riordino
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Fila # {0}: Si prega di impostare la quantità di riordino
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Voucher Cost
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Impostare {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ripetere il Giorno del mese
@@ -3464,7 +3471,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Guarda ora
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Selezionare il periodo in cui la fattura viene generato automaticamente
 DocType: BOM,Raw Material Cost,Costo Materie Prime
-DocType: Item,Re-Order Level,Livello Ri-ordino
+DocType: Item Reorder,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.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,A tempo parziale
 DocType: Employee,Applicable Holiday List,Lista Vacanze Applicabile
@@ -3519,7 +3526,7 @@
 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 +573,Please specify Attribute Value for attribute {0},Si prega di specificare Attributo Valore per l&#39;attributo {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Please specify Attribute Value for attribute {0},Si prega di specificare Attributo Valore per l&#39;attributo {0}
 DocType: Item,Default Warehouse,Magazzino Predefinito
 DocType: Task,Actual End Date (via Time Logs),Data di fine effettiva (da registro presenze)
 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}
@@ -3598,7 +3605,7 @@
 DocType: Address,Office,Ufficio
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Diario scritture contabili.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponibile Quantità a partire Warehouse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Si prega di selezionare i dipendenti Record prima.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,Si prega di selezionare i dipendenti Record prima.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,Inserisci il Conto uscite
@@ -3673,7 +3680,7 @@
 DocType: Item Attribute,Numeric Values,Valori numerici
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Allega Logo
 DocType: Customer,Commission Rate,Tasso Commissione
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Crea variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Crea variante
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Blocco domande uscita da ufficio.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Carrello è Vuoto
 DocType: Production Order,Actual Operating Cost,Costo operativo effettivo
@@ -3690,15 +3697,14 @@
 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 +380,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 +419,"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&#39;oggetto o Produzione Voce"
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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&#39;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 +380, (Half Day),(Mezza giornata)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Recupera elementi da Distinta Base
diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index 5b17a73..56eec18 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,％支払
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),為替レートは {0} と同じでなければなりません {1}（{2}）
 DocType: Sales Invoice,Customer Name,顧客名
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},銀行口座は次のように名前を付けることはできません{0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},銀行口座は次のように名前を付けることはできません{0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),{0}の残高はゼロより小さくすることはできません（{1}）
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,新しい休暇申請
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,新しい休暇申請
 apps/erpnext/erpnext/setup/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,支払口座のモード
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",行動ログは、タスク（時間・請求の追跡に使用）に対してユーザーが実行します。
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},新しい{0}：＃{1}
 ,Sales Partners Commission,販売パートナー手数料
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,略語は5字以上使用することができません
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,略語は5字以上使用することができません
 DocType: Payment Request,Payment Request,支払請求書
 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.",この属性にはアイテムバリエーションが存在するため、属性値 {0} を {1} から削除することができません
@@ -196,6 +196,7 @@
 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 (%),価格表での割引率（％）
 DocType: Offer Letter,Select Terms and Conditions,規約を選択
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,タイムアウト値
 DocType: Production Planning Tool,Sales Orders,受注
 DocType: Purchase Taxes and Charges,Valuation,評価
 ,Purchase Order Trends,発注傾向
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,TV
 DocType: Production Order Operation,Updated via 'Time Log',「時間ログ」から更新
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},アカウント{0}は会社{1}に属していません
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},アドバンス量は、より大きくすることはできません{0} {1}
 DocType: Naming Series,Series List for this Transaction,この取引のシリーズ一覧
 DocType: Sales Invoice,Is Opening Entry,オープンエントリー
 DocType: Customer Group,Mention if non-standard receivable account applicable,非標準的な売掛金が適応可能な場合に記載
@@ -227,7 +229,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,上記の基準の給与伝票を作成します。
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,説明がありません
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,仕入要求
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,選択した休暇承認者のみ、休暇申請を提出可能です
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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} に命名シリーズを設定してください
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},倉庫{0}は会社{1}に属していません
 DocType: Item Website Specification,Item Website Specification,アイテムのWebサイトの仕様
 DocType: Payment Tool,Reference No,参照番号
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,休暇
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,休暇
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,年次
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,在庫棚卸アイテム
 DocType: Stock Entry,Sales Invoice No,請求番号
@@ -249,7 +251,7 @@
 DocType: Pricing Rule,Supplier Type,サプライヤータイプ
 DocType: Item,Publish in Hub,ハブに公開
 ,Terretory,地域
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,アイテム{0}をキャンセルしました
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,アイテム{0}をキャンセルしました
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,資材要求
 DocType: Bank Reconciliation,Update Clearance Date,清算日の更新
 DocType: Item,Purchase Details,仕入詳細
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,納品書
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,税設定
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,支払エントリが変更されています。引用しなおしてください
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,アイテムの税金に{0}が2回入力されています
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,月と年を選択してください
@@ -330,7 +332,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,あなたのメール アドレス
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,添付ファイルを参照してください
 DocType: Purchase Order,% Received,％受領
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,セットアップはすでに完了しています！
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,セットアップはすでに完了しています！
 ,Finished Goods,完成品
 DocType: Delivery Note,Instructions,説明書
 DocType: Quality Inspection,Inspected By,検査担当
@@ -355,14 +357,13 @@
 ,Purchase Register,仕入帳
 DocType: Landed Cost Item,Applicable Charges,適用料金
 DocType: Workstation,Consumable Cost,消耗品費
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0}（{1}）は「休暇承認者」の役割を持っている必要があります
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0}（{1}）は「休暇承認者」の役割を持っている必要があります
 DocType: Purchase Receipt,Vehicle Date,車両日付
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,検診
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,失敗の原因
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},作業所は、休日リストに従って、次の日に休業します：{0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,機会
 DocType: Employee,Single,シングル
-DocType: Issue,Attachment,添付
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,予算はグループコストセンターに設定することができません
 DocType: Account,Cost of Goods Sold,売上原価
 DocType: Purchase Invoice,Yearly,毎年
@@ -391,7 +392,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,属性 {0} は属性表内で複数回選択されています
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,属性 {0} は属性表内で複数回選択されています
 DocType: HR Settings,Employee record is created using selected field. ,従業員レコードは選択されたフィールドを使用して作成されます。
 DocType: Sales Order,Not Applicable,特になし
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,休日マスター
@@ -430,7 +431,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,化粧品
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items",マージするには、両方のアイテムで次の属性が同じである必要があります。
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items",マージするには、両方のアイテムで次の属性が同じである必要があります。
 DocType: Shipping Rule,Net Weight,正味重量
 DocType: Employee,Emergency Phone,緊急電話
 ,Serial No Warranty Expiry,シリアル番号（保証期限）
@@ -441,7 +442,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,業務委託管理
 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,価格表の通貨が会社の基本通貨に換算されるレート
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},アカウント{0}は会社{1}に属していません
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},アカウント{0}は会社{1}に属していません
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,既に別の会社に使用される略語
 DocType: Selling Settings,Default Customer Group,デフォルトの顧客グループ
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",無効にすると、「四捨五入された合計」欄は各取引には表示されなくなります
 DocType: BOM,Operating Cost,運用費
@@ -475,6 +477,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,請求書テーブルにレコードが見つかりません
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,最初の会社と当事者タイプを選択してください
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,会計年度
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,累積値
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",シリアル番号をマージすることはできません
 DocType: Project Task,Project Task,プロジェクトタスク
 ,Lead Id,リードID
@@ -496,7 +499,7 @@
 DocType: Quotation,Quotation To,見積先
 DocType: Lead,Middle Income,中収益
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),開く（貸方）
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,すでに別の測定単位でいくつかのトランザクションを行っているので、項目のデフォルトの単位は、{0}を直接変更することはできません。あなたは、異なるデフォルトのUOMを使用する新しいアイテムを作成する必要があります。
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,すでに別の測定単位でいくつかのトランザクションを行っているので、項目のデフォルトの単位は、{0}を直接変更することはできません。あなたは、異なるデフォルトのUOMを使用する新しいアイテムを作成する必要があります。
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,割当額をマイナスにすることはできません
 DocType: Purchase Order Item,Billed Amt,支払額
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,在庫エントリが作成されるのに対する論理的な倉庫。
@@ -574,7 +577,7 @@
 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 +543,Item has variants.,アイテムはバリエーションがあります
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,ツリー型
@@ -587,6 +590,7 @@
 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 +33,Goods received from Suppliers.,サプライヤーから受け取った商品。
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,[値
 DocType: Lead,Campaign Name,キャンペーン名
 ,Reserved,予約済
 DocType: Purchase Order,Supply Raw Materials,原材料供給
@@ -601,16 +605,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,既存の取引を持つアカウントは、元帳に変換することはできません
 DocType: Delivery Note,Customer's Purchase Order No,顧客の発注番号
 DocType: Employee,Cell Number,携帯電話の番号
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,生成される自動材料要求
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,生成される自動材料要求
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,失われた
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,「対仕訳入力」列に対してこの伝票を入力することはできません
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,エネルギー
 DocType: Opportunity,Opportunity From,機会元
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,月次給与計算書。
 DocType: Item Group,Website Specifications,ウェブサイトの仕様
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},あなたのアドレステンプレート{0}にエラーがあります
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,新しいアカウント
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}：タイプ{1}の{0}から
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,行{0}：換算係数が必須です
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",複数の価格ルールは、同じ基準で存在し、優先順位を割り当てることにより、競合を解決してください。価格ルール：{0}
 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.,会計エントリはリーフノードに対して行うことができます。グループに対するエントリは許可されていません。
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,別の部品表にリンクされているため、無効化や部品表のキャンセルはできません
 DocType: Opportunity,Maintenance,メンテナンス
@@ -679,7 +685,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,価格表が選択されていません
 DocType: Employee,Family Background,家族構成
 DocType: Process Payroll,Send Email,メールを送信
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},警告：不正な添付ファイル{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},警告：不正な添付ファイル{0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,権限がありませんん
 DocType: Company,Default Bank Account,デフォルト銀行口座
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",「当事者」に基づいてフィルタリングするには、最初の「当事者タイプ」を選択してください
@@ -709,13 +715,13 @@
 DocType: Production Planning Tool,Select Items,アイテム選択
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{2}を指定日とする支払{1}に対する{0}
 DocType: Maintenance Visit,Completion Status,完了状況
-DocType: Sales Invoice Item,Target Warehouse,ターゲット倉庫
+DocType: Production Order,Target Warehouse,ターゲット倉庫
 DocType: Item,Allow over delivery or receipt upto this percent,このパーセント以上の配送または受領を許可
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,納品予定日は受注日より前にすることはできません
 DocType: Upload Attendance,Import Attendance,出勤インポート
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,全てのアイテムグループ
 DocType: Process Payroll,Activity Log,活動ログ
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,純損益
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,純損益
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,取引の送信時、自動的にメッセージを作成します。
 DocType: Production Order,Item To Manufacture,製造するアイテム
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1}状態は{2}です
@@ -723,7 +729,7 @@
 DocType: Sales Order Item,Projected Qty,予想数量
 DocType: Sales Invoice,Payment Due Date,支払期日
 DocType: Newsletter,Newsletter Manager,ニュースレターマネージャー
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,アイテムバリエーション{0}は既に同じ属性で存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,アイテムバリエーション{0}は既に同じ属性で存在しています
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',「オープニング」
 DocType: Notification Control,Delivery Note Message,納品書のメッセージ
 DocType: Expense Claim,Expenses,経費
@@ -733,7 +739,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,研究開発
 ,Amount to Bill,支払額
 DocType: Company,Registration Details,登録の詳細
-DocType: Item,Re-Order Qty,再オーダー数量
+DocType: Item Reorder,Re-Order Qty,再オーダー数量
 DocType: Leave Block List Date,Leave Block List Date,休暇リスト日付
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},{0}に送信するようにスケジュールしました
 DocType: Pricing Rule,Price or Discount,価格または割引
@@ -776,7 +782,7 @@
 DocType: Bank Reconciliation,Total Amount,合計
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,インターネット出版
 DocType: Production Planning Tool,Production Orders,製造指示
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,価格のバランス
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,価格のバランス
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,販売価格表
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,同期アイテムを公開
 DocType: Bank Reconciliation,Account Currency,アカウント通貨
@@ -785,7 +791,7 @@
 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 +538,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
 DocType: Quality Inspection Reading,Reading 6,報告要素6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,仕入請求前払
 DocType: Address,Shop,店
@@ -864,7 +870,7 @@
 DocType: POS Profile,Cash/Bank Account,現金/銀行口座
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,数量または値の変化のないアイテムを削除しました。
 DocType: Delivery Note,Delivery To,納品先
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,属性表は必須です
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,割引
@@ -892,7 +898,7 @@
 DocType: Tax Rule,Shipping State,出荷状態
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,アイテムは、ボタン「領収書からアイテムの取得」を使用して追加する必要があります
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,販売費
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,標準購入
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,標準購入
 DocType: GL Entry,Against,に対して
 DocType: Item,Default Selling Cost Center,デフォルト販売コストセンター
 DocType: Sales Partner,Implementation Partner,導入パートナー
@@ -934,7 +940,7 @@
 DocType: Sales Partner,Distributor,販売代理店
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ショッピングカート出荷ルール
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,受注キャンセルには製造指示{0}のキャンセルをしなければなりません
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',設定」で追加の割引を適用」してください
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',設定」で追加の割引を適用」してください
 ,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.,タイムログを選択し、新しい請求書を作成し提出してください。
@@ -1002,9 +1008,9 @@
 DocType: Contact,User ID,ユーザー ID
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,元帳の表示
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最初
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group",同名のアイテムグループが存在しますので、アイテム名を変えるか、アイテムグループ名を変更してください
 DocType: Production Order,Manufacture against Sales Order,受注に対する製造
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,その他の地域
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,給与総額
@@ -1034,7 +1040,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged",企業はマージできません
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged",企業はマージできません
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,S
 DocType: Employee,Employee Number,従業員番号
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},ケース番号が既に使用されています。ケース番号 {0} から試してみてください
@@ -1053,7 +1059,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,農業
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,あなたの製品またはサービス
 DocType: Mode of Payment,Mode of Payment,支払方法
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,ウェブサイトのイメージは、公開ファイルまたはウェブサイトのURLを指定する必要があります
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,ウェブサイトのイメージは、公開ファイルまたはウェブサイトのURLを指定する必要があります
 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,倉庫連絡先情報
@@ -1125,6 +1131,7 @@
 DocType: Address,Utilities,ユーティリティー
 DocType: Purchase Invoice Item,Accounting,会計
 DocType: Features Setup,Features Setup,機能設定
+DocType: Item,Is Service Item,サービスアイテム
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,受付期間は、外部休暇割当期間にすることはできません
 DocType: Activity Cost,Projects,プロジェクト
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,会計年度を選択してください
@@ -1155,7 +1162,7 @@
 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 +465,cannot be greater than 100,100を超えることはできません
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
 DocType: Maintenance Visit,Unscheduled,スケジュール解除済
 DocType: Employee,Owned,所有済
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,無給休暇に依存
@@ -1215,7 +1222,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,政府
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,アイテムバリエーション
 DocType: Company,Services,サービス
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),計（{0}）
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),計（{0}）
 DocType: Cost Center,Parent Cost Center,親コストセンター
 DocType: Sales Invoice,Source,ソース
 DocType: Leave Type,Is Leave Without Pay,無給休暇
@@ -1290,17 +1297,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,支払メールを再送信
 DocType: Dependent Task,Dependent Task,依存タスク
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},休暇タイプ{0}は、{1}よりも長くすることはできません
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,消費額
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0}ビュー
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,現金の純変更
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,現金の純変更
 DocType: Salary Structure Deduction,Salary Structure Deduction,給与体系（控除）
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,数量{0}が変換係数表に複数回記入されました。
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,数量{0}が変換係数表に複数回記入されました。
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},支払い要求がすでに存在している{0}
 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 +182,Quantity must not be more than {0},数量は{0}以下でなければなりません
@@ -1363,7 +1370,7 @@
 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: Packed Item,To Warehouse (Optional),倉庫に（オプション）
 DocType: Sales Invoice,Paid Amount (Company Currency),支払額（会社通貨）
 DocType: Purchase Invoice,Additional Discount,追加割引
 DocType: Selling Settings,Selling Settings,販売設定
@@ -1372,7 +1379,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",会社、月と年度は必須です
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,マーケティング費用
 ,Item Shortage Report,アイテム不足レポート
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量が記載されていますので、あわせて「重量単位」を記載してください
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量が記載されていますので、あわせて「重量単位」を記載してください
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,この在庫エントリを作成するために使用される資材要求
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,アイテムの１単位
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',時間ログバッチ{0}は「提出済」でなければなりません
@@ -1383,6 +1390,7 @@
 DocType: Employee,Date Of Retirement,退職日
 DocType: Upload Attendance,Get Template,テンプレートを取得
 DocType: Address,Postal,郵便
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNextのセットアップが完了！
 DocType: Item,Weightage,重み付け
 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,"同じ名前の顧客グループが存在します
 顧客名か顧客グループのどちらかの名前を変更してください"
@@ -1412,12 +1420,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,カラムが多すぎます。レポートをエクスポートして、スプレッドシートアプリケーションを使用して印刷します。
 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 +139,Main,メイン
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,メイン
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,バリエーション
 DocType: Naming Series,Set prefix for numbering series on your transactions,取引に連番の接頭辞を設定
 DocType: Employee Attendance Tool,Employees HTML,従業員のHTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,停止された注文はキャンセルできません。キャンセルするには停止解除してください
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,このアイテムまたはテンプレートには、デフォルトの部品表（{0}）がアクティブでなければなりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,バリエーション
@@ -1442,7 +1450,6 @@
 DocType: Sales Order,To Deliver and Bill,配送・請求する
 DocType: GL Entry,Credit Amount in Account Currency,アカウント通貨での貸方金額
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,製造用の時間ログ
-DocType: Item,Apply Warehouse-wise Reorder Level,倉庫ごとの再発注レベルを適用
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,部品表{0}を登録しなければなりません
 DocType: Authorization Control,Authorization Control,認証コントロール
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：倉庫拒否は却下されたアイテムに対して必須である{1}
@@ -1541,6 +1548,7 @@
 時間ログから作業ステータスを更新してください"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,投資
 DocType: Issue,Resolution Details,課題解決詳細
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,配分
 DocType: Quality Inspection Reading,Acceptance Criteria,合否基準
 DocType: Item Attribute,Attribute Name,属性名
 DocType: Item Group,Show In Website,ウェブサイトで表示
@@ -1591,7 +1599,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,経費請求は承認待ちです。経費承認者のみ、ステータスを更新することができます。
 DocType: Purchase Invoice,Additional Discount Amount,追加割引額
 DocType: Leave Block List Allow,Leave Block List Allow,許可する休暇リスト
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,略称は、空白またはスペースにすることはできません
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,略称は、空白またはスペースにすることはできません
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,非グループのグループ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,スポーツ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,実費計
@@ -1632,7 +1640,7 @@
 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**.,「会計年度」は、会計年度を表します。すべての会計記帳および他の主要な取引は、「会計年度」に対して記録されます。
 DocType: Opportunity,Customer / Lead Address,顧客／リード住所
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},警告：添付ファイル{0}に無効なSSL証明書
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},警告：添付ファイル{0}に無効なSSL証明書
 DocType: Production Order Operation,Actual Operation Time,実作業時間
 DocType: Authorization Rule,Applicable To (User),（ユーザー）に適用
 DocType: Purchase Taxes and Charges,Deduct,差し引く
@@ -1781,7 +1789,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,ケース番号は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,営業チームと販売パートナー（チャネルパートナー）がある場合、それらはタグ付けされ、営業活動での貢献度を保持することができます
 DocType: Item,Show a slideshow at the top of the page,ページの上部にスライドショーを表示
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,店舗
+DocType: Item,"Allow in Sales Order of type ""Service""",「サービス」タイプの受注で許可
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,店舗
 DocType: Time Log,Projects Manager,プロジェクトマネージャー
 DocType: Serial No,Delivery Time,納品時間
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,エイジング基準
@@ -1806,7 +1815,7 @@
 ,Financial Analytics,財務分析
 DocType: Quality Inspection,Verified By,検証者
 DocType: Address,Subsidiary,子会社
-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.","既存の取引が存在するため、会社のデフォルトの通貨を変更することができません。
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","既存の取引が存在するため、会社のデフォルトの通貨を変更することができません。
 デフォルトの通貨を変更するには取引をキャンセルする必要があります。"
 DocType: Quality Inspection,Purchase Receipt No,領収書番号
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,手付金
@@ -1855,7 +1864,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,原材料は空白にできません。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.",請求書は、ドロップシッピングの項目を含む、株式を更新できませんでした。
 DocType: Newsletter,Test,テスト
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 +459,Quick Journal Entry,クイック仕訳
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,アイテムに対して部品表が記載されている場合は、レートを変更することができません
@@ -1971,7 +1980,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,まず納品書が先です
 DocType: Purchase Invoice,Currency and Price List,通貨と価格表
 DocType: Opportunity,Customer / Lead Name,顧客／リード名
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,決済日が記入されていません
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,決済日が記入されていません
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,製造
 DocType: Item,Allow Production Order,製造指示を許可
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,行{0}：開始日は終了日より前でなければなりません
@@ -1981,7 +1990,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,親タイプ
 DocType: Salary Structure,Total Earning,収益合計
 DocType: Purchase Receipt,Time at which materials were received,資材受領時刻
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,自分の住所
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,自分の住所
 DocType: Stock Ledger Entry,Outgoing Rate,出庫率
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,組織支部マスター。
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,または
@@ -2050,7 +2059,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,顧客グループツリーを管理します。
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,新しいコストセンター名
 DocType: Leave Control Panel,Leave Control Panel,[コントロールパネル]を閉じる
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,デフォルトの住所テンプレートが見つかりませんでした。設定> 印刷とブランディング>住所テンプレートから新しく作成してください。
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,デフォルトの住所テンプレートが見つかりませんでした。設定> 印刷とブランディング>住所テンプレートから新しく作成してください。
 DocType: Appraisal,HR User,人事ユーザー
 DocType: Purchase Invoice,Taxes and Charges Deducted,租税公課控除
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,課題
@@ -2067,7 +2076,7 @@
 ,Sales Browser,販売ブラウザ
 DocType: Journal Entry,Total Credit,貸方合計
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},警告：別の{0}＃{1}が在庫エントリ{2}に対して存在します
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,現地
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,L
@@ -2086,7 +2095,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,すべての販売取引について、複数の「営業担当者」に対するタグを付けることができるため、これによって目標を設定しチェックすることができます。
 ,S.O. No.,受注番号
 DocType: Production Order Operation,Make Time Log,時間ログを作成
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,再注文数量を設定してください
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},リード{0}から顧客を作成してください
 DocType: Price List,Applicable for Countries,国に適用
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,コンピュータ
@@ -2172,7 +2180,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,関連するエントリを取得
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,在庫の会計エントリー
 DocType: Sales Invoice,Sales Team1,販売チーム1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,アイテム{0}は存在しません
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,アイテム{0}は存在しません
 DocType: Sales Invoice,Customer Address,顧客の住所
 DocType: Payment Request,Recipient and Message,受信者とメッセージ
 DocType: Purchase Invoice,Apply Additional Discount On,追加割引に適用
@@ -2214,7 +2222,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,評価額
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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,ログ名称変更
@@ -2252,7 +2260,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,退職日を入力してください。
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,量／額
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,ステータスを「承認」とした休暇申請のみ提出可能です
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,住所タイトルは必須です。
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,住所タイトルは必須です。
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,問い合わせの内容がキャンペーンの場合は、キャンペーンの名前を入力してください
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,新聞社
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,会計年度を選択
@@ -2276,6 +2284,7 @@
 DocType: UOM,Must be Whole Number,整数でなければなりません
 DocType: Leave Control Panel,New Leaves Allocated (In Days),新しい有給休暇（日数）
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,シリアル番号 {0}は存在しません
+DocType: Sales Invoice Item,Customer Warehouse (Optional),カスタマー・ウェアハウス（オプション）
 DocType: Pricing Rule,Discount Percentage,割引率
 DocType: Payment Reconciliation Invoice,Invoice Number,請求番号
 apps/erpnext/erpnext/hooks.py +55,Orders,注文
@@ -2385,7 +2394,7 @@
 DocType: Appraisal,Appraisal,査定
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,日付が繰り返されます
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,署名権者
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},休暇承認者は{0}のいずれかである必要があります
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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,開始時間
@@ -2554,7 +2563,7 @@
 DocType: BOM Replace Tool,BOM Replace Tool,部品表交換ツール
 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 +733,Show tax break-up,表示減税アップ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,表示減税アップ
 apps/erpnext/erpnext/accounts/party.py +283,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',製造活動に関与する場合、アイテムを「製造済」にすることができます
@@ -2603,7 +2612,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,確認のため会社名を再入力してください
@@ -2630,9 +2639,6 @@
 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,入社日は誕生日よりも後でなければなりません
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,給与体系
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","同じ抽出条件に複数の価格ルールが存在しますので、優先順位を設定して衝突を解決してください。
-価格ルール：{0}"
 DocType: Account,Bank,銀行
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空会社
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,資材課題
@@ -2657,7 +2663,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,証券・商品取引所
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',バリアントのためのデフォルトの単位は &#39;{0}&#39;テンプレートと同じである必要があります &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',バリアントのためのデフォルトの単位は &#39;{0}&#39;テンプレートと同じである必要があります &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,計算基準
 DocType: Delivery Note Item,From Warehouse,倉庫から
 DocType: Purchase Taxes and Charges,Valuation and Total,評価と総合
@@ -2666,7 +2672,7 @@
 DocType: Account,Purchase User,仕入ユーザー
 DocType: Notification Control,Customize the Notification,通知をカスタマイズ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,営業活動によるキャッシュフロー
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,デフォルトのアドレステンプレートを削除することはできません
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,デフォルトのアドレステンプレートを削除することはできません
 DocType: Sales Invoice,Shipping Rule,出荷ルール
 DocType: Manufacturer,Limited to 12 characters,12文字に制限され
 DocType: Journal Entry,Print Heading,印刷見出し
@@ -2759,7 +2765,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,プロジェクトごとのデータは、引用符は使用できません
 DocType: Project,Expected End Date,終了予定日
 DocType: Appraisal Template,Appraisal Template Title,査定テンプレートタイトル
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,営利企業
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,素晴らしいサービス
@@ -2778,7 +2784,7 @@
 DocType: Customer,Default Receivable Accounts,デフォルト売掛金勘定
 DocType: Tax Rule,Billing State,請求状況
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,移転
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),（部分組立品を含む）展開した部品表を取得する
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),（部分組立品を含む）展開した部品表を取得する
 DocType: Authorization Rule,Applicable To (Employee),（従業員）に適用
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,期日は必須です
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,属性 {0} の増分は0にすることはできません
@@ -2811,7 +2817,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,マイナスの評価額は許可されていません
 DocType: Holiday List,Weekly Off,週休
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","例：2012, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),暫定損益（貸方）
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),暫定損益（貸方）
 DocType: Sales Invoice,Return Against Sales Invoice,請求書に対する返品
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,アイテム5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},会社{1}のデフォルト値{0}を設定してください
@@ -2842,6 +2848,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,子を追加
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,アカウントの凍結と凍結エントリの編集が許可された役割
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,子ノードがあるため、コストセンターを元帳に変換することはできません
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,始値
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,シリアル番号
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,販売手数料
 DocType: Offer Letter Term,Value / Description,値／説明
@@ -2875,7 +2882,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,この会社に関連するすべての取引を正常に削除しました！
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,基準日
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,試用
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,在庫アイテムにはデフォルト倉庫が必須です。
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},{1}年{0}月の給与支払
 DocType: Stock Settings,Auto insert Price List rate if missing,空の場合価格表の単価を自動挿入
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,支出額合計
@@ -2911,7 +2917,7 @@
 DocType: Payment Tool,Set Matching Amounts,一致額を設定
 DocType: Purchase Invoice,Taxes and Charges Added,租税公課が追加されました。
 ,Sales Funnel,セールスファネル
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,略称は必須です
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,略称は必須です
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,アップデートに関心をお寄せいただきありがとうございます
 ,Qty to Transfer,転送する数量
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,リードや顧客への見積。
@@ -2939,7 +2945,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,サプライヤー見積
 DocType: Quotation,In Words will be visible once you save the Quotation.,見積を保存すると表示される表記内。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1}は停止しています
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},バーコード{0}はアイテム{1}で使用済です
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,今後のイベント
@@ -2961,7 +2967,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,年度選択...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POSエントリを作成するためにはPOSプロフィールが必要です
 DocType: Hub Settings,Name Token,名前トークン
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,標準販売
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,標準販売
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,倉庫は少なくとも1つ必須です
 DocType: Serial No,Out of Warranty,保証外
 DocType: BOM Replace Tool,Replace,置き換え
@@ -3085,7 +3091,7 @@
 DocType: Sales Invoice,Paid Amount,支払金額
 ,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,他にデフォルトがないので、このアドレステンプレートをデフォルトとして設定します
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,他にデフォルトがないので、このアドレステンプレートをデフォルトとして設定します
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",口座残高がすでに借方に存在しており、「残高仕訳先」を「貸方」に設定することはできません
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,品質管理
 DocType: Production Planning Tool,Filter based on customer,顧客に基づくフィルター
@@ -3186,7 +3192,7 @@
 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 +19,Shortage Qty,不足数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
 DocType: Salary Slip,Salary Slip,給料明細
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,「終了日」が必要です
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",納品する梱包の荷造伝票を生成します。パッケージ番号、内容と重量を通知するために使用します。
@@ -3197,7 +3203,7 @@
 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 +749,It is needed to fetch Item Details.,これは、アイテムの詳細を取得するために必要とされます。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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}はすでに受領されています
@@ -3223,6 +3229,7 @@
 DocType: BOM,Manufacturing User,製造ユーザー
 DocType: Purchase Order,Raw Materials Supplied,原材料供給
 DocType: Purchase Invoice,Recurring Print Format,繰り返し用印刷フォーマット
+DocType: C-Form,Series,シリーズ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,納品予定日は発注日より前にすることはできません
 DocType: Appraisal,Appraisal Template,査定テンプレート
 DocType: Item Group,Item Classification,アイテム分類
@@ -3309,7 +3316,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：この倉庫{1}には既に再注文エントリが存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.",見積が作成されているため、失注を宣言できません
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,仕入マスターマネージャー
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,製造指示{0}を提出しなければなりません
@@ -3317,7 +3324,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,メインレポート
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,終了日を開始日の前にすることはできません
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc文書型
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,価格の追加/編集
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,自分の注文
@@ -3365,7 +3372,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},行＃{0}：項目の設定サプライヤー{1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,ウェブサイトのイメージ{0}アイテムに添付{1}が見つかりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,ウェブサイトのイメージ{0}アイテムに添付{1}が見つかりません
 DocType: Issue,Content Type,コンテンツタイプ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,コンピュータ
 DocType: Item,List this Item in multiple groups on the website.,ウェブサイト上の複数のグループでこのアイテムを一覧表示します。
@@ -3379,7 +3386,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,在庫アイテム以外は「シリアル番号あり」を「はい」にすることができません。
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'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,勘定科目
@@ -3405,7 +3412,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,アカウント{0}を閉じると、型責任/エクイティのものでなければなりません
 DocType: Authorization Rule,Based On,参照元
 DocType: Sales Order Item,Ordered Qty,注文数
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,項目{0}が無効になっています
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,項目{0}が無効になっています
 DocType: Stock Settings,Stock Frozen Upto,在庫凍結
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},からと期間、繰り返しのために必須の日付までの期間{0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,プロジェクト活動／タスク
@@ -3413,7 +3420,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",適用のためには次のように選択されている場合の購入は、チェックする必要があります{0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,割引は100未満でなければなりません
 DocType: Purchase Invoice,Write Off Amount (Company Currency),償却額（会社通貨）
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,行＃{0}：再注文数量を設定してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,行＃{0}：再注文数量を設定してください
 DocType: Landed Cost Voucher,Landed Cost Voucher,陸揚費用伝票
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},{0}を設定してください
 DocType: Purchase Invoice,Repeat on Day of Month,毎月繰り返し
@@ -3487,7 +3494,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,表示
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,請求書が自動的に生成される期間を選択
 DocType: BOM,Raw Material Cost,原材料費
-DocType: Item,Re-Order Level,再注文レベル
+DocType: Item Reorder,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.,製造指示を出すまたは分析用に原材料をダウンロードするための、アイテムと計画数を入力してください。
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,パートタイム
 DocType: Employee,Applicable Holiday List,適切な休日リスト
@@ -3542,7 +3549,7 @@
 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 +573,Please specify Attribute Value for attribute {0},属性 {0} の属性値を指定してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}に対して予算を割り当てることができません
@@ -3621,7 +3628,7 @@
 DocType: Address,Office,事務所
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,会計仕訳
 DocType: Delivery Note Item,Available Qty at From Warehouse,倉庫からの利用可能な数量
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,先に従業員レコードを選択してください
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,先に従業員レコードを選択してください
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,経費勘定を入力してください
@@ -3696,7 +3703,7 @@
 DocType: Item Attribute,Numeric Values,数値
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,ロゴを添付
 DocType: Customer,Commission Rate,手数料率
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,バリエーション作成
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,バリエーション作成
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,部門別休暇申請
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,カートは空です
 DocType: Production Order,Actual Operating Cost,実際の営業費用
@@ -3713,15 +3720,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item",再注文のレベルを設定するには、アイテムは、購買アイテムや製造項目でなければなりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),（半日）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),（半日）
 DocType: Supplier,Credit Days,信用日数
 DocType: Leave Type,Is Carry Forward,繰越済
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,部品表からアイテムを取得
diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv
index bc7b271..5d41c72 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
@@ -18,12 +18,14 @@
 DocType: Employee,Rented,ជួល
 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/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.,* នឹងត្រូវបានគណនាក្នុងប្រតិបត្តិការនេះ។
 DocType: Purchase Order,Customer Contact,ទំនាក់ទំនងអតិថិជន
 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.,មិនមានលទ្ធផលជាច្រើនទៀត។
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,ផ្នែកច្បាប់
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},ពន្ធលើប្រភេទពិតប្រាកដមិនអាចត្រូវបានរួមបញ្ចូលនៅក្នុងអត្រាធាតុនៅក្នុងជួរដេក {0}
 DocType: C-Form,Customer,អតិថិជន
 DocType: Purchase Receipt Item,Required By,ដែលបានទាមទារដោយ
 DocType: Delivery Note,Return Against Delivery Note,ការវិលត្រឡប់ពីការប្រឆាំងនឹងការផ្តល់ចំណាំ
@@ -31,8 +33,10 @@
 DocType: Purchase Order,% Billed,% billed
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),អត្រាប្តូរប្រាក់ត្រូវតែមានដូចគ្នា {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ឈ្មោះអតិថិជន
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},គណនីធនាគារដែលមិនអាចត្រូវបានដាក់ឈ្មោះថាជា {0}
 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 +173,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,កម្រងឯកសារបន្ទាន់សម័យដោយជោគជ័យ
@@ -42,7 +46,8 @@
 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/hr/doctype/leave_application/leave_application.py +206,New Leave Application,ចាកចេញកម្មវិធីថ្មី
+apps/erpnext/erpnext/utilities/transaction_base.py +107,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 +226,New Leave Application,ចាកចេញកម្មវិធីថ្មី
 apps/erpnext/erpnext/setup/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,របៀបនៃការទូទាត់គណនី
@@ -53,6 +58,7 @@
 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/setup_wizard/industry_type.py +31,Health Care,ការថែទាំសុខភាព
 DocType: Purchase Invoice,Monthly,ប្រចាំខែ
@@ -63,6 +69,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/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 +199,Row {0}: {1} {2} does not match with {3},ជួរដេក {0}: {1} {2} មិនផ្គូផ្គងនឹង {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,ជួរដេក # {0}:
 DocType: Delivery Note,Vehicle No,គ្មានយានយន្ត
 apps/erpnext/erpnext/public/js/pos/pos.js +549,Please select Price List,សូមជ្រើសតារាងតម្លៃ
@@ -73,8 +80,9 @@
 DocType: Cost Center,Stock User,អ្នកប្រើប្រាស់ភាគហ៊ុន
 DocType: Company,Phone No,គ្មានទូរស័ព្ទ
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","កំណត់ហេតុនៃសកម្មភាពអនុវត្តដោយអ្នកប្រើប្រឆាំងនឹងភារកិច្ចដែលអាចត្រូវបានប្រើសម្រាប់តាមដានពេលវេលា, វិក័យប័ត្រ។"
+apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},ថ្មី {0}: # {1}
 ,Sales Partners Commission,គណៈកម្មាធិការលក់ដៃគូ
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,អក្សរកាត់មិនអាចមានច្រើនជាង 5 តួអក្សរ
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,អក្សរកាត់មិនអាចមានច្រើនជាង 5 តួអក្សរ
 DocType: Payment Request,Payment Request,ស្នើសុំការទូទាត់
 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.",តម្លៃគុណលក្ខណៈ {0} មិនអាចត្រូវបានយកចេញពី {1} ជាធាតុវ៉ារ្យ៉ង់ \ មានដែលមានគុណលក្ខណៈនេះ។
@@ -94,6 +102,7 @@
 DocType: Employee,Married,រៀបការជាមួយ
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},មិនត្រូវបានអនុញ្ញាតសម្រាប់ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,ទទួលបានធាតុពី
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +399,Stock cannot be updated against Delivery Note {0},ភាគហ៊ុនដែលមិនអាចធ្វើបច្ចុប្បន្នភាពការប្រឆាំងនឹងការដឹកជញ្ជូនចំណាំ {0}
 DocType: Payment Reconciliation,Reconcile,សម្របសម្រួល
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,គ្រឿងទេស
 DocType: Quality Inspection Reading,Reading 1,ការអានទី 1
@@ -108,7 +117,9 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,សូមរៀបចំរបស់បុគ្គលិកដាក់ឈ្មោះប្រព័ន្ធធនធានមនុស្ស&gt; ករកំណត់ធនធានមនុស្ស
 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 +137,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) * ជាក់ស្តែងប្រតិបត្តិការម៉ោង
@@ -118,6 +129,7 @@
 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/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},ពី {0} ទៅ {1}
 DocType: Item,Copy From Item Group,ការចម្លងពីធាតុគ្រុប
 DocType: Journal Entry,Opening Entry,ការបើកចូល
 DocType: Stock Entry,Additional Costs,ការចំណាយបន្ថែមទៀត
@@ -129,6 +141,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,គោលដៅនៅលើ
 DocType: BOM,Total Cost,ការចំណាយសរុប
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,កំណត់ហេតុសកម្មភាព:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +192,Item {0} does not exist in the system or has expired,ធាតុ {0} មិនមាននៅក្នុងប្រព័ន្ធឬបានផុតកំណត់
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,អចលនទ្រព្យ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,សេចក្តីថ្លែងការណ៍របស់គណនី
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ឱសថ
@@ -149,11 +162,14 @@
 DocType: Production Order Operation,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 +108,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 +123,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 +448,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 +527,"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 +98,Settings for HR Module,ការកំណត់សម្រាប់ម៉ូឌុលធនធានមនុស្ស
 DocType: SMS Center,SMS Center,ផ្ញើសារជាអក្សរមជ្ឈមណ្ឌល
 DocType: BOM Replace Tool,New BOM,Bom ដែលថ្មី
@@ -169,14 +185,17 @@
 apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,ធាតុនិងតម្លៃ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},ពីកាលបរិច្ឆេទគួរជានៅក្នុងឆ្នាំសារពើពន្ធ។ សន្មត់ថាពីកាលបរិច្ឆេទ = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,ជ្រើសនិយោជិតដែលអ្នកកំពុងបង្កើតវាយតម្លៃនេះ។
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},ចំណាយប្រាក់អស់មជ្ឈមណ្ឌល {0} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
 DocType: Customer,Individual,បុគគល
 apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,ផែនការសម្រាប់ការមើលថែទាំ។
 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 +81,Installation date cannot be before delivery date for Item {0},កាលបរិច្ឆេទដំឡើងមិនអាចជាមុនកាលបរិច្ឆេទចែកចាយសម្រាប់ធាតុ {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),ការបញ្ចុះតំលៃលើតំលៃអត្រាបញ្ជី (%)
 DocType: Offer Letter,Select Terms and Conditions,ជ្រើសលក្ខខណ្ឌ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,តម្លៃចេញ
 DocType: Production Planning Tool,Sales Orders,ការបញ្ជាទិញការលក់
 DocType: Purchase Taxes and Charges,Valuation,ការវាយតម្លៃ
 ,Purchase Order Trends,ទិញលំដាប់និន្នាការ
@@ -189,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,ទូរទស្សន៏
 DocType: Production Order Operation,Updated via 'Time Log',ធ្វើឱ្យទាន់សម័យតាមរយៈ &quot;ពេលវេលាកំណត់ហេតុ &#39;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},គណនី {0} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},ចំនួនទឹកប្រាក់ជាមុនមិនអាចច្រើនជាង {0} {1}
 DocType: Naming Series,Series List for this Transaction,បញ្ជីស៊េរីសម្រាប់ប្រតិបត្តិការនេះ
 DocType: Sales Invoice,Is Opening Entry,ត្រូវការបើកចូល
 DocType: Customer Group,Mention if non-standard receivable account applicable,និយាយបានបើគណនីដែលមិនមែនជាស្តង់ដាទទួលអនុវត្តបាន
@@ -208,14 +228,17 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,បង្កើតប័ណ្ណប្រាក់បៀវត្សចំពោះលក្ខណៈវិនិច្ឆ័យដែលបានរៀបរាប់ខាងលើ។
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,ការពិពណ៌នាដែលបានផ្ដល់ឱ្យមិនមាន
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ស្នើសុំសម្រាប់ការទិញ។
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,មានតែការយល់ព្រមចាកចេញជ្រើសអាចដាក់ពាក្យសុំចាកចេញនេះ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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} តាមរយៈការដំឡើង&gt; ករកំណត់&gt; ដាក់ឈ្មោះកម្រងឯកសារ
 DocType: Time Log,Will be updated when batched.,នឹងត្រូវបានបន្ថែមពេល batched ។
 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 +178,Warehouse {0} does not belong to company {1},ឃ្លាំង {0} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
 DocType: Item Website Specification,Item Website Specification,បញ្ជាក់ធាតុគេហទំព័រ
 DocType: Payment Tool,Reference No,សេចក្តីយោងគ្មាន
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,ទុកឱ្យទប់ស្កាត់
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,ទុកឱ្យទប់ស្កាត់
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},ធាតុ {0} បានឈានដល់ទីបញ្ចប់នៃជីវិតរបស់ខ្លួននៅលើ {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,ប្រចាំឆ្នាំ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ធាតុភាគហ៊ុនការផ្សះផ្សា
 DocType: Stock Entry,Sales Invoice No,ការលក់វិក័យប័ត្រគ្មាន
@@ -227,7 +250,7 @@
 DocType: Pricing Rule,Supplier Type,ប្រភេទក្រុមហ៊ុនផ្គត់ផ្គង់
 DocType: Item,Publish in Hub,បោះពុម្ពផ្សាយនៅក្នុងមជ្ឈមណ្ឌល
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,ធាតុ {0} ត្រូវបានលុបចោល
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,ធាតុ {0} ត្រូវបានលុបចោល
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,សម្ភារៈស្នើសុំ
 DocType: Bank Reconciliation,Update Clearance Date,ធ្វើឱ្យទាន់សម័យបោសសំអាតកាលបរិច្ឆេទ
 DocType: Item,Purchase Details,ពត៌មានលំអិតទិញ
@@ -243,6 +266,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 +250,Payment against {0} {1} cannot be greater than Outstanding Amount {2},ការទូទាត់ប្រឆាំងនឹង {0} {1} មិនអាចត្រូវបានធំជាងឆ្នើមចំនួន {2}
 DocType: Supplier,Address HTML,អាសយដ្ឋានរបស់ HTML
 DocType: Lead,Mobile No.,លេខទូរស័ព្ទចល័ត
@@ -274,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,ដឹកជញ្ជូនចំណាំ
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,ការរៀបចំពន្ធ
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,ចូលការទូទាត់ត្រូវបានកែប្រែបន្ទាប់ពីអ្នកបានទាញវា។ សូមទាញវាម្តងទៀត។
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} បានចូលពីរដងនៅក្នុងការប្រមូលពន្ធលើធាតុ
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,សូមជ្រើសខែនិងឆ្នាំ
@@ -294,24 +318,29 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +644,Select Item,ជ្រើសធាតុ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"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 +254,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/cost_center/cost_center.js +65,Convert to non-Group,បម្លែងទៅនឹងការមិនគ្រុប
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ទទួលទិញត្រូវតែត្រូវបានដាក់ជូន
 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 +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 +215,Please see attachment,សូមមើលឯកសារភ្ជាប់
 DocType: Purchase Order,% Received,% បានទទួល
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,ការដំឡើងពេញលេញរួចទៅហើយ !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,ការដំឡើងពេញលេញរួចទៅហើយ !!
 ,Finished Goods,ទំនិញបានបញ្ចប់
 DocType: Delivery Note,Instructions,សេចក្តីណែនាំ
 DocType: Quality Inspection,Inspected By,បានត្រួតពិនិត្យដោយ
 DocType: Maintenance Visit,Maintenance Type,ប្រភេទថែទាំ
+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,កាលបរិច្ឆេទកាលវិភាគ
 DocType: Packed Item,Packed Item,ធាតុ packed
 apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,ការកំណត់លំនាំដើមសម្រាប់ការទិញប្រតិបត្តិការ។
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},សកម្មភាពមានសម្រាប់ការចំណាយបុគ្គលិក {0} ប្រឆាំងនឹងប្រភេទសកម្មភាព - {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.,សូមកុំបង្កើតគណនីសម្រាប់អតិថិជននិងអ្នកផ្គត់ផ្គង់។ ពួកគេត្រូវបានបង្កើតឡើងដោយផ្ទាល់ពីម្ចាស់របស់អតិថិជន / អ្នកផ្គត់ផ្គង់។
 DocType: Currency Exchange,Currency Exchange,ការផ្លាស់ប្តូររូបិយវត្ថុ
 DocType: Purchase Invoice Item,Item Name,ឈ្មោះធាតុ
@@ -325,12 +354,13 @@
 ,Purchase Register,ទិញចុះឈ្មោះ
 DocType: Landed Cost Item,Applicable Charges,ការចោទប្រកាន់ដែលអាចអនុវត្តបាន
 DocType: Workstation,Consumable Cost,ការចំណាយរបស់អតិថិជនបាន
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ត្រូវតែមានតួនាទី &quot;ចាកចេញអនុម័ត&quot;
 DocType: Purchase Receipt,Vehicle Date,កាលបរិច្ឆេទយានយន្ត
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,ពេទ្យ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,ហេតុផលសម្រាប់ការសម្រក
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},ស្ថានីយការងារត្រូវបានបិទនៅលើកាលបរិច្ឆេទដូចខាងក្រោមដូចជាក្នុងបញ្ជីថ្ងៃឈប់សម្រាក: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,ឱកាសការងារ
 DocType: Employee,Single,នៅលីវ
-DocType: Issue,Attachment,ឯកសារភ្ជាប់
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,ថវិកាដែលមិនអាចត្រូវបានកំណត់សម្រាប់មជ្ឈមណ្ឌលថ្លៃដើមគ្រុប
 DocType: Account,Cost of Goods Sold,តម្លៃនៃការលក់ទំនិញ
 DocType: Purchase Invoice,Yearly,រាល់ឆ្នាំ
@@ -359,7 +389,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,គុណលក្ខណៈ {0} បានជ្រើសរើសច្រើនដងក្នុងតារាងគុណលក្ខណៈ
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,គុណលក្ខណៈ {0} បានជ្រើសរើសច្រើនដងក្នុងតារាងគុណលក្ខណៈ
 DocType: HR Settings,Employee record is created using selected field. ,កំណត់ត្រាបុគ្គលិកត្រូវបានបង្កើតដោយប្រើវាលដែលបានជ្រើស។
 DocType: Sales Order,Not Applicable,ដែលមិនអាចអនុវត្តបាន
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,ចៅហ្វាយថ្ងៃឈប់សម្រាក។
@@ -398,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,គ្រឿងសំអាង
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items",រួមបញ្ចូលគ្នានោះមានលក្ខណៈសម្បត្តិដូចខាងក្រោមនេះត្រូវដូចគ្នាសម្រាប់ធាតុទាំងពីរ
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items",រួមបញ្ចូលគ្នានោះមានលក្ខណៈសម្បត្តិដូចខាងក្រោមនេះត្រូវដូចគ្នាសម្រាប់ធាតុទាំងពីរ
 DocType: Shipping Rule,Net Weight,ទំងន់សុទ្ធ
 DocType: Employee,Emergency Phone,ទូរស័ព្ទសង្រ្គោះបន្ទាន់
 ,Serial No Warranty Expiry,គ្មានផុតកំណត់ការធានាសៀរៀល
@@ -409,6 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,ការគ្រប់គ្រងអ្នកម៉ៅការបន្ត
 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,អត្រាដែលតារាងតំលៃរូបិយប័ណ្ណត្រូវបម្លែងទៅជារូបិយប័ណ្ណមូលដ្ឋានរបស់ក្រុមហ៊ុន
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},គណនី {0} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,អក្សរសង្ខេបដែលបានប្រើរួចហើយសម្រាប់ក្រុមហ៊ុនផ្សេងទៀត
 DocType: Selling Settings,Default Customer Group,លំនាំដើមគ្រុបអតិថិជន
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",ប្រសិនបើការបិទវាល &quot;សរុបមូល&quot; នឹងមិនត្រូវបានមើលឃើញនៅក្នុងប្រតិបត្តិការណាមួយឡើយ
 DocType: BOM,Operating Cost,ចំណាយប្រតិបត្តិការ
@@ -416,15 +448,20 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,ចំនួនបន្ថែមមិនអាចត្រូវបាន 0
 DocType: Production Planning Tool,Material Requirement,សម្ភារៈតម្រូវ
 DocType: Company,Delete Company Transactions,លុបប្រតិបត្តិការក្រុមហ៊ុន
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,ធាតុ {0} គឺមិនត្រូវទិញរបស់របរ
+apps/erpnext/erpnext/controllers/recurring_document.py +190,"{0} is an invalid email address in 'Notification \
+					Email Address'",{0} គឺជាអាសយដ្ឋានអ៊ីមែលមិនត្រឹមត្រូវនៅក្នុង &#39;ការជូនដំណឹង \ អាសយដ្ឋានអ៊ីមែល&#39;
 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/trial_balance.py +231,Closing (Cr),បិទ (Cr)
 DocType: Serial No,Warranty Period (Days),រយៈពេលធានា (ថ្ងៃ)
 DocType: Installation Note Item,Installation Note Item,ធាតុចំណាំការដំឡើង
 ,Pending Qty,ដំណើ Qty
 DocType: Job Applicant,Thread HTML,HTML ដែលខ្សែស្រឡាយ
 DocType: Company,Ignore,មិនអើពើ
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},ផ្ញើសារទៅកាន់លេខដូចខាងក្រោម: {0}
 apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ឃ្លាំងក្រុមហ៊ុនផ្គត់ផ្គង់ចាំបាច់សម្រាប់ការទទួលទិញកិច្ចសន្យា
 DocType: Pricing Rule,Valid From,មានសុពលភាពពី
 DocType: Sales Invoice,Total Commission,គណៈកម្មាការសរុប
@@ -436,12 +473,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,បានរកឃើញនៅក្នុងតារាងវិក័យប័ត្រកំណត់ត្រាគ្មាន
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,សូមជ្រើសប្រភេទក្រុមហ៊ុននិងបក្សទីមួយ
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,ហិរញ្ញវត្ថុ / ស្មើឆ្នាំ។
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,តម្លៃបង្គរ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","សូមអភ័យទោស, សៀរៀល, Nos មិនអាចត្រូវបានបញ្ចូលគ្នា"
 DocType: Project Task,Project Task,គម្រោងការងារ
 ,Lead Id,ការនាំមុខលេខសម្គាល់
 DocType: C-Form Invoice Detail,Grand Total,សម្ពោធសរុប
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,ឆ្នាំសារពើពន្ធកាលបរិច្ឆេទចាប់ផ្តើមមិនគួរត្រូវបានធំជាងថ្ងៃខែឆ្នាំបញ្ចប់សារពើពន្ធ
 DocType: Warranty Claim,Resolution,ការដោះស្រាយ
+apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},បញ្ជូន: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,គណនីត្រូវបង់
 DocType: Sales Order,Billing and Delivery Status,វិក័យប័ត្រនិងការដឹកជញ្ជូនស្ថានភាព
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,អតិថិជនម្តងទៀត
@@ -456,7 +495,7 @@
 DocType: Quotation,Quotation To,សម្រង់ដើម្បី
 DocType: Lead,Middle Income,ប្រាក់ចំណូលពាក់កណ្តាល
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),ពិធីបើក (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ឯកតាលំនាំដើមសម្រាប់ធាតុវិធានការ {0} មិនអាចត្រូវបានផ្លាស់ប្តូរដោយផ្ទាល់ដោយសារតែអ្នកបានធ្វើប្រតិបត្តិការមួយចំនួន (s) ដែលមាន UOM មួយទៀតរួចទៅហើយ។ អ្នកនឹងត្រូវការដើម្បីបង្កើតធាតុថ្មីមួយក្នុងការប្រើ UOM លំនាំដើមផ្សេងគ្នា។
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ឯកតាលំនាំដើមសម្រាប់ធាតុវិធានការ {0} មិនអាចត្រូវបានផ្លាស់ប្តូរដោយផ្ទាល់ដោយសារតែអ្នកបានធ្វើប្រតិបត្តិការមួយចំនួន (s) ដែលមាន UOM មួយទៀតរួចទៅហើយ។ អ្នកនឹងត្រូវការដើម្បីបង្កើតធាតុថ្មីមួយក្នុងការប្រើ UOM លំនាំដើមផ្សេងគ្នា។
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកសម្រាប់មិនអាចជាអវិជ្ជមាន
 DocType: Purchase Order Item,Billed Amt,វិក័យប័ត្រ AMT
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,មួយឃ្លាំងសមប្រឆាំងនឹងធាតុដែលភាគហ៊ុនត្រូវបានធ្វើឡើង។
@@ -503,7 +542,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,បោះពុម្ពផ្សាយ
 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 +141,{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 +204,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}
@@ -531,7 +572,7 @@
 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 +543,Item has variants.,ធាតុមានវ៉ារ្យ៉ង់។
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,ប្រភេទដើមឈើ
@@ -544,6 +585,7 @@
 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 +33,Goods received from Suppliers.,ទំនិញទទួលបានពីការផ្គត់ផ្គង់។
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,នៅក្នុងតម្លៃ
 DocType: Lead,Campaign Name,ឈ្មោះយុទ្ធនាការឃោសនា
 ,Reserved,បម្រុងទុក
 DocType: Purchase Order,Supply Raw Materials,ផ្គត់ផ្គង់សំភារៈឆៅ
@@ -558,19 +600,22 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,គណនីប្រតិបត្តិការដែលមានស្រាប់ដែលមិនអាចត្រូវបានបម្លែងទៅជាសៀវភៅ
 DocType: Delivery Note,Customer's Purchase Order No,ការទិញរបស់អតិថិជនលំដាប់គ្មាន
 DocType: Employee,Cell Number,លេខទូរស័ព្ទ
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,សម្ភារៈដោយស្វ័យប្រវត្តិសំណើបង្កើត
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,សម្ភារៈដោយស្វ័យប្រវត្តិសំណើបង្កើត
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ការបាត់បង់
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,អ្នកមិនអាចបញ្ចូលទឹកប្រាក់ក្នុងពេលបច្ចុប្បន្ននៅក្នុងការប្រឆាំងនឹងការធាតុទិនានុប្បវត្តិ &quot;ជួរឈរ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ថាមពល
 DocType: Opportunity,Opportunity From,ឱកាសការងារពី
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,សេចក្តីថ្លែងការប្រាក់បៀវត្សរ៍ប្រចាំខែ។
 DocType: Item Group,Website Specifications,ជាក់លាក់វេបសាយ
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},មានកំហុសក្នុងការអាសយដ្ឋានទំព័រគំរូរបស់អ្នកគឺ {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,គណនីថ្មី
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: ពី {0} នៃប្រភេទ {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,ជួរដេក {0}: ការប្រែចិត្តជឿកត្តាគឺជាការចាំបាច់
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","វិធានតម្លៃច្រើនមានលក្ខណៈវិនិច្ឆ័យដូចគ្នា, សូមដោះស្រាយជម្លោះដោយផ្ដល់អាទិភាព។ វិធានតម្លៃ: {0}"
 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.,ធាតុគណនេយ្យអាចត្រូវបានធ្វើប្រឆាំងនឹងការថ្នាំងស្លឹក។ ធាតុប្រឆាំងនឹងក្រុមដែលមិនត្រូវបានអនុញ្ញាត។
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,មិនអាចធ្វើឱ្យឬបោះបង់ Bom ជាវាត្រូវបានផ្សារភ្ជាប់ជាមួយនឹង BOMs ផ្សេងទៀត
 DocType: Opportunity,Maintenance,ការថែរក្សា
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},លេខបង្កាន់ដៃទិញបានទាមទារសម្រាប់ធាតុ {0}
 DocType: Item Attribute Value,Item Attribute Value,តម្លៃគុណលក្ខណៈធាតុ
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,យុទ្ធនាការលក់។
 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.
@@ -609,10 +654,11 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,បញ្ជីតម្លៃដែលមិនបានជ្រើស
 DocType: Employee,Family Background,ប្រវត្តិក្រុមគ្រួសារ
 DocType: Process Payroll,Send Email,ផ្ញើអ៊ីមែល
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},ព្រមាន &amp; ‧;: ឯកសារភ្ជាប់មិនត្រឹមត្រូវ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},ព្រមាន &amp; ‧;: ឯកសារភ្ជាប់មិនត្រឹមត្រូវ {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,គ្មានសិទ្ធិ
 DocType: Company,Default Bank Account,គណនីធនាគារលំនាំដើម
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",ដើម្បីត្រងដោយផ្អែកទៅលើគណបក្សជ្រើសគណបក្សវាយជាលើកដំបូង
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&quot;ធ្វើឱ្យទាន់សម័យហ៊ុន &#39;មិនអាចត្រូវបានគូសធីកទេព្រោះធាតុមិនត្រូវបានបញ្ជូនតាមរយៈ {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +292,Nos,nos
 DocType: Item,Items with higher weightage will be shown higher,ធាតុជាមួយនឹង weightage ខ្ពស់ជាងនេះនឹងត្រូវបានបង្ហាញដែលខ្ពស់ជាង
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ពត៌មានលំអិតធនាគារការផ្សះផ្សា
@@ -636,14 +682,15 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",ដើម្បីបើកការ«ចំណុចនៃការលក់ &quot;លក្ខណៈពិសេស
 DocType: Bin,Moving Average Rate,ការផ្លាស់ប្តូរអត្រាការប្រាក់ជាមធ្យម
 DocType: Production Planning Tool,Select Items,ជ្រើសធាតុ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},ប្រឆាំងនឹង {0} {1} របស់លោក Bill ចុះថ្ងៃទី {2}
 DocType: Maintenance Visit,Completion Status,ស្ថានភាពបញ្ចប់
-DocType: Sales Invoice Item,Target Warehouse,គោលដៅឃ្លាំង
+DocType: Production Order,Target Warehouse,គោលដៅឃ្លាំង
 DocType: Item,Allow over delivery or receipt upto this percent,អនុញ្ញាតឱ្យមានការចែកចាយឬទទួលបានជាងរីករាយជាមួយនឹងភាគរយ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,គេរំពឹងថាការដឹកជញ្ជូនមិនអាចកាលបរិច្ឆេទត្រូវតែមុនពេលការលក់លំដាប់កាលបរិច្ឆេទ
 DocType: Upload Attendance,Import Attendance,នាំចូលវត្តមាន
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,ក្រុមធាតុទាំងអស់
 DocType: Process Payroll,Activity Log,សកម្មភាពកំណត់ហេតុ
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,ប្រាក់ចំណេញសុទ្ធ / បាត់បង់
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,ប្រាក់ចំណេញសុទ្ធ / បាត់បង់
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,តែងសារស្វ័យប្រវត្តិនៅលើការដាក់ប្រតិបត្តិការ។
 DocType: Production Order,Item To Manufacture,ធាតុដើម្បីផលិត
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} ស្ថានភាពគឺ {2}
@@ -651,7 +698,7 @@
 DocType: Sales Order Item,Projected Qty,ការព្យាករ Qty
 DocType: Sales Invoice,Payment Due Date,ការទូទាត់កាលបរិច្ឆេទ
 DocType: Newsletter,Newsletter Manager,កម្មវិធីគ្រប់គ្រងព្រឹត្តិប័ត្រព័ត៌មាន
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,ធាតុវ៉ារ្យង់ {0} រួចហើយដែលមានគុណលក្ខណៈដូចគ្នា
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,ធាតុវ៉ារ្យង់ {0} រួចហើយដែលមានគុណលក្ខណៈដូចគ្នា
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;ការបើក&quot;
 DocType: Notification Control,Delivery Note Message,សារដឹកជញ្ជូនចំណាំ
 DocType: Expense Claim,Expenses,ការចំណាយ
@@ -661,7 +708,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,ស្រាវជ្រាវនិងអភិវឌ្ឍន៍
 ,Amount to Bill,ចំនួនទឹកប្រាក់ដែលលោក Bill
 DocType: Company,Registration Details,ពត៌មានលំអិតការចុះឈ្មោះ
-DocType: Item,Re-Order Qty,ដីកាសម្រេច Qty ឡើងវិញ
+DocType: Item Reorder,Re-Order Qty,ដីកាសម្រេច Qty ឡើងវិញ
 DocType: Leave Block List Date,Leave Block List Date,ទុកឱ្យបញ្ជីប្លុកកាលបរិច្ឆេទ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},គ្រោងនឹងផ្ញើទៅ {0}
 DocType: Pricing Rule,Price or Discount,ថ្លៃឬការបញ្ចុះតម្លៃ
@@ -692,17 +739,19 @@
 ,Received Items To Be Billed,ទទួលបានធាតុដែលនឹងត្រូវបានផ្សព្វផ្សាយ
 DocType: Employee,Ms,លោកស្រី
 apps/erpnext/erpnext/config/accounts.py +158,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,សម្ភារៈផែនការសម្រាប់ការអនុសភា
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +422,BOM {0} must be active,Bom {0} ត្រូវតែសកម្ម
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,សូមជ្រើសប្រភេទឯកសារនេះជាលើកដំបូង
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,រទេះទៅ
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,បោះបង់ការមើលសម្ភារៈ {0} មុនពេលលុបចោលដំណើរទស្សនកិច្ចនេះជួសជុល
 DocType: Salary Slip,Leave Encashment Amount,ទុកឱ្យ Encashment ចំនួនទឹកប្រាក់
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},សៀរៀលគ្មាន {0} មិនមែនជារបស់ធាតុ {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,តម្រូវការ Qty
 DocType: Bank Reconciliation,Total Amount,ចំនួនសរុប
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,ការបោះពុម្ពអ៊ីធឺណិត
 DocType: Production Planning Tool,Production Orders,ការបញ្ជាទិញ
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,តម្លៃឱ្យមានតុល្យភាព
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,តម្លៃឱ្យមានតុល្យភាព
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,តារាងតម្លៃការលក់
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,ធ្វើសមកាលកម្មធាតុបោះពុម្ពផ្សាយ
 DocType: Bank Reconciliation,Account Currency,រូបិយប័ណ្ណគណនី
@@ -711,7 +760,7 @@
 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 +538,Item Variants {0} updated,ធាតុវ៉ារ្យ៉ង់ {0} ធ្វើឱ្យទាន់សម័យ
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,ធាតុវ៉ារ្យ៉ង់ {0} ធ្វើឱ្យទាន់សម័យ
 DocType: Quality Inspection Reading,Reading 6,ការអាន 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ទិញវិក័យប័ត្រជាមុន
 DocType: Address,Shop,ហាងលក់
@@ -733,6 +782,7 @@
 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 +112,Row #{0}: Please specify Serial No for Item {1},ជួរដេក # {0}: សូមបញ្ជាក់សម្រាប់ធាតុសៀរៀលគ្មាន {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +532,"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.","សម្រាប់ធាតុ &quot;ផលិតផលកញ្ចប់, ឃ្លាំង, សៀរៀល, គ្មានទេនិងបាច់ &amp; ‧នឹងត្រូវបានចាត់ទុកថាពី&quot; ការវេចខ្ចប់បញ្ជី &quot;តារាង។ បើសិនជាគ្មានឃ្លាំងនិងជំនាន់ដូចគ្នាសម្រាប់ធាតុដែលមានទាំងអស់សម្រាប់វេចខ្ចប់ធាតុណាមួយ &quot;ផលិតផលជាកញ្ចប់&quot; តម្លៃទាំងនោះអាចត្រូវបានបញ្ចូលនៅក្នុងតារាងធាតុដ៏សំខាន់, តម្លៃនឹងត្រូវបានចម្លងទៅ &#39;វេចខ្ចប់បញ្ជី &quot;តារាង។"
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,ការនាំចេញទៅកាន់អតិថិជន។
 DocType: Purchase Invoice Item,Purchase Order Item,ទិញធាតុលំដាប់
@@ -747,6 +797,7 @@
 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 +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ជួរដេក {0}: ការទូទាត់ប្រឆាំងនឹងការលក់ / ការបញ្ជាទិញគួរតែងតែត្រូវបានសម្គាល់ជាមុន
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,គីមី
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +683,All items have already been transferred for this Production Order.,ធាតុទាំងអស់ត្រូវបានបញ្ជូនរួចហើយសម្រាប់ការបញ្ជាទិញផលិតផលនេះ។
 DocType: Process Payroll,Select Payroll Year and Month,ជ្រើសបើកប្រាក់បៀវត្សឆ្នាំនិងខែ
@@ -768,6 +819,7 @@
 DocType: Journal Entry,Total Amount in Words,ចំនួនសរុបនៅក្នុងពាក្យ
 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 ប្រសិនបើបញ្ហានៅតែបន្តកើតមាន។
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,កន្ត្រកទំនិញរបស់ខ្ញុំ
+apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},ប្រភេទការបញ្ជាទិញត្រូវតែជាផ្នែកមួយនៃ {0}
 DocType: Lead,Next Contact Date,ទំនាក់ទំនងបន្ទាប់កាលបរិច្ឆេទ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,បើក Qty
 DocType: Holiday List,Holiday List Name,បញ្ជីថ្ងៃឈប់សម្រាកឈ្មោះ
@@ -785,7 +837,7 @@
 DocType: POS Profile,Cash/Bank Account,សាច់ប្រាក់ / គណនីធនាគារ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,ធាតុបានយកចេញដោយការផ្លាស់ប្តូរក្នុងបរិមាណឬតម្លៃទេ។
 DocType: Delivery Note,Delivery To,ដឹកជញ្ជូនដើម្បី
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,តារាងគុណលក្ខណៈគឺជាការចាំបាច់
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,បញ្ចុះតំលៃ
@@ -807,12 +859,13 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,គណនីមិនត្រូវគ្នាជាមួយក្រុមហ៊ុន
 apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.",គុណលក្ខណៈសម្រាប់ធាតុវ៉ារ្យ៉ង់។ ឧទាហរណ៍ដូចជាទំហំពណ៌ល
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,ឃ្លាំង WIP
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},សៀរៀលគ្មាន {0} គឺស្ថិតនៅក្រោមកិច្ចសន្យាថែរក្សារីករាយជាមួយនឹង {1}
 DocType: BOM Operation,Operation,ប្រតិបត្ដិការ
 DocType: Lead,Organization Name,ឈ្មោះអង្គភាព
 DocType: Tax Rule,Shipping State,រដ្ឋការដឹកជញ្ជូន
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,ធាតុត្រូវបានបន្ថែមដោយប្រើ &quot;ចូរក្រោកធាតុពីការទិញបង្កាន់ដៃ &#39;ប៊ូតុង
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,ចំណាយការលក់
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,ទិញស្ដង់ដារ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,ទិញស្ដង់ដារ
 DocType: GL Entry,Against,ប្រឆាំងនឹងការ
 DocType: Item,Default Selling Cost Center,ចំណាយលើការលក់លំនាំដើមរបស់មជ្ឈមណ្ឌល
 DocType: Sales Partner,Implementation Partner,ដៃគូអនុវត្ដន៍
@@ -829,6 +882,7 @@
 DocType: Sales Person,Select company name first.,ជ្រើសឈ្មោះក្រុមហ៊ុនជាលើកដំបូង។
 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,ធ្វើឱ្យទាន់សម័យតាមរយៈពេលកំណត់ហេតុ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,អាយុជាមធ្យម
 DocType: Opportunity,Your sales person who will contact the customer in future,ការលក់ផ្ទាល់ខ្លួនរបស់អ្នកដែលនឹងទាក់ទងអតិថិជននៅថ្ងៃអនាគត
@@ -836,6 +890,7 @@
 DocType: Company,Default Currency,រូបិយប័ណ្ណលំនាំដើម
 DocType: Contact,Enter designation of this Contact,បញ្ចូលការរចនានៃទំនាក់ទំនងនេះ
 DocType: Expense Claim,From Employee,ពីបុគ្គលិក
+apps/erpnext/erpnext/controllers/accounts_controller.py +354,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ព្រមាន: ប្រព័ន្ធនឹងមិនពិនិត្យមើល overbilling ចាប់តាំងពីចំនួនទឹកប្រាក់សម្រាប់ធាតុ {0} {1} ក្នុងសូន្យ
 DocType: Journal Entry,Make Difference Entry,ធ្វើឱ្យធាតុខុសគ្នា
 DocType: Upload Attendance,Attendance From Date,ការចូលរួមពីកាលបរិច្ឆេទ
 DocType: Appraisal Template Goal,Key Performance Area,គន្លឹះការសម្តែងតំបន់
@@ -843,6 +898,7 @@
 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 +130,Please select BOM in BOM field for Item {0},សូមជ្រើស Bom នៅក្នុងវាល Bom សម្រាប់ធាតុ {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,ពត៌មានវិក័យប័ត្ររបស់ C-សំណុំបែបបទ
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,ការទូទាត់វិក័យប័ត្រផ្សះផ្សានិងយុត្តិធម៌
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,ការចូលរួមចំណែក%
@@ -851,7 +907,7 @@
 DocType: Sales Partner,Distributor,ចែកចាយ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ការដើរទិញឥវ៉ាន់វិធានការដឹកជញ្ជូនក្នុងកន្រ្តក
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,ផលិតកម្មលំដាប់ {0} ត្រូវតែបានលុបចោលមុនពេលលុបចោលការបញ្ជាលក់នេះ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',សូមកំណត់ &#39;អនុវត្តការបញ្ចុះតម្លៃបន្ថែមទៀតនៅលើ &quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',សូមកំណត់ &#39;អនុវត្តការបញ្ចុះតម្លៃបន្ថែមទៀតនៅលើ &quot;
 ,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.,ជ្រើសកំណត់ហេតុនិងការដាក់ស្នើវេលាម៉ោងដើម្បីបង្កើតវិក័យប័ត្រលក់ថ្មី។
@@ -864,6 +920,7 @@
 ,Trial Balance for Party,អង្គជំនុំតុល្យភាពសម្រាប់ការគណបក្ស
 DocType: Lead,Consultant,អ្នកប្រឹក្សាយោបល់
 DocType: Salary Slip,Earnings,ការរកប្រាក់ចំណូល
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Finished Item {0} must be entered for Manufacture type entry,ធាតុបានបញ្ចប់ {0} អាចត្រូវបានបញ្ចូលសម្រាប់ធាតុប្រភេទការផលិត
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,បើកសមតុល្យគណនី
 DocType: Sales Invoice Advance,Sales Invoice Advance,ការលក់វិក័យប័ត្រជាមុន
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,គ្មានអ្វីដែលត្រូវស្នើសុំ
@@ -879,7 +936,9 @@
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,ថ្នាំងបន្ថែមទៀតអាចត្រូវបានបង្កើតក្រោមការថ្នាំងប្រភេទ &#39;ក្រុម
 apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,សូមកំណត់លេខសម្គាល់អ៊ីម៉ែល
 DocType: Item,UOMs,UOMs
+apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} បាន NOS សម្គាល់ត្រឹមត្រូវសម្រាប់ធាតុ {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed 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},ប្រវត្តិម៉ាស៊ីនឆូតកាត {0} បានបង្កើតឡើងរួចទៅហើយសម្រាប់អ្នកប្រើ: {1} និងក្រុមហ៊ុន {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM កត្តាប្រែចិត្តជឿ
 DocType: Stock Settings,Default Item Group,លំនាំដើមធាតុគ្រុប
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,មូលដ្ឋានទិន្នន័យដែលបានផ្គត់ផ្គង់។
@@ -905,6 +964,7 @@
 DocType: Global Defaults,Disable Rounded Total,បិទការសរុបមូល
 DocType: Lead,Call,ការហៅ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +409,'Entries' cannot be empty,&quot;ធាតុ&quot; មិនអាចទទេ
+apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},ជួរស្ទួនជាមួយនឹង {0} {1} ដូចគ្នា
 ,Trial Balance,អង្គជំនុំតុល្យភាព
 apps/erpnext/erpnext/config/hr.py +220,Setting up Employees,ការរៀបចំបុគ្គលិក
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,ក្រឡាចត្រង្គ &quot;
@@ -915,9 +975,10 @@
 DocType: Contact,User ID,លេខសម្គាល់អ្នកប្រើ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,មើលសៀវភៅ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ដំបូងបំផុត
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group",ធាតុមួយពូលមានឈ្មោះដូចគ្នាសូមប្ដូរឈ្មោះធាតុឬប្ដូរឈ្មោះធាតុដែលជាក្រុម
 DocType: Production Order,Manufacture against Sales Order,ផលិតប្រឆាំងនឹងការលក់សណ្តាប់ធ្នាប់
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,នៅសល់នៃពិភពលោក
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,ភាគលាភបង់ប្រាក់
@@ -933,32 +994,39 @@
 DocType: Opportunity Item,Opportunity Item,ធាតុឱកាសការងារ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,ពិធីបើកបណ្តោះអាសន្ន
 ,Employee Leave Balance,បុគ្គលិកចាកចេញតុល្យភាព
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +124,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 +33,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 +189,Not authorized to edit frozen Account {0},មិនអនុញ្ញាតឱ្យកែគណនីកក {0}
 DocType: Journal Entry,Get Outstanding Invoices,ទទួលបានវិកិយប័ត្រឆ្នើម
-apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","សូមអភ័យទោស, ក្រុមហ៊ុនមិនអាចត្រូវបានបញ្ចូលគ្នា"
+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 +165,"Sorry, companies cannot be merged","សូមអភ័យទោស, ក្រុមហ៊ុនមិនអាចត្រូវបានបញ្ចូលគ្នា"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,ខ្នាតតូច
 DocType: Employee,Employee Number,ចំនួនបុគ្គលិក
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},ករណីគ្មានការ (s) បានរួចហើយនៅក្នុងការប្រើប្រាស់។ សូមព្យាយាមពីករណីគ្មាន {0}
 ,Invoiced Amount (Exculsive Tax),ចំនួន invoiced (ពន្ធលើ Exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,ធាតុ 2
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,ប្រធានគណនី {0} បង្កើតឡើង
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,ពណ៌បៃតង
 DocType: Item,Auto re-order,ការបញ្ជាទិញជាថ្មីម្តងទៀតដោយស្វ័យប្រវត្តិ
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,សរុបសម្រេច
 DocType: Employee,Place of Issue,ទីកន្លែងបញ្ហា
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,ការចុះកិច្ចសន្យា
 DocType: Email Digest,Add Quote,បន្ថែមសម្រង់
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +495,UOM coversion factor required for UOM: {0} in Item: {1},កត្តាគ្របដណ្តប់ 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}: Qty គឺជាការចាំបាច់
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,កសិកម្ម
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,ផលិតផលឬសេវាកម្មរបស់អ្នក
 DocType: Mode of Payment,Mode of Payment,របៀបនៃការទូទាត់
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,វេបសាយរូបភាពគួរតែជាឯកសារសាធារណៈឬគេហទំព័ររបស់ URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,វេបសាយរូបភាពគួរតែជាឯកសារសាធារណៈឬគេហទំព័ររបស់ URL
 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,ឃ្លាំងពត៌មានទំនាក់ទំនង
@@ -967,11 +1035,14 @@
 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 +119,"For {0}, only credit accounts can be linked against another debit entry",{0} មានតែគណនីឥណទានអាចត្រូវបានតភ្ជាប់ប្រឆាំងនឹងធាតុឥណពន្ធផ្សេងទៀត
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +484,Delivery Note {0} is not submitted,ការដឹកជញ្ជូនចំណាំ {0} គឺមិនត្រូវបានដាក់ស្នើ
 apps/erpnext/erpnext/stock/get_item_details.py +126,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,ឧបករណ៍រាជធានី
 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.",វិធានកំណត់តម្លៃដំបូងត្រូវបានជ្រើសដោយផ្អែកលើ &#39;អនុវត្តនៅលើ&#39; វាលដែលអាចជាធាតុធាតុក្រុមឬម៉ាក។
 DocType: Hub Settings,Seller Website,វេបសាយអ្នកលក់
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,ចំនួនភាគរយត្រៀមបម្រុងទុកសរុបសម្រាប់លក់ក្រុមគួរមាន 100 នាក់
+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.,គេរំពឹងថាកាលបរិច្ឆេទដឹកជញ្ជូនគឺតិចជាងចាប់ផ្ដើមគំរោងកាលបរិច្ឆេទ។
@@ -984,14 +1055,18 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,ចំណាំ: មជ្ឈមណ្ឌលនេះជាការចំណាយក្រុម។ មិនអាចធ្វើឱ្យការបញ្ចូលគណនីប្រឆាំងនឹងក្រុម។
 DocType: Item,Website Item Groups,ក្រុមធាតុវេបសាយ
 DocType: Purchase Invoice,Total (Company Currency),សរុប (ក្រុមហ៊ុនរូបិយវត្ថុ)
+apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,លេខសម្គាល់ {0} បានចូលច្រើនជាងមួយដង
 DocType: Journal Entry,Journal Entry,ធាតុទិនានុប្បវត្តិ
 DocType: Workstation,Workstation Name,ឈ្មោះស្ថានីយការងារ Stencils
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,សង្ខេបអ៊ីម៉ែល:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +428,BOM {0} does not belong to Item {1},Bom {0} មិនមែនជារបស់ធាតុ {1}
 DocType: Sales Partner,Target Distribution,ចែកចាយគោលដៅ
 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 +179,Valuation Rate required for Item {0},អត្រាការវាយតម្លៃដែលបានទាមទារសម្រាប់ធាតុ {0}
 DocType: Quality Inspection Reading,Reading 8,ការអាន 8
 DocType: Sales Partner,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'","សរុប {0} សម្រាប់ធាតុទាំងអស់គឺសូន្យ, អាចអ្នកគួរផ្លាស់ប្តូរ &quot;ចែកបទចោទប្រកាន់ដោយផ្អែកលើ"
 DocType: Purchase Invoice,Taxes and Charges Calculation,ពន្ធនិងការចោទប្រកាន់ពីការគណនា
 DocType: BOM Operation,Workstation,ស្ថានីយការងារ Stencils
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,ផ្នែករឹង
@@ -1007,12 +1082,15 @@
 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 +164,Against Journal Entry {0} is already adjusted against some other voucher,ប្រឆាំងនឹង Journal Entry {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/setup_wizard/install_fixtures.py +38,Food,អាហារ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,ជួរ Ageing 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +137,You can make a time log only against a submitted production order,អ្នកអាចធ្វើឱ្យពេលវេលាជាគ្រាន់តែជាកំណត់ហេតុប្រឆាំងទៅនឹងគោលបំណងផលិតកម្មដែលបានដាក់ជូន
 DocType: Maintenance Schedule Item,No of Visits,គ្មានការមើល
 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 +361,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.,ឃ្លាំងមិនអាចត្រូវបានផ្លាស់ប្តូរសម្រាប់លេខស៊េរី
@@ -1020,9 +1098,11 @@
 DocType: Address,Utilities,ឧបករណ៍ប្រើប្រាស់
 DocType: Purchase Invoice Item,Accounting,គណនេយ្យ
 DocType: Features Setup,Features Setup,ការរៀបចំលក្ខណៈពិសេស
+DocType: Item,Is Service Item,តើមានធាតុសេវា
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,រយៈពេលប្រើប្រាស់មិនអាចមានការបែងចែកការឈប់សម្រាកនៅខាងក្រៅក្នុងរយៈពេល
 DocType: Activity Cost,Projects,គម្រោងការ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,សូមជ្រើសរើសឆ្នាំសារពើពន្ធ
+apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},ពី {0} | {1} {2}
 DocType: BOM Operation,Operation Description,ប្រតិបត្ដិការពិពណ៌នាសង្ខេប
 DocType: Item,Will also apply to variants,ក៏នឹងអនុវត្តទៅវ៉ារ្យ៉ង់
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,មិនអាចផ្លាស់ប្តូរការចាប់ផ្តើមឆ្នាំសារពើពន្ធឆ្នាំសារពើពន្ធនិងកាលបរិច្ឆេទនៅពេលដែលកាលបរិច្ឆេទបញ្ចប់ឆ្នាំសារពើពន្ធត្រូវបានរក្សាទុក។
@@ -1039,6 +1119,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,ធាតុភាគហ៊ុនដែលបានបង្កើតរួចផលិតកម្មលំដាប់
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,ការផ្លាស់ប្តូរសុទ្ធនៅលើអចលនទ្រព្យ
 DocType: Leave Control Panel,Leave blank if considered for all designations,ប្រសិនបើអ្នកទុកវាឱ្យទទេសម្រាប់ការរចនាទាំងអស់បានពិចារណាថា
+apps/erpnext/erpnext/controllers/accounts_controller.py +533,Charge of type 'Actual' in row {0} cannot be included in Item Rate,បន្ទុកនៃប្រភេទ &#39;ជាក់ស្តែង &quot;នៅក្នុងជួរដេកដែលបាន {0} មិនអាចត្រូវបានរួមបញ្ចូលនៅក្នុងអត្រាធាតុ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +179,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,សម្រាប់ក្រុមហ៊ុន
@@ -1048,7 +1129,7 @@
 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 +465,cannot be greater than 100,មិនអាចជាធំជាង 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,ធាតុ {0} គឺមិនមានធាតុភាគហ៊ុន
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,ធាតុ {0} គឺមិនមានធាតុភាគហ៊ុន
 DocType: Maintenance Visit,Unscheduled,គ្មានការគ្រោងទុក
 DocType: Employee,Owned,កម្មសិទ្ធផ្ទាល់ខ្លួន
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,អាស្រ័យនៅលើស្លឹកដោយគ្មានប្រាក់ខែ
@@ -1085,6 +1166,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +289,Sub Assemblies,សភាអនុ
 DocType: Shipping Rule Condition,To Value,ទៅតម្លៃ
 DocType: Supplier,Stock Manager,ភាគហ៊ុនប្រធានគ្រប់គ្រង
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},ឃ្លាំងប្រភពចាំបាច់សម្រាប់ជួរ {0}
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +593,Packing Slip,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់
 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,ការកំណត់ច្រកចេញចូលការរៀបចំសារជាអក្សរ
@@ -1092,6 +1174,7 @@
 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/setup_wizard/install_fixtures.py +83,Analyst,អ្នកវិភាគ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,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",ដើម្បីបើកការ«ចំណុចនៃការលក់«ទស្សនៈ
 apps/erpnext/erpnext/public/js/pos/pos.js +411,Payment cannot be made for empty cart,ការទូទាត់មិនអាចត្រូវបានធ្វើឡើងសម្រាប់រទេះទទេ
@@ -1105,6 +1188,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,រដ្ឋាភិបាល
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,វ៉ារ្យ៉ង់ធាតុ
 DocType: Company,Services,ការផ្តល់សេវា
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),សរុប ({0})
 DocType: Cost Center,Parent Cost Center,មជ្ឈមណ្ឌលតម្លៃដែលមាតាឬបិតា
 DocType: Sales Invoice,Source,ប្រភព
 DocType: Leave Type,Is Leave Without Pay,ត្រូវទុកឱ្យដោយគ្មានការបង់
@@ -1120,6 +1204,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,ផ្ទេរសម្រាប់ការផលិតសម្ភារៈ
 DocType: Pricing Rule,For Price List,សម្រាប់តារាងតម្លៃ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ស្វែងរកប្រតិបត្តិ
+apps/erpnext/erpnext/stock/stock_ledger.py +407,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",អត្រាទិញសម្រាប់ធាតុ: {0} មិនបានរកឃើញដែលត្រូវបានទាមទារដើម្បីកក់មានចំនួនធាតុ (ចំណាយ) ។ សូមនិយាយពីធាតុប្រឆាំងនឹងតម្លៃបញ្ជីតម្លៃទិញ។
 DocType: Maintenance Schedule,Schedules,កាលវិភាគ
 DocType: Purchase Invoice Item,Net Amount,ចំនួនទឹកប្រាក់សុទ្ធ
 DocType: Purchase Order Item Supplied,BOM Detail No,ពត៌មានលំអិត Bom គ្មាន
@@ -1148,6 +1233,7 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,បញ្ជីអ្នកទទួលគឺទទេ។ សូមបង្កើតបញ្ជីអ្នកទទួល
 DocType: Production Plan Sales Order,Production Plan Sales Order,ផលិតកម្មផែនការលក់សណ្តាប់ធ្នាប់
 DocType: Sales Partner,Sales Partner Target,ដៃគូគោលដៅការលក់
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +109,Accounting Entry for {0} can only be made in currency: {1},ចូលគណនីសម្រាប់ {0} អាចត្រូវបានធ្វើតែនៅក្នុងរូបិយប័ណ្ណ: {1}
 DocType: Pricing Rule,Pricing Rule,វិធានការកំណត់តម្លៃ
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,សម្ភារៈសំណើទិញសណ្តាប់ធ្នាប់
 DocType: Payment Gateway Account,Payment Success URL,ការទូទាត់ URL ដែលទទួលបានភាពជោគជ័យ
@@ -1157,7 +1243,9 @@
 DocType: Address,Lead Name,ការនាំមុខឈ្មោះ
 ,POS,ម៉ាស៊ីនឆូតកាត
 apps/erpnext/erpnext/config/stock.py +268,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 +336,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 +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 +542,Manufacturing Quantity is mandatory,បរិមាណដែលត្រូវទទួលទានគឺចាំបាច់កម្មន្តសាល
@@ -1173,25 +1261,32 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ផ្ញើការទូទាត់អ៊ីម៉ែល
 DocType: Dependent Task,Dependent Task,ការងារពឹងផ្អែក
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,ចំនួនទឹកប្រាក់ដែលគេប្រើប្រាស់
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,ការផ្លាស់ប្តូរសាច់ប្រាក់សុទ្ធ
+apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} មើល
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,ការផ្លាស់ប្តូរសាច់ប្រាក់សុទ្ធ
 DocType: Salary Structure Deduction,Salary Structure Deduction,ការកាត់រចនាសម្ព័ន្ធប្រាក់បៀវត្ស
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ឯកតារង្វាស់ {0} ត្រូវបានបញ្ចូលលើសពីមួយដងនៅក្នុងការសន្ទនាកត្តាតារាង
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ឯកតារង្វាស់ {0} ត្រូវបានបញ្ចូលលើសពីមួយដងនៅក្នុងការសន្ទនាកត្តាតារាង
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},ស្នើសុំការទូទាត់រួចហើយ {0}
 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 +182,Quantity must not be more than {0},បរិមាណមិនត្រូវការច្រើនជាង {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),អាយុ (ថ្ងៃ)
 DocType: Quotation Item,Quotation Item,ធាតុសម្រង់
 DocType: Account,Account Name,ឈ្មោះគណនី
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +36,From Date cannot be greater than To Date,ពីកាលបរិច្ឆេទមិនអាចមានចំនួនច្រើនជាងកាលបរិច្ឆេទ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,សៀរៀលគ្មាន {0} {1} បរិមាណមិនអាចធ្វើជាប្រភាគ
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,ប្រភេទផ្គត់ផ្គង់គ្រូ។
 DocType: Purchase Order Item,Supplier Part Number,ក្រុមហ៊ុនផ្គត់ផ្គង់ផ្នែកមួយចំនួន
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,អត្រានៃការប្រែចិត្តជឿមិនអាចជា 0 ឬ 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} ត្រូវបានលុបចោលឬបញ្ឈប់
 DocType: Accounts Settings,Credit Controller,ឧបករណ៍ត្រួតពិនិត្យឥណទាន
 DocType: Delivery Note,Vehicle Dispatch Date,កាលបរិច្ឆេទបញ្ជូនយានយន្ត
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,ការទិញការទទួល {0} គឺមិនត្រូវបានដាក់ស្នើ
 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/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% បានបង់ប្រាក់
@@ -1203,6 +1298,7 @@
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,បញ្ហារបស់ខ្ញុំ
 DocType: BOM Item,BOM Item,ធាតុ Bom
 DocType: Appraisal,For Employee,សម្រាប់បុគ្គលិក
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +112,Row {0}: Advance against Supplier must be debit,ជួរដេក {0}: ជាមុនប្រឆាំងនឹងការផ្គត់ផ្គង់ត្រូវតែឥណពន្ធ
 DocType: Company,Default Values,តម្លៃលំនាំដើម
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +240,Row {0}: Payment amount can not be negative,ជួរដេក {0}: ចំនួនទឹកប្រាក់ទូទាត់មិនអាចជាអវិជ្ជមាន
 DocType: Expense Claim,Total Amount Reimbursed,ចំនួនទឹកប្រាក់សរុបដែលបានសងវិញ
@@ -1237,7 +1333,7 @@
 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: Packed Item,To Warehouse (Optional),ទៅឃ្លាំង (ជាជម្រើស)
 DocType: Sales Invoice,Paid Amount (Company Currency),ចំនួនទឹកប្រាក់ដែលបានបង់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Purchase Invoice,Additional Discount,បញ្ចុះតំលៃបន្ថែម
 DocType: Selling Settings,Selling Settings,ការលក់ការកំណត់
@@ -1246,9 +1342,10 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","ក្រុមហ៊ុន, ខែនិងឆ្នាំសារពើពន្ធចាំបាច់"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,ចំណាយទីផ្សារ
 ,Item Shortage Report,របាយការណ៍កង្វះធាតុ
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",ទំងន់ត្រូវបានបង្ហាញ \ n សូមនិយាយអំពី &quot;ទម្ងន់ UOM&quot; ពេក
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",ទំងន់ត្រូវបានបង្ហាញ \ n សូមនិយាយអំពី &quot;ទម្ងន់ UOM&quot; ពេក
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,សម្ភារៈស្នើសុំប្រើដើម្បីធ្វើឱ្យផ្សារហ៊ុននេះបានចូល
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,អង្គភាពតែមួយនៃធាតុមួយ។
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',កំណត់ហេតុពេលវេលាបាច់ {0} ត្រូវតែត្រូវបាន &quot;ផ្តល់ជូន&quot;
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ធ្វើឱ្យធាតុគណនេយ្យសម្រាប់គ្រប់ចលនាហ៊ុន
 DocType: Leave Allocation,Total Leaves Allocated,ចំនួនសរុបដែលបានបម្រុងទុកស្លឹក
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +394,Warehouse required at Row No {0},ឃ្លាំងបានទាមទារនៅក្នុងជួរដេកគ្មាន {0}
@@ -1256,8 +1353,10 @@
 DocType: Employee,Date Of Retirement,កាលបរិច្ឆេទនៃការចូលនិវត្តន៍
 DocType: Upload Attendance,Get Template,ទទួលបានទំព័រគំរូ
 DocType: Address,Postal,ប្រៃសណីយ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ការដំឡើង ERPNext ទាំងស្រុង!
 DocType: Item,Weightage,Weightage
 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,ការគ្រុបអតិថិជនមានឈ្មោះដូចគ្នាសូមផ្លាស់ប្តូរឈ្មោះរបស់អតិថិជនឬប្តូរឈ្មោះក្រុមរបស់អតិថិជន
+apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,សូមជ្រើស {0} ជាលើកដំបូង។
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,ទំនាក់ទំនងថ្មី
 DocType: Territory,Parent Territory,ដែនដីមាតាឬបិតា
 DocType: Quality Inspection Reading,Reading 2,ការអាន 2
@@ -1278,16 +1377,17 @@
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,កន្រ្តកទំនិញត្រូវបានអនុញ្ញាត
 DocType: Job Applicant,Applicant for a Job,កម្មវិធីសម្រាប់ការងារ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,គ្មានការបញ្ជាទិញផលិតផលដែលបានបង្កើត
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +153,Salary Slip of employee {0} already created for this month,ប័ណ្ណប្រាក់ខែរបស់បុគ្គលិក {0} បានបង្កើតឡើងរួចហើយសម្រាប់ខែនេះ
 DocType: Stock Reconciliation,Reconciliation JSON,ការផ្សះផ្សា JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ជួរឈរច្រើនពេក។ នាំចេញរបាយការណ៍និងបោះពុម្ពដោយប្រើកម្មវិធីសៀវភៅបញ្ជីមួយ។
 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 +139,Main,ដើមចម្បង
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,ដើមចម្បង
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,វ៉ារ្យ៉ង់
 DocType: Naming Series,Set prefix for numbering series on your transactions,កំណត់បុព្វបទសម្រាប់លេខស៊េរីលើប្រតិបតិ្តការរបស់អ្នក
 DocType: Employee Attendance Tool,Employees HTML,និយោជិករបស់ HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,គោលបំណងបញ្ឈប់ការដែលមិនអាចត្រូវបានលុបចោល។ ឮដើម្បីលុបចោល។
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,Bom លំនាំដើម ({0}) ត្រូវតែសកម្មសម្រាប់ធាតុនេះឬពុម្ពរបស់ខ្លួន
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,វ៉ារ្យ៉ង់
@@ -1304,13 +1404,15 @@
 DocType: Purchase Order Item,Warehouse and Reference,ឃ្លាំងនិងឯកសារយោង
 DocType: Supplier,Statutory info and other general information about your Supplier,ពត៌មានច្បាប់និងព័ត៌មានទូទៅអំពីផ្គត់ផ្គង់របស់អ្នក
 apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,អាសយដ្ឋាន
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,Against Journal Entry {0} does not have any unmatched {1} entry,ប្រឆាំងនឹង Journal 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.,ធាតុមិនត្រូវបានអនុញ្ញាតឱ្យមានការបញ្ជាទិញផលិតផល។
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),ទំងន់សុទ្ធកញ្ចប់នេះ។ (គណនាដោយស្វ័យប្រវត្តិជាផលបូកនៃទម្ងន់សុទ្ធនៃធាតុ)
 DocType: Sales Order,To Deliver and Bill,ដើម្បីផ្តល់និង Bill
 DocType: GL Entry,Credit Amount in Account Currency,ចំនួនឥណទានរូបិយប័ណ្ណគណនី
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,កំណត់ហេតុសម្រាប់ការផលិតវេលាម៉ោង។
-DocType: Item,Apply Warehouse-wise Reorder Level,អនុវត្តឃ្លាំងប្រាជ្ញារៀបចំកំរិត
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,Bom {0} ត្រូវតែត្រូវបានដាក់ជូន
 DocType: Authorization Control,Authorization Control,ការត្រួតពិនិត្យសេចក្តីអនុញ្ញាត
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ជួរដេក # {0}: ឃ្លាំងគឺជាការចាំបាច់បានច្រានចោលការប្រឆាំងនឹងធាតុច្រានចោល {1}
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,កំណត់ហេតុពេលវេលាសម្រាប់ការងារ។
@@ -1329,6 +1431,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,អ្នកបានបញ្ចូលធាតុស្ទួន។ សូមកែតម្រូវនិងព្យាយាមម្ដងទៀត។
 apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,តម្លៃ {0} សម្រាប់គុណលក្ខណៈ {1} មិនមាននៅក្នុងបញ្ជីនៃធាតុត្រឹមត្រូវតម្លៃគុណលក្ខណៈ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,រង
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,ធាតុ {0} គឺមិនមែនជាធាតុសៀរៀល
 DocType: SMS Center,Create Receiver List,បង្កើតបញ្ជីអ្នកទទួល
 DocType: Packing Slip,To Package No.,ខ្ចប់លេខ
 DocType: Warranty Claim,Issue Date,បញ្ហាកាលបរិច្ឆេទ
@@ -1337,6 +1440,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,ទូរគមនាគមន៍
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),បង្ហាញថាកញ្ចប់នេះគឺជាផ្នែកមួយនៃរឿងនេះការចែកចាយ (មានតែសេចក្តីព្រាង)
 DocType: Payment Tool,Make Payment Entry,ធ្វើឱ្យធាតុទូទាត់ប្រាក់
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},បរិមាណដែលត្រូវទទួលទានសម្រាប់ធាតុ {0} ត្រូវតិចជាង {1}
 ,Sales Invoice Trends,ការលក់វិក័យប័ត្រនិន្នាការ
 DocType: Leave Application,Apply / Approve Leaves,អនុវត្ត / អនុម័តស្លឹក
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,ចំពោះ
@@ -1373,6 +1477,7 @@
 ,Amount to Deliver,ចំនួនទឹកប្រាក់ដែលផ្តល់
 apps/erpnext/erpnext/public/js/setup_wizard.js +286,A Product or Service,ផលិតផលឬសេវាកម្ម
 DocType: Naming Series,Current Value,តម្លៃបច្ចុប្បន្ន
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} បង្កើតឡើង
 DocType: Delivery Note Item,Against Sales Order,ប្រឆាំងនឹងដីកាលក់
 ,Serial No Status,ស្ថានភាពគ្មានសៀរៀល
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,តារាងធាតុមិនអាចទទេ
@@ -1386,6 +1491,7 @@
 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 +327,Please enter Reference date,សូមបញ្ចូលកាលបរិច្ឆេទយោង
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +35,Payment Gateway Account is not configured,ការទូទាត់គណនី Gateway ដែលមិនត្រូវបានកំណត់រចនាសម្ព័ន្ធ
+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,ការស្នើសុំសម្ភារៈធាតុ
@@ -1402,6 +1508,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,ជួរដេក # {0}: ប្រតិបត្ដិការ {1} មិនត្រូវបានបញ្ចប់សម្រាប់ {2} qty ទំនិញសម្រេចនៅក្នុងផលិតកម្មលំដាប់ # {3} ។ សូមធ្វើឱ្យទាន់សម័យស្ថានភាពកំណត់ហេតុម៉ោងប្រតិបត្ដិការតាមរយៈការ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,ការវិនិយោគ
 DocType: Issue,Resolution Details,ពត៌មានលំអិតការដោះស្រាយ
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,តុល្យភាព
 DocType: Quality Inspection Reading,Acceptance Criteria,លក្ខណៈវិនិច្ឆ័យក្នុងការទទួលយក
 DocType: Item Attribute,Attribute Name,ឈ្មោះគុណលក្ខណៈ
 DocType: Item Group,Show In Website,បង្ហាញនៅក្នុងវេបសាយ
@@ -1414,6 +1521,7 @@
 DocType: Holiday List,Clear Table,ជម្រះការតារាង
 DocType: Features Setup,Brands,ផលិតផលម៉ាក
 DocType: C-Form Invoice Detail,Invoice No,គ្មានវិក័យប័ត្រ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +93,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ទុកឱ្យមិនអាចត្រូវបានអនុវត្ត / លុបចោលមុនពេល {0}, ដែលជាតុល្យភាពការឈប់សម្រាកបានជាទំនិញ-បានបញ្ជូនបន្តនៅក្នុងកំណត់ត្រាការបែងចែកការឈប់សម្រាកនាពេលអនាគតរួចទៅហើយ {1}"
 DocType: Activity Cost,Costing Rate,អត្រាការប្រាក់មានតម្លៃ
 ,Customer Addresses And Contacts,អាសយដ្ឋានអតិថិជននិងទំនាក់ទំនង
 DocType: Employee,Resignation Letter Date,កាលបរិច្ឆេទលិខិតលាលែងពីតំណែង
@@ -1428,6 +1536,7 @@
 DocType: Employee,Personal Details,ពត៌មានលំអិតផ្ទាល់ខ្លួន
 ,Maintenance Schedules,កាលវិភាគថែរក្សា
 ,Quotation Trends,សម្រង់និន្នាការ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},ធាតុគ្រុបមិនបានរៀបរាប់នៅក្នុងមេធាតុសម្រាប់ធាតុ {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +310,Debit To account must be a Receivable account,ឥណពន្ធវីសាទៅគណនីត្រូវតែជាគណនីដែលទទួល
 DocType: Shipping Rule Condition,Shipping Amount,ចំនួនទឹកប្រាក់ការដឹកជញ្ជូន
 ,Pending Amount,ចំនួនទឹកប្រាក់ដែលមិនទាន់សម្រេច
@@ -1436,6 +1545,7 @@
 apps/erpnext/erpnext/config/hr.py +168,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,ថ្ងៃដែលនឹងត្រូវកើតឡើងវិក្កយបត្របញ្ឈប់ការ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,ចំនួនសរុបដែលបានបម្រុងទុកស្លឹក {0} មិនអាចតិចជាងស្លឹកត្រូវបានអនុម័តរួចទៅហើយ {1} សម្រាប់រយៈពេលនេះ
 DocType: Journal Entry,Accounts Receivable,គណនីអ្នកទទួល
 ,Supplier-Wise Sales Analytics,ក្រុមហ៊ុនផ្គត់ផ្គង់ប្រាជ្ញាលក់វិភាគ
 DocType: Address Template,This format is used if country specific format is not found,ទ្រង់ទ្រាយនេះត្រូវបានប្រើប្រសិនបើទ្រង់ទ្រាយជាក់លាក់គឺមិនត្រូវបានរកឃើញថាប្រទេស
@@ -1444,11 +1554,12 @@
 apps/erpnext/erpnext/config/accounts.py +46,Tree of finanial accounts.,មែកធាងនៃគណនីរបស់ finanial ។
 DocType: Leave Control Panel,Leave blank if considered for all employee types,ប្រសិនបើអ្នកទុកវាឱ្យទទេអស់ទាំងប្រភេទពិចារណាសម្រាប់បុគ្គលិក
 DocType: Landed Cost Voucher,Distribute Charges Based On,ដោយផ្អែកលើការចែកចាយការចោទប្រកាន់
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,គណនី {0} ត្រូវតែមានប្រភេទ &quot;ទ្រព្យ&quot; ដែលជាធាតុ {1} ជាធាតុធាតុសកម្មមួយ
 DocType: HR Settings,HR Settings,ការកំណត់ធនធានមនុស្ស
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,ពាក្យបណ្តឹងលើការចំណាយគឺត្រូវរង់ចាំការអនុម័ត។ មានតែការអនុម័តលើការចំណាយនេះអាចធ្វើឱ្យស្ថានភាពទាន់សម័យ។
 DocType: Purchase Invoice,Additional Discount Amount,ចំនួនទឹកប្រាក់ដែលបញ្ចុះតម្លៃបន្ថែម
 DocType: Leave Block List Allow,Leave Block List Allow,បញ្ជីប្លុកអនុញ្ញាតឱ្យចាកចេញពី
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr មិនអាចមាននៅទទេឬទំហំ
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr មិនអាចមាននៅទទេឬទំហំ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,ជាក្រុមការមិនគ្រុប
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,កីឡា
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,សរុបជាក់ស្តែង
@@ -1465,9 +1576,12 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),បិទ (បើក + + សរុប)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,សូមបញ្ជាក់រូបិយប័ណ្ណនៅក្នុងក្រុមហ៊ុន
 DocType: Workstation,Wages per hour,ប្រាក់ឈ្នួលក្នុងមួយម៉ោង
+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},ភាគហ៊ុននៅក្នុងជំនាន់ទីតុល្យភាព {0} នឹងក្លាយទៅជាអវិជ្ជមាន {1} សម្រាប់ធាតុ {2} នៅឃ្លាំង {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.",បង្ហាញ / លាក់លក្ខណៈពិសេសដូចជាសៀរៀល NOS លោកម៉ាស៊ីនឆូតកាតជាដើម
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,បន្ទាប់ពីការសម្ភារៈសំណើត្រូវបានលើកឡើងដោយស្វ័យប្រវត្តិដោយផ្អែកលើកម្រិតឡើងវិញដើម្បីធាតុរបស់
+apps/erpnext/erpnext/controllers/accounts_controller.py +252,Account {0} is invalid. Account Currency must be {1},គណនី {0} មិនត្រឹមត្រូវ។ រូបិយប័ណ្ណគណនីត្រូវតែ {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},កត្តាប្រែចិត្តជឿ UOM គឺត្រូវបានទាមទារនៅក្នុងជួរដេក {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},កាលបរិច្ឆេទបោសសំអាតមិនអាចជាមុនកាលបរិច្ឆេទពិនិត្យនៅក្នុងជួរដេកដែលបាន {0}
 DocType: Salary Slip,Deduction,ការដក
 apps/erpnext/erpnext/stock/get_item_details.py +242,Item Price added for {0} in Price List {1},ថ្លៃទំនិញបានបន្ថែមសម្រាប់ {0} នៅក្នុងបញ្ជីតម្លៃ {1}
 DocType: Address Template,Address Template,អាសយដ្ឋានទំព័រគំរូ
@@ -1483,8 +1597,10 @@
 DocType: Quotation,Maintenance User,អ្នកប្រើប្រាស់ថែទាំ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +137,Cost Updated,ការចំណាយបន្ទាន់សម័យ
 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**.,** ឆ្នាំសារពើពន្ធឆ្នាំ ** តំណាងឱ្យហិរញ្ញវត្ថុ។ ការបញ្ចូលគណនីទាំងអស់និងប្រតិបត្តិការដ៏ធំមួយផ្សេងទៀតត្រូវបានតាមដានការប្រឆាំងនឹងឆ្នាំសារពើពន្ធ ** ** ។
 DocType: Opportunity,Customer / Lead Address,អតិថិជន / អ្នកដឹកនាំការអាសយដ្ឋាន
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},ព្រមាន: វិញ្ញាបនបត្រ SSL មិនត្រឹមត្រូវលើឯកសារភ្ជាប់ {0}
 DocType: Production Order Operation,Actual Operation Time,ប្រតិបត្ដិការពេលវេលាពិតប្រាកដ
 DocType: Authorization Rule,Applicable To (User),ដែលអាចអនុវត្តទៅ (អ្នកប្រើប្រាស់)
 DocType: Purchase Taxes and Charges,Deduct,កាត់
@@ -1497,18 +1613,23 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"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 +69,Shipments,ការនាំចេញ
 DocType: Purchase Order Item,To be delivered to customer,ត្រូវបានបញ្ជូនទៅកាន់អតិថិជន
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +44,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/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,ជួរដេក #
 DocType: Purchase Invoice,In Words (Company Currency),នៅក្នុងពាក្យ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Pricing Rule,Supplier,ក្រុមហ៊ុនផ្គត់ផ្គង់
 DocType: C-Form,Quarter,ត្រីមាស
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,ការចំណាយនានា
 DocType: Global Defaults,Default Company,ក្រុមហ៊ុនលំនាំដើម
+apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ការចំណាយឬគណនីភាពខុសគ្នាគឺជាការចាំបាច់សម្រាប់ធាតុ {0} វាជាការរួមភាគហ៊ុនតម្លៃផលប៉ះពាល់
+apps/erpnext/erpnext/controllers/accounts_controller.py +370,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",មិនអាច overbill សម្រាប់ធាតុនៅ {0} {1} ជួរដេកច្រើនជាង {2} ។ ដើម្បីអនុញ្ញាតឱ្យ overbilling សូមកំណត់នៅក្នុងការកំណត់ហ៊ុន
 DocType: Employee,Bank Name,ឈ្មោះធនាគារ
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,ប្រើ {0} ត្រូវបានបិទ
 DocType: Leave Application,Total Leave Days,សរុបថ្ងៃស្លឹក
 DocType: Email Digest,Note: Email will not be sent to disabled users,ចំណាំ: អ៊ីម៉ែលនឹងមិនត្រូវបានផ្ញើទៅកាន់អ្នកប្រើជនពិការ
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,ជ្រើសក្រុមហ៊ុន ...
@@ -1517,8 +1638,10 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +363,{0} is mandatory for Item {1},{0} គឺជាការចាំបាច់សម្រាប់ធាតុ {1}
 DocType: Currency Exchange,From Currency,ចាប់ពីរូបិយប័ណ្ណ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","សូមជ្រើសចំនួនទឹកប្រាក់ដែលបានបម្រុងទុក, ប្រភេទវិក័យប័ត្រនិងលេខវិក្កយបត្រក្នុងមួយជួរដេកយ៉ាងហោចណាស់"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},លំដាប់ការលក់បានទាមទារសម្រាប់ធាតុ {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),អត្រាការប្រាក់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,អ្នកផ្សេងទៀត
+apps/erpnext/erpnext/templates/includes/product_page.js +65,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,មិនអាចជ្រើសប្រភេទការចោទប្រកាន់ថាជា &quot;នៅលើចំនួនជួរដេកមុន &#39;ឬ&#39; នៅលើជួរដេកសរុបមុន&quot; សម្រាប់ជួរដេកដំបូង
@@ -1530,6 +1653,7 @@
 DocType: Quality Inspection,In Process,ក្នុងដំណើរការ
 DocType: Authorization Rule,Itemwise Discount,Itemwise បញ្ចុះតំលៃ
 DocType: Purchase Order Item,Reference Document Type,សេចក្តីយោងប្រភេទឯកសារ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,{0} against Sales Order {1},{0} នឹងដីកាសម្រេចលក់ {1}
 DocType: Account,Fixed Asset,ទ្រព្យសកម្មថេរ
 apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,សារពើភ័ណ្ឌស៊េរី
 DocType: Activity Type,Default Billing Rate,អត្រាការប្រាក់វិក័យប័ត្រលំនាំដើម
@@ -1576,6 +1700,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,"For {0}, only debit accounts can be linked against another credit entry",{0} មានតែគណនីឥណពន្ធអាចត្រូវបានតភ្ជាប់ប្រឆាំងនឹងធាតុឥណទានផ្សេងទៀត
 apps/erpnext/erpnext/stock/get_item_details.py +253,Price List {0} is disabled,បញ្ជីតម្លៃ {0} ត្រូវបានបិទ
 DocType: Manufacturing Settings,Allow Overtime,អនុញ្ញាតឱ្យបន្ថែមម៉ោង
+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,កូដធាតុអតិថិជន
 DocType: Opportunity,Lost Reason,បាត់បង់មូលហេតុ
@@ -1593,6 +1718,7 @@
 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} មិនបានរកឃើញ
 apps/erpnext/erpnext/public/js/setup_wizard.js +233,Your Customers,អតិថិជនរបស់អ្នក
 DocType: Leave Block List Date,Block Date,ប្លុកកាលបរិច្ឆេទ
 DocType: Sales Order,Not Delivered,មិនបានផ្តល់
@@ -1623,7 +1749,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,សំណុំរឿងលេខមិនអាចមាន 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,ប្រសិនបើអ្នកមានក្រុមលក់និងដៃគូលក់ (ឆានែលដៃគូរ) ពួកគេអាចត្រូវបានដាក់ស្លាកនិងរក្សាបាននូវការចូលរួមចំណែករបស់គេនៅក្នុងសកម្មភាពនៃការលក់
 DocType: Item,Show a slideshow at the top of the page,បង្ហាញតែការបញ្ចាំងស្លាយមួយនៅផ្នែកខាងលើនៃទំព័រនេះ
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,ហាងលក់
+DocType: Item,"Allow in Sales Order of type ""Service""",អនុញ្ញាតឱ្យនៅក្នុងការលក់សណ្តាប់ធ្នាប់នៃប្រភេទ &quot;សេវា&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,ហាងលក់
 DocType: Time Log,Projects Manager,ការគ្រប់គ្រងគម្រោង
 DocType: Serial No,Delivery Time,ម៉ោងដឹកជញ្ជូន
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing ដោយផ្អែកលើការ
@@ -1648,7 +1775,7 @@
 ,Financial Analytics,វិភាគហិរញ្ញវត្ថុ
 DocType: Quality Inspection,Verified By,បានផ្ទៀងផ្ទាត់ដោយ
 DocType: Address,Subsidiary,ក្រុមហ៊ុនបុត្រសម្ព័ន្ធ
-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.",មិនអាចផ្លាស់ប្តូរូបិយប័ណ្ណលំនាំដើមរបស់ក្រុមហ៊ុនដោយសារតែមានប្រតិបតិ្តការដែលមានស្រាប់។ ប្រតិបត្ដិការត្រូវតែត្រូវបានលុបចោលការផ្លាស់ប្តូររូបិយប័ណ្ណលំនាំដើម។
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",មិនអាចផ្លាស់ប្តូរូបិយប័ណ្ណលំនាំដើមរបស់ក្រុមហ៊ុនដោយសារតែមានប្រតិបតិ្តការដែលមានស្រាប់។ ប្រតិបត្ដិការត្រូវតែត្រូវបានលុបចោលការផ្លាស់ប្តូររូបិយប័ណ្ណលំនាំដើម។
 DocType: Quality Inspection,Purchase Receipt No,គ្មានបង្កាន់ដៃទិញ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ប្រាក់ Earnest បាន
 DocType: Process Payroll,Create Salary Slip,បង្កើតប្រាក់ខែគ្រូពេទ្យប្រហែលជា
@@ -1665,6 +1792,7 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,តម្រូវការនៅលើ
 DocType: Sales Invoice,Mass Mailing,អភិបូជាសំបុត្ររួម
 DocType: Rename Tool,File to Rename,ឯកសារដែលត្រូវប្តូរឈ្មោះ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},ចំនួនលំដាប់ Purchse បានទាមទារសម្រាប់ធាតុ {0}
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Bom បានបញ្ជាក់ {0} មិនមានសម្រាប់ធាតុ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +198,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,កាលវិភាគថែរក្សា {0} ត្រូវតែបានលុបចោលមុនពេលលុបចោលការបញ្ជាលក់នេះ
 DocType: Notification Control,Expense Claim Approved,ពាក្យបណ្តឹងលើការចំណាយបានអនុម័ត
@@ -1688,18 +1816,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,ទូទាត់បិទ
 DocType: Quality Inspection Reading,Accepted,បានទទួលយក
 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.,សូមប្រាកដថាអ្នកពិតជាចង់លុបប្រតិបតិ្តការទាំងអស់សម្រាប់ក្រុមហ៊ុននេះ។ ទិន្នន័យមេរបស់អ្នកនឹងនៅតែជាវាគឺជា។ សកម្មភាពនេះមិនអាចមិនធ្វើវិញ។
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},សេចក្ដីយោងមិនត្រឹមត្រូវ {0} {1}
 DocType: Payment Tool,Total Payment Amount,ចំនួនទឹកប្រាក់សរុប
 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}) មិនអាចច្រើនជាងការគ្រោងទុក quanitity ({2}) នៅក្នុងផលិតកម្មលំដាប់ {3}
 DocType: Shipping Rule,Shipping Rule Label,វិធានការដឹកជញ្ជូនស្លាក
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,វត្ថុធាតុដើមដែលមិនអាចត្រូវបានទទេ។
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","មិនអាចធ្វើឱ្យទាន់សម័យហ៊ុន, វិក័យប័ត្រមានធាតុដឹកជញ្ជូនទម្លាក់។"
 DocType: Newsletter,Test,ការធ្វើតេស្ត
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'","ដូចដែលមានប្រតិបតិ្តការភាគហ៊ុនដែលមានស្រាប់សម្រាប់ធាតុនេះ \ អ្នកមិនអាចផ្លាស់ប្តូរតម្លៃនៃ &quot;គ្មានសៀរៀល &#39;,&#39; មានជំនាន់ទីគ្មាន &#39;,&#39; គឺជាធាតុហ៊ុន&quot; និង &quot;វិធីសាស្រ្តវាយតម្លៃ&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,ធាតុទិនានុប្បវត្តិរហ័ស
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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},សូមបញ្ចូលសម្រាប់ធាតុគ្រោងទុក Qty {0} នៅក្នុងជួរដេក {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +215,{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
@@ -1712,6 +1843,7 @@
 DocType: Authorization Rule,Authorized Value,តម្លៃដែលបានអនុញ្ញាត
 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 +736,Item or Warehouse for row {0} does not match Material Request,ធាតុឬឃ្លាំងសំរាប់ជួរ {0} មិនផ្គូផ្គងសំណើសម្ភារៈ
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,ឯកតារង្វាស់
 DocType: Fiscal Year,Year End Date,ឆ្នាំបញ្ចប់កាលបរិច្ឆេទ
 DocType: Task Depends On,Task Depends On,ភារកិច្ចអាស្រ័យលើ
@@ -1724,6 +1856,7 @@
 DocType: Purchase Receipt,Get Current Stock,ទទួលបានភាគហ៊ុននាពេលបច្ចុប្បន្ន
 apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,មែកធាងនៃលោក Bill នៃសម្ភារៈ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,លោក Mark បច្ចុប្បន្ន
+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,គោលបំណង
@@ -1739,6 +1872,7 @@
 DocType: Customer Group,Has Child Node,មានថ្នាំងកុមារ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{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/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,នេះត្រូវបានគេហទំព័រជាឧទាហរណ៍មួយបង្កើតដោយស្វ័យប្រវត្តិពី ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,ជួរ Ageing 1
 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.
@@ -1778,7 +1912,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,ជាដំបូងសូមចំណាំដឹកជញ្ជូន
 DocType: Purchase Invoice,Currency and Price List,រូបិយប័ណ្ណនិងតារាងតម្លៃ
 DocType: Opportunity,Customer / Lead Name,អតិថិជននាំឱ្យឈ្មោះ /
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,ការបោសសំអាតកាលបរិច្ឆេទមិនបានលើកឡើង
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,ការបោសសំអាតកាលបរិច្ឆេទមិនបានលើកឡើង
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,ផលិតកម្ម
 DocType: Item,Allow Production Order,អនុញ្ញាតឱ្យមានការបញ្ជាទិញផលិតផល
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,ជួរដេក {0}: ចាប់ផ្តើមកាលបរិច្ឆេទត្រូវតែមុនពេលដែលកាលបរិច្ឆេទបញ្ចប់
@@ -1788,7 +1922,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,ប្រាក់ចំណូលសរុប
 DocType: Purchase Receipt,Time at which materials were received,ពេលវេលាដែលបានសមា្ភារៈត្រូវបានទទួល
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,អាសយដ្ឋានរបស់ខ្ញុំ
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,អាសយដ្ឋានរបស់ខ្ញុំ
 DocType: Stock Ledger Entry,Outgoing Rate,អត្រាចេញ
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,ចៅហ្វាយសាខាអង្គការ។
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,ឬ
@@ -1810,6 +1944,7 @@
 DocType: Target Detail,Target  Amount,គោលដៅចំនួនទឹកប្រាក់
 DocType: Shopping Cart Settings,Shopping Cart Settings,ការកំណត់កន្រ្តកទំនិញ
 DocType: Journal Entry,Accounting Entries,ធាតុគណនេយ្យ
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},ស្ទួនធាតុ។ សូមពិនិត្យមើលវិធានអនុញ្ញាត {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS Profile {0} already created for company {1},ប្រវត្តិម៉ាស៊ីនឆូតកាតសកល {0} បានបង្កើតឡើងរួចទៅហើយសម្រាប់ក្រុមហ៊ុន {1}
 DocType: Purchase Order,Ref SQ,យោង SQ
 apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,ជំនួសធាតុ / Bom ក្នុង BOMs ទាំងអស់
@@ -1818,8 +1953,10 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +297,Not Paid and Not Delivered,មិនបានបង់និងការមិនផ្តល់
 DocType: Product Bundle,Parent Item,ធាតុមេ
 DocType: Account,Account Type,ប្រភេទគណនី
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,ទុកឱ្យប្រភេទ {0} មិនអាចត្រូវបានយកមកបញ្ជូនបន្ត
 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',ថែទាំគឺមិនត្រូវបានបង្កើតកាលវិភាគសម្រាប់ធាតុទាំងអស់នោះ។ សូមចុចលើ &#39;បង្កើតកាលវិភាគ &quot;
 ,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),ការកំណត់អត្តសញ្ញាណនៃកញ្ចប់សម្រាប់ការចែកចាយ (សម្រាប់បោះពុម្ព)
 DocType: Bin,Reserved Quantity,បរិមាណបំរុងទុក
 DocType: Landed Cost Voucher,Purchase Receipt Items,ទទួលទិញរបស់របរ
@@ -1847,13 +1984,14 @@
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,បទនាំតាមប្រភេទឧស្សាហកម្ម។
 DocType: Item Supplier,Item Supplier,ផ្គត់ផ្គង់ធាតុ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,សូមបញ្ចូលលេខកូដធាតុដើម្បីទទួលបាច់នោះទេ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +657,Please select a value for {0} quotation_to {1},សូមជ្រើសតម្លៃសម្រាប់ {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,អាសយដ្ឋានទាំងអស់។
 DocType: Company,Stock Settings,ការកំណត់តម្លៃភាគហ៊ុន
 apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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 +302,New Cost Center Name,មជ្ឈមណ្ឌលការចំណាយថ្មីរបស់ឈ្មោះ
 DocType: Leave Control Panel,Leave Control Panel,ទុកឱ្យផ្ទាំងបញ្ជា
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,រកមិនឃើញទំព័រគំរូលំនាំដើមអាសយដ្ឋាន។ សូមបង្កើតថ្មីមួយពីការដំឡើង&gt; បោះពុម្ពនិងយីហោ&gt; អាស័យពុម្ព។
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,រកមិនឃើញទំព័រគំរូលំនាំដើមអាសយដ្ឋាន។ សូមបង្កើតថ្មីមួយពីការដំឡើង&gt; បោះពុម្ពនិងយីហោ&gt; អាស័យពុម្ព។
 DocType: Appraisal,HR User,ធនធានមនុស្សរបស់អ្នកប្រើប្រាស់
 DocType: Purchase Invoice,Taxes and Charges Deducted,ពន្ធនិងការចោទប្រកាន់កាត់
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,បញ្ហានានា
@@ -1869,7 +2007,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,ពត៌មាននៃឧបករណ៍ទូទាត់ប្រាក់
 ,Sales Browser,កម្មវិធីរុករកការលក់
 DocType: Journal Entry,Total Credit,ឥណទានសរុប
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,ក្នុងតំបន់
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},ព្រមាន: មួយទៀត {0} {1} # មានប្រឆាំងនឹងធាតុភាគហ៊ុន {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,ដែលមានទំហំធំ
@@ -1880,13 +2019,15 @@
 DocType: Production Order Operation,Planned Start Time,ពេលវេលាចាប់ផ្ដើមគ្រោងទុក
 apps/erpnext/erpnext/config/accounts.py +68,Close Balance Sheet and book Profit or Loss.,តារាងតុល្យការជិតស្និទ្ធនិងសៀវភៅចំណញឬខាត។
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,បញ្ជាក់អត្រាប្តូរប្រាក់ដើម្បីបម្លែងរូបិយប័ណ្ណមួយទៅមួយផ្សេងទៀត
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,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,គោលដៅ
 DocType: Price List,Price List Master,តារាងតម្លៃអនុបណ្ឌិត
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ទាំងអស់តិបត្តិការអាចនឹងត្រូវបានដាក់ស្លាកលក់បានច្រើនជនលក់ប្រឆាំងនឹង ** ** ដូច្នេះអ្នកអាចកំណត់និងត្រួតពិនិត្យគោលដៅ។
 ,S.O. No.,សូលេខ
 DocType: Production Order Operation,Make Time Log,ធ្វើឱ្យការកំណត់ហេតុម៉ោង
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,សូមកំណត់បរិមាណការរៀបចំ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},សូមបង្កើតអតិថិជនពីអ្នកដឹកនាំការ {0}
 DocType: Price List,Applicable for Countries,អនុវត្តសម្រាប់បណ្តាប្រទេស
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,កុំព្យូទ័រ
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,នេះគឺជាក្រុមអតិថិជនជា root និងមិនអាចត្រូវបានកែសម្រួល។
@@ -1923,6 +2064,7 @@
 DocType: Project Task,Working,ការងារ
 DocType: Stock Ledger Entry,Stock Queue (FIFO),ភាគហ៊ុនជួរ (FIFO)
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +24,Please select Time Logs.,សូមជ្រើសម៉ោងកំណត់ហេតុ។
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +37,{0} does not belong to Company {1},{0} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
 DocType: Account,Round Off,បិទការប្រកួតជុំទី
 ,Requested Qty,បានស្នើរសុំ Qty
 DocType: Tax Rule,Use for Shopping Cart,ប្រើសម្រាប់កន្រ្តកទំនិញ
@@ -1942,6 +2084,7 @@
 DocType: Supplier Quotation Item,Material Request No,សម្ភារៈគ្មានសំណើរ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +211,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/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,គ្រប់គ្រងដើមឈើមួយដើមដែនដី។
 DocType: Journal Entry Account,Sales Invoice,វិក័យប័ត្រការលក់
@@ -1958,6 +2101,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,ទទួលបានធាតុពាក់ព័ន្ធ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,ចូលគណនេយ្យសម្រាប់ក្រុមហ៊ុនផ្សារ
 DocType: Sales Invoice,Sales Team1,Team1 ការលក់
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,ធាតុ {0} មិនមាន
 DocType: Sales Invoice,Customer Address,អាសយដ្ឋានអតិថិជន
 DocType: Payment Request,Recipient and Message,អ្នកទទួលនិងសារ
 DocType: Purchase Invoice,Apply Additional Discount On,អនុវត្តបន្ថែមការបញ្ចុះតម្លៃនៅលើ
@@ -1980,6 +2124,7 @@
 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,ទាញយកឯកសារដែលត្រូវការ
@@ -1993,16 +2138,19 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,ពណ៌
 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",សូមជ្រើសធាតុដែល &quot;គឺជាធាតុហ៊ុន&quot; គឺ &quot;ទេ&quot; ហើយ &quot;តើធាតុលក់&quot; គឺជា &quot;បាទ&quot; ហើយមិនមានកញ្ចប់ផលិតផលផ្សេងទៀត
+apps/erpnext/erpnext/controllers/accounts_controller.py +425,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ជាមុនសរុប ({0}) នឹងដីកាសម្រេច {1} មិនអាចច្រើនជាងសម្ពោធសរុប ({2})
 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 +274,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} មិនមាននៅក្នុងតារាងខាងលើ &quot;ការទិញបង្កាន់ដៃ&quot;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,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,ប្តូរឈ្មោះចូល
 DocType: Installation Note Item,Against Document No,ប្រឆាំងនឹងការ Document No
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,គ្រប់គ្រងការលក់ដៃគូ។
 DocType: Quality Inspection,Inspection Type,ប្រភេទអធិការកិច្ច
+apps/erpnext/erpnext/controllers/recurring_document.py +164,Please select {0},សូមជ្រើស {0}
 DocType: C-Form,C-Form No,ទម្រង់បែបបទគ្មាន C-
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,វត្តមានចំណាំទុក
@@ -2013,6 +2161,7 @@
 DocType: Purchase Order Item,Returned Qty,ត្រឡប់មកវិញ Qty
 DocType: Employee,Exit,ការចាកចេញ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +155,Root Type is mandatory,ប្រភេទជា Root គឺជាចាំបាច់
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,សៀរៀលគ្មាន {0} បង្កើតឡើង
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ចំពោះភាពងាយស្រួលនៃអតិថិជន, កូដទាំងនេះអាចត្រូវបានប្រើនៅក្នុងទ្រង់ទ្រាយបោះពុម្ពដូចជាការវិកិយប័ត្រនិងដឹកជញ្ជូនចំណាំ"
 DocType: Employee,You can enter any date manually,អ្នកអាចបញ្ចូលកាលបរិច្ឆេទណាមួយដោយដៃ
 DocType: Sales Invoice,Advertisement,ការផ្សព្វផ្សាយ
@@ -2032,7 +2181,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,សូមបញ្ចូលកាលបរិច្ឆេទបន្ថយ។
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,ទុកឱ្យបានតែកម្មវិធីដែលមានស្ថានភាព &#39;ត្រូវបានអនុម័ត &quot;អាចត្រូវបានដាក់ស្នើ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,អាសយដ្ឋានចំណងជើងគឺជាចាំបាច់។
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,អាសយដ្ឋានចំណងជើងគឺជាចាំបាច់។
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,បញ្ចូលឈ្មោះនៃយុទ្ធនាការបានប្រសិនបើប្រភពនៃការស៊ើបអង្កេតគឺជាយុទ្ធនាការ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,កាសែតបោះពុម្ពផ្សាយ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ជ្រើសឆ្នាំសារពើពន្ធ
@@ -2044,6 +2193,7 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,ឃ្លាំងទទួលយក
 DocType: Bank Reconciliation Detail,Posting Date,ការប្រកាសកាលបរិច្ឆេទ
 DocType: Item,Valuation Method,វិធីសាស្រ្តវាយតម្លៃ
+apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},មិនអាចរកឃើញអត្រាប្តូរប្រាក់សម្រាប់ {0} ទៅ {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,ប្រារព្ធទិវាពាក់កណ្តាល
 DocType: Sales Invoice,Sales Team,ការលក់ក្រុមការងារ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,ធាតុស្ទួន
@@ -2054,6 +2204,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,យ្រប
 DocType: UOM,Must be Whole Number,ត្រូវតែជាលេខទាំងមូល
 DocType: Leave Control Panel,New Leaves Allocated (In Days),ស្លឹកថ្មីដែលបានបម្រុងទុក (ក្នុងថ្ងៃ)
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,សៀរៀលគ្មាន {0} មិនមាន
+DocType: Sales Invoice Item,Customer Warehouse (Optional),ឃ្លាំងអតិថិជន (ជាជម្រើស)
 DocType: Pricing Rule,Discount Percentage,ភាគរយបញ្ចុះតំលៃ
 DocType: Payment Reconciliation Invoice,Invoice Number,លេខវិក្ក័យប័ត្រ
 apps/erpnext/erpnext/hooks.py +55,Orders,ការបញ្ជាទិញ
@@ -2112,6 +2264,7 @@
 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 +39,Time Log {0} must be 'Submitted',ពេលវេលាកំណត់ហេតុ {0} ត្រូវតែបាន &quot;ផ្តល់ជូន&quot;
 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,បង្កើតសម្ភារៈសំណើ
@@ -2121,6 +2274,7 @@
 ,Billed Amount,ចំនួនទឹកប្រាក់ដែលបានផ្សព្វផ្សាយ
 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 +135,Material Request {0} is cancelled or stopped,សម្ភារៈសំណើ {0} ត្រូវបានលុបចោលឬបញ្ឈប់
 apps/erpnext/erpnext/public/js/setup_wizard.js +307,Add a few sample records,បន្ថែមកំណត់ត្រាគំរូមួយចំនួនដែល
 apps/erpnext/erpnext/config/hr.py +225,Leave Management,ទុកឱ្យការគ្រប់គ្រង
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,ក្រុមតាមគណនី
@@ -2133,6 +2287,7 @@
 DocType: Features Setup,Sales Extras,ការលក់បន្ថែម
 apps/erpnext/erpnext/accounts/utils.py +346,{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 +243,"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 +131,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',&quot;ពីកាលបរិច្ឆេទ&quot; ត្រូវតែមានបន្ទាប់ &#39;ដើម្បីកាលបរិច្ឆេទ &quot;
 ,Stock Projected Qty,គម្រោង Qty ផ្សារភាគហ៊ុន
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},អតិថិជន {0} មិនមែនជារបស់គម្រោង {1}
@@ -2160,7 +2315,7 @@
 DocType: Appraisal,Appraisal,ការវាយតម្លៃ
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,កាលបរិច្ឆេទគឺត្រូវបានធ្វើម្តងទៀត
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,ហត្ថលេខីដែលបានអនុញ្ញាត
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},ទុកឱ្យការអនុម័តត្រូវតែជាផ្នែកមួយនៃ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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,ពេលវេលាចាប់ផ្ដើម
@@ -2175,6 +2330,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ចំនួនទឹកប្រាក់សុទ្ធ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: BOM Operation,Hour Rate,ហួរអត្រា
 DocType: Stock Settings,Item Naming By,ធាតុដាក់ឈ្មោះតាម
+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,ទិញធាតុលំដាប់គ្មាន
@@ -2186,6 +2342,7 @@
 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 +120,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,ត្រូវបានលុបចោល
@@ -2212,6 +2369,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,ការហៅទូរស័ព្ទ
 DocType: Project,Total Costing Amount (via Time Logs),ចំនួនទឹកប្រាក់ផ្សារសរុប (តាមរយៈការពេលវេលាកំណត់ហេតុ)
 DocType: Purchase Order Item Supplied,Stock UOM,ភាគហ៊ុន UOM
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,ទិញលំដាប់ {0} គឺមិនត្រូវបានដាក់ស្នើ
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,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 +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ចំណាំ: ប្រព័ន្ធនឹងមិនបានពិនិត្យមើលលើការចែកចាយនិងការកក់សម្រាប់ធាតុ {0} ជាបរិមាណឬចំនួនទឹកប្រាក់គឺ 0
@@ -2234,10 +2392,13 @@
 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 +52,"An item exists with same name ({0}), please change the item group name or rename the item","ធាតុមួយមានឈ្មោះដូចគ្នា ({0}), សូមផ្លាស់ប្តូរឈ្មោះធាតុឬប្ដូរឈ្មោះក្រុមធាតុ"
 DocType: Sales Order Item,Sales Order Date,លំដាប់ការលក់កាលបរិច្ឆេទ
 DocType: Sales Invoice Item,Delivered Qty,ប្រគល់ Qty
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,ឃ្លាំង {0}: ក្រុមហ៊ុនគឺជាការចាំបាច់
 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.",សូមចូលទៅកាន់ក្រុមដែលសមស្រប (ជាធម្មតាពីប្រភពមូលនិធិ&gt; បំណុលបច្ចុប្បន្ន&gt; ពន្ធនិងភារៈកិច្ចនិងការបង្កើតគណនីថ្មីមួយ (ដោយចុចលើ Add កុមារ) នៃប្រភេទ &quot;អាករ&quot; និងធ្វើការនិយាយពីអត្រាពន្ធនេះ។
 ,Payment Period Based On Invoice Date,អំឡុងពេលបង់ប្រាក់ដែលមានមូលដ្ឋានលើវិក័យប័ត្រកាលបរិច្ឆេទ
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},បាត់ខ្លួនរូបិយប័ណ្ណប្តូរប្រាក់អត្រាការប្រាក់សម្រាប់ {0}
 DocType: Journal Entry,Stock Entry,ភាគហ៊ុនចូល
 DocType: Account,Payable,បង់
 DocType: Salary Slip,Arrear Amount,បំណុលហួសកាលកំណត់ចំនួនទឹកប្រាក់
@@ -2267,6 +2428,7 @@
 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,ប្រឆាំងនឹងគណនីចំណូល
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% ផ្តល់
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ធាតុ {0}: qty លំដាប់ {1} មិនអាចតិចជាង qty គោលបំណងអប្បរមា {2} (បានកំណត់ក្នុងធាតុ) ។
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ភាគរយចែកចាយប្រចាំខែ
 DocType: Territory,Territory Targets,ទឹកដីគោលដៅ
@@ -2297,8 +2459,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},ចំនួនបាច់គឺចាំបាច់សម្រាប់ធាតុ {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,នេះគឺជាការលក់មនុស្សម្នាក់ជា root និងមិនអាចត្រូវបានកែសម្រួល។
 ,Stock Ledger,ភាគហ៊ុនសៀវភៅ
+apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},អត្រាការប្រាក់: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,ការកាត់គ្រូពេទ្យប្រហែលជាប្រាក់បៀវត្ស
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,Select a group node first.,ជ្រើសថ្នាំងជាក្រុមមួយជាលើកដំបូង។
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +75,Purpose must be one of {0},គោលបំណងត្រូវតែជាផ្នែកមួយនៃ {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +109,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/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,វេទិកាសហគមន៍
@@ -2320,7 +2484,7 @@
 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 +733,Show tax break-up,សម្រាកឡើងពន្ធលើការបង្ហាញ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,សម្រាកឡើងពន្ធលើការបង្ហាញ
 apps/erpnext/erpnext/accounts/party.py +283,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',ប្រសិនបើលោកអ្នកមានការចូលរួមក្នុងសកម្មភាពផលិតកម្ម។ អនុញ្ញាតឱ្យមានធាតុ &quot;ត្រូវបានផលិត&quot;
@@ -2338,10 +2502,12 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +183,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ភក្ដិកំណត់ត្រាកំណត់ការដឹកជញ្ជូន {0} ត្រូវតែបានលុបចោលមុនពេលលុបចោលការបញ្ជាលក់នេះ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +381,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 +126,Note: There is not enough leave balance for Leave Type {0},ចំណាំ: មិនមានតុល្យភាពឈប់សម្រាកឱ្យបានគ្រប់គ្រាន់សម្រាប់ទុកឱ្យប្រភេទ {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.",ចំណាំ: ប្រសិនបើការទូទាត់មិនត្រូវបានធ្វើប្រឆាំងនឹងឯកសារយោងណាមួយដែលធ្វើឱ្យធាតុទិនានុប្បវត្តិដោយដៃ។
 DocType: Item,Supplier Items,ក្រុមហ៊ុនផ្គត់ផ្គង់ធាតុ
 DocType: Opportunity,Opportunity Type,ប្រភេទឱកាសការងារ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,ក្រុមហ៊ុនថ្មី
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},មជ្ឈមណ្ឌលការចំណាយគឺត្រូវបានទាមទារសម្រាប់ &#39;ប្រាក់ចំណេញនិងការបាត់បង់&#39; គណនី {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,តិបត្តិការអាចលុបបានតែដោយអ្នកបង្កើតក្រុមហ៊ុន
 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.,លេខមិនត្រឹមត្រូវនៃធាតុសៀវភៅទូទៅបានរកឃើញ។ អ្នកប្រហែលជាបានជ្រើសគណនីខុសក្នុងប្រតិបត្តិការនេះ។
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,ដើម្បីបង្កើតគណនីធនាគារ
@@ -2365,13 +2531,16 @@
 DocType: Pricing Rule,Item Group,ធាតុគ្រុប
 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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,សូមប្រភេទឈ្មោះរបស់ក្រុមហ៊ុនដើម្បីបញ្ជាក់
 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 +266,Total Debit must be equal to Total Credit. The difference is {0},ឥណពន្ធសរុបត្រូវតែស្មើនឹងឥណទានសរុប។ ភាពខុសគ្នានេះគឺ {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,រថយន្ដ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,ពីការដឹកជញ្ជូនចំណាំ
 DocType: Time Log,From Time,ចាប់ពីពេលវេលា
@@ -2384,14 +2553,13 @@
 DocType: Newsletter,A Lead with this email id should exist,អ្នកដឹកនាំដែលមានលេខសម្គាល់អ៊ីមែលនេះគួរតែមាន
 DocType: Stock Entry,From BOM,ចាប់ពី Bom
 apps/erpnext/erpnext/setup/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 +217,Please click on 'Generate Schedule',សូមចុចលើ &#39;បង្កើតកាលវិភាគ &quot;
 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 +105,"e.g. Kg, Unit, Nos, m","ឧគីឡូក្រាម, អង្គភាព, NOS លោកម៉ែត្រ"
 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,កាលបរិច្ឆេទនៃការចូលរួមត្រូវតែធំជាងថ្ងៃខែឆ្នាំកំណើត
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,រចនាសម្ព័ន្ធប្រាក់បៀវត្ស
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","វិធានតម្លៃច្រើនមានលក្ខណៈវិនិច្ឆ័យដូចគ្នា, សូមដោះស្រាយជម្លោះដោយផ្ដល់អាទិភាព \ ។ វិធានតម្លៃ: {0}"
 DocType: Account,Bank,ធនាគារ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ក្រុមហ៊ុនអាកាសចរណ៍
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,សម្ភារៈបញ្ហា
@@ -2416,14 +2584,16 @@
 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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ផ្លាស់ប្តូរទំនិញនិងមូលបត្រ
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',អង្គភាពលំនាំដើមនៃវិធានការសម្រាប់វ៉ារ្យង់ &#39;{0} &quot;ត្រូវតែមានដូចគ្នានៅក្នុងទំព័រគំរូ&#39; {1} &#39;
 DocType: Shipping Rule,Calculate Based On,គណនាមូលដ្ឋាននៅលើ
 DocType: Delivery Note Item,From Warehouse,ចាប់ពីឃ្លាំង
 DocType: Purchase Taxes and Charges,Valuation and Total,ការវាយតម្លៃនិងសរុប
 DocType: Tax Rule,Shipping City,ការដឹកជញ្ជូនក្នុងទីក្រុង
+apps/erpnext/erpnext/stock/doctype/item/item.js +59,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ធាតុនេះគឺវ៉ារ្យ៉ង់មួយនៃ {0} (គំរូ) ។ គុណលក្ខណៈដែលនឹងត្រូវបានចម្លងពីទំព័រគំរូនេះទេលុះត្រា &#39;គ្មាន&#39; ចម្លង &#39;ត្រូវបានកំណត់
 DocType: Account,Purchase User,អ្នកប្រើប្រាស់ទិញ
 DocType: Notification Control,Customize the Notification,ប្ដូរតាមសេចក្តីជូនដំណឹងនេះ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,លំហូរសាច់ប្រាក់ពីការប្រតិបត្ដិការ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,អាសយដ្ឋានលំនាំដើមទំព័រគំរូមិនអាចត្រូវបានលុប
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,អាសយដ្ឋានលំនាំដើមទំព័រគំរូមិនអាចត្រូវបានលុប
 DocType: Sales Invoice,Shipping Rule,វិធានការដឹកជញ្ជូន
 DocType: Manufacturer,Limited to 12 characters,កំណត់ទៅជា 12 តួអក្សរ
 DocType: Journal Entry,Print Heading,បោះពុម្ពក្បាល
@@ -2449,6 +2619,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Attach Letterhead,ភ្ជាប់ក្បាលលិខិត
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',មិនអាចធ្វើការកាត់កងនៅពេលដែលប្រភេទគឺសម្រាប់ &#39;វាយតម្លៃ&#39; ឬ &#39;វាយតម្លៃនិងសរុប
 apps/erpnext/erpnext/public/js/setup_wizard.js +214,"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.",រាយបញ្ជីក្បាលពន្ធរបស់អ្នក (ឧទាហរណ៍អាករលើតម្លៃបន្ថែមពន្ធគយលពួកគេគួរតែមានឈ្មោះតែមួយគត់) និងអត្រាការស្ដង់ដាររបស់ខ្លួន។ ការនេះនឹងបង្កើតគំរូស្តង់ដាដែលអ្នកអាចកែសម្រួលនិងបន្ថែមច្រើនទៀតនៅពេលក្រោយ។
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Nos ដែលត្រូវការសម្រាប់ធាតុសៀរៀលសៀរៀល {0}
 DocType: Journal Entry,Bank Entry,ចូលធនាគារ
 DocType: Authorization Rule,Applicable To (Designation),ដែលអាចអនុវត្តទៅ (រចនា)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,បញ្ចូលទៅក្នុងរទេះ
@@ -2459,16 +2630,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/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 +145,{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/public/js/setup_wizard.js +293,Hour,ហួរ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
+					using Stock Reconciliation",ធាតុសៀរៀល {0} មិនអាចត្រូវបានធ្វើឱ្យទាន់សម័យ \ ប្រើប្រាស់ហ៊ុនផ្សះផ្សា
 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/hr/doctype/leave_application/leave_application.py +110,You are not authorized to approve leaves on Block Dates,អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យអនុម័តស្លឹកនៅលើកាលបរិច្ឆេទប្លុក
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +353,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
 DocType: Features Setup,Point of Sale,ចំណុចនៃការលក់
 DocType: Account,Tax,ការបង់ពន្ធ
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},ជួរដេក {0} {1} គឺជាការមិនត្រឹមត្រូវ {2}
 DocType: Production Planning Tool,Production Planning Tool,ឧបករណ៍ផែនការផលិតកម្ម
 DocType: Quality Inspection,Report Date,របាយការណ៍ស្តីពីកាលបរិច្ឆេទ
 DocType: C-Form,Invoices,វិក័យប័ត្រ
@@ -2490,12 +2666,14 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,មិនមានអ្វីដើម្បីកែសម្រួលទេ។
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,សង្ខេបសម្រាប់ខែនេះនិងសកម្មភាពដែលមិនទាន់សម្រេច
 DocType: Customer Group,Customer Group Name,ឈ្មោះក្រុមអតិថិជន
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,Please remove this Invoice {0} from C-Form {1},សូមយកវិក័យប័ត្រនេះ {0} ពី C-សំណុំបែបបទ {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,សូមជ្រើសយកការទៅមុខផងដែរប្រសិនបើអ្នកចង់រួមបញ្ចូលតុល្យភាពឆ្នាំមុនសារពើពន្ធរបស់ទុកនឹងឆ្នាំសារពើពន្ធនេះ
 DocType: GL Entry,Against Voucher Type,ប្រឆាំងនឹងប្រភេទប័ណ្ណ
 DocType: Item,Attributes,គុណលក្ខណៈ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,ទទួលបានធាតុ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,សូមបញ្ចូលបិទសរសេរគណនី
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,លំដាប់ចុងក្រោយកាលបរិច្ឆេទ
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},គណនី {0} មិនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
 DocType: C-Form,C-Form,C-សំណុំបែបបទ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +144,Operation ID not set,លេខសម្គាល់ការប្រតិបត្ដិការមិនបានកំណត់
 DocType: Payment Request,Initiated,ផ្តួចផ្តើម
@@ -2508,7 +2686,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,ទិន្នន័យគម្រោងប្រាជ្ញាគឺមិនអាចប្រើបានសម្រាប់សម្រង់
 DocType: Project,Expected End Date,គេរំពឹងថានឹងកាលបរិច្ឆេទបញ្ចប់
 DocType: Appraisal Template,Appraisal Template Title,ការវាយតម្លៃទំព័រគំរូចំណងជើង
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,ពាណិជ្ជ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,សេវាសេវាល្អមែនទែន
@@ -2518,6 +2696,7 @@
 apps/erpnext/erpnext/config/accounts.py +138,Rules to calculate shipping amount for a sale,វិធានដើម្បីគណនាចំនួនដឹកជញ្ជូនសម្រាប់លក់
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,កម្រងឯកសារចាំបាច់
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,សេវាហិរញ្ញវត្ថុ
+apps/erpnext/erpnext/controllers/item_variant.py +62,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 +165,Warehouse required for stock Item {0},ឃ្លាំងដែលបានទាមទារសម្រាប់ធាតុភាគហ៊ុន {0}
@@ -2526,7 +2705,7 @@
 DocType: Customer,Default Receivable Accounts,លំនាំដើមគណនីអ្នកទទួល
 DocType: Tax Rule,Billing State,រដ្ឋវិក័យប័ត្រ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,សេវាផ្ទេរប្រាក់
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),យក Bom ផ្ទុះ (រួមបញ្ចូលទាំងសភាអនុ)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),យក Bom ផ្ទុះ (រួមបញ្ចូលទាំងសភាអនុ)
 DocType: Authorization Rule,Applicable To (Employee),ដែលអាចអនុវត្តទៅ (បុគ្គលិក)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,កាលបរិច្ឆេទដល់កំណត់គឺជាចាំបាច់
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,ចំនួនបន្ថែមសម្រាប់គុណលក្ខណៈ {0} មិនអាចជា 0
@@ -2538,8 +2717,10 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,តើធ្វើដូចម្តេចតម្លៃវិធានត្រូវបានអនុវត្ត?
 DocType: Quality Inspection,Delivery Note No,ដឹកជញ្ជូនចំណាំគ្មាន
 DocType: Company,Retail,ការលក់រាយ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,អតិថិជន {0} មិនមាន
 DocType: Attendance,Absent,អវត្តមាន
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +439,Product Bundle,កញ្ចប់ផលិតផល
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +186,Row {0}: Invalid reference {1},ជួរដេក {0}: សេចក្ដីយោងមិនត្រឹមត្រូវ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ទិញពន្ធនិងការចោទប្រកាន់ពីទំព័រគំរូ
 DocType: Upload Attendance,Download Template,ទំព័រគំរូទាញយក
 DocType: GL Entry,Remarks,សុន្ទរកថា
@@ -2557,7 +2738,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,អត្រាវាយតម្លៃអវិជ្ជមានមិនត្រូវបានអនុញ្ញាត
 DocType: Holiday List,Weekly Off,បិទប្រចាំសប្តាហ៍
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ឧទាហរណ៍ៈឆ្នាំ 2012, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),ប្រាក់ចំនេញជាបណ្តោះអាសន្ន / បាត់បង់ (ឥណទាន)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),ប្រាក់ចំនេញជាបណ្តោះអាសន្ន / បាត់បង់ (ឥណទាន)
 DocType: Sales Invoice,Return Against Sales Invoice,ការវិលត្រឡប់ពីការប្រឆាំងនឹងការលក់វិក័យប័ត្រ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,ធាតុ 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},សូមកំណត់តម្លៃលំនាំដើមនៅ {0} {1} ក្រុមហ៊ុន
@@ -2573,6 +2754,7 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,ការចូលរួមពីកាលបរិច្ឆេទនិងចូលរួមកាលបរិច្ឆេទគឺជាចាំបាច់
 apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,សូមបញ្ចូល &lt;តើកិច្ចសន្យាបន្ដ &#39;ជាបាទឬទេ
 DocType: Sales Team,Contact No.,លេខទំនាក់ទំនងទៅ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;ប្រាក់ចំណេញនិងការបាត់បង់ &#39;គណនីប្រភេទ {0} មិនត្រូវបានអនុញ្ញាតក្នុងការបើកចូល
 DocType: Features Setup,Sales Discounts,ការបញ្ចុះតម្លៃការលក់
 DocType: Hub Settings,Seller Country,អ្នកលក់ប្រទេស
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,បោះពុម្ពផ្សាយធាតុលើវេបសាយ
@@ -2587,6 +2769,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,បន្ថែមកុមារ
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,តួនាទីដែលត្រូវបានអនុញ្ញាតឱ្យកំណត់គណនីទឹកកកកែសម្រួលធាតុទឹកកក
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,មិនអាចបម្លែងទៅក្នុងសៀវភៅរបស់មជ្ឈមណ្ឌលដែលជាការចំនាយវាមានថ្នាំងរបស់កុមារ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,តម្លៃពិធីបើក
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,# សៀរៀល
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,គណៈកម្មការលើការលក់
 DocType: Offer Letter Term,Value / Description,គុណតម្លៃ / ការពិពណ៌នាសង្ខេប
@@ -2595,6 +2778,7 @@
 DocType: Production Order,Expected Delivery Date,គេរំពឹងថាការដឹកជញ្ជូនកាលបរិច្ឆេទ
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ឥណពន្ធនិងឥណទានមិនស្មើគ្នាសម្រាប់ {0} # {1} ។ ភាពខុសគ្នាគឺ {2} ។
 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 +191,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 ។
@@ -2613,12 +2797,12 @@
 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,ការវិភាគ
+apps/erpnext/erpnext/controllers/accounts_controller.py +257,Account: {0} with currency: {1} can not be selected,គណនី: {0} ដែលមានរូបិយប័ណ្ណ: {1} មិនអាចត្រូវបានជ្រើស &amp; ‧;
 DocType: Bank Reconciliation Detail,Cheque Date,កាលបរិច្ឆេទមូលប្បទានប័ត្រ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},គណនី {0}: គណនីមាតាបិតា {1} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,ទទួលបានជោគជ័យក្នុងការតិបត្តិការទាំងអស់ដែលបានលុបដែលទាក់ទងទៅនឹងក្រុមហ៊ុននេះ!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,ដូចជានៅលើកាលបរិច្ឆេទ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,ការសាកល្បង
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,ឃ្លាំងលំនាំដើមគឺចាំបាច់សម្រាប់ធាតុភាគហ៊ុន។
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},ការទូទាត់នៃប្រាក់ខែសម្រាប់ខែនេះ {0} និងឆ្នាំ {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,បញ្ចូលដោយស្វ័យប្រវត្តិប្រសិនបើអ្នកមានអត្រាតារាងតម្លៃបាត់ខ្លួន
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,ចំនួនទឹកប្រាក់ដែលបង់សរុប
@@ -2654,13 +2838,14 @@
 DocType: Payment Tool,Set Matching Amounts,កំណត់ចំនួនផ្គូផ្គង
 DocType: Purchase Invoice,Taxes and Charges Added,ពន្ធនិងការចោទប្រកាន់បន្ថែម
 ,Sales Funnel,ការប្រមូលផ្តុំការលក់
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,អក្សរកាត់គឺជាការចាំបាច់
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,អក្សរកាត់គឺជាការចាំបាច់
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,សូមអរគុណចំពោះការចាប់អារម្មណ៍របស់អ្នកក្នុងការធ្វើឱ្យទាន់សម័យជាវរបស់យើង
 ,Qty to Transfer,qty ដើម្បីផ្ទេរ
 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,ទឹកដីរបស់ធាតុគោលដៅអថេរ Group និងក្រុមហ៊ុនដែលមានប្រាជ្ញា
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,ក្រុមអតិថិជនទាំងអស់
+apps/erpnext/erpnext/controllers/accounts_controller.py +508,{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 +44,Account {0}: Parent account {1} does not exist,គណនី {0}: គណនីមាតាបិតា {1} មិនមាន
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),បញ្ជីតម្លៃដែលអត្រា (ក្រុមហ៊ុនរូបិយវត្ថុ)
@@ -2680,7 +2865,8 @@
 ,Item-wise Price List Rate,អត្រាតារាងតម្លៃធាតុប្រាជ្ញា
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,សម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់
 DocType: Quotation,In Words will be visible once you save the Quotation.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកការសម្រង់នេះ។
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},លេខកូដ {0} ត្រូវបានប្រើរួចហើយនៅក្នុងធាតុ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} គឺបានបញ្ឈប់
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,ព្រឹត្តិការណ៍ជិតមកដល់
@@ -2702,10 +2888,11 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,ជ្រើសឆ្នាំសារពើពន្ធ ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួនត្រូវបានទាមទារដើម្បីធ្វើឱ្យធាតុរបស់ម៉ាស៊ីនឆូតកាត
 DocType: Hub Settings,Name Token,ឈ្មោះនិមិត្តសញ្ញា
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,ស្តង់ដាលក់
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,ស្តង់ដាលក់
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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 +331,{0} against Sales Invoice {1},{0} ប្រឆាំងនឹងការលក់វិក័យប័ត្រ {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,សូមបញ្ចូលលំនាំដើមវិធានការអង្គភាព
 DocType: Purchase Invoice Item,Project Name,ឈ្មោះគម្រោង
 DocType: Supplier,Mention if non-standard receivable account,និយាយពីការប្រសិនបើគណនីដែលមិនមែនជាស្តង់ដាទទួល
@@ -2776,6 +2963,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,ជាមធ្យម។ អត្រាទិញ
 DocType: Task,Actual Time (in Hours),ពេលវេលាពិតប្រាកដ (នៅក្នុងម៉ោងធ្វើការ)
 DocType: Employee,History In Company,ប្រវត្តិសាស្រ្តនៅក្នុងក្រុមហ៊ុន
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +127,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},បរិមាណបញ្ហាសរុប / សេវាផ្ទេរប្រាក់ {0} ក្នុងសំណើសម្ភារៈ {1} មិនអាចច្រើនជាងបរិមាណដែលបានស្នើរសុំ {2} សម្រាប់ធាតុ {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,ព្រឹត្តិបត្រ
 DocType: Address,Shipping,ការដឹកជញ្ជូន
 DocType: Stock Ledger Entry,Stock Ledger Entry,ភាគហ៊ុនធាតុសៀវភៅ
@@ -2810,7 +2998,9 @@
 DocType: Account,Asset,ទ្រព្យសកម្ម
 DocType: Project Task,Task ID,ភារកិច្ចលេខសម្គាល់
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,"e.g. ""MC""",ឧទាហរណ៏ &quot;ពិធីករ&quot;
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,ភាគហ៊ុនមិនអាចមានសម្រាប់ធាតុ {0} តាំងពីមានវ៉ារ្យ៉ង់
 ,Sales Person-wise Transaction Summary,ការលក់បុគ្គលប្រាជ្ញាសង្ខេបប្រតិបត្តិការ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,ឃ្លាំង {0} មិនមាន
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ចុះឈ្មោះសម្រាប់ហាប់ ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,ចំនួនភាគរយចែកចាយប្រចាំខែ
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,ធាតុដែលបានជ្រើសមិនអាចមានជំនាន់ទី
@@ -2821,15 +3011,17 @@
 DocType: Sales Invoice,Paid Amount,ចំនួនទឹកប្រាក់ដែលបង់
 ,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,ការកំណត់អាសយដ្ឋានទំព័រគំរូជាលំនាំដើមនេះដូចជាមិនមានការលំនាំដើមផ្សេងទៀត
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,ការកំណត់អាសយដ្ឋានទំព័រគំរូជាលំនាំដើមនេះដូចជាមិនមានការលំនាំដើមផ្សេងទៀត
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","សមតុល្យគណនីរួចហើយនៅក្នុងឥណពន្ធ, អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់ទឹកប្រាក់ត្រូវតែ &quot;ជា&quot; ឥណទាន &quot;"
 apps/erpnext/erpnext/setup/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 +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/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,មានតុល្យភាព Qty
 DocType: Item Group,Parent Item Group,ធាតុមេគ្រុប
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1} សម្រាប់
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,មជ្ឈមណ្ឌលការចំណាយ
 apps/erpnext/erpnext/config/stock.py +110,Warehouses.,ឃ្លាំង។
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,អត្រារូបិយប័ណ្ណក្រុមហ៊ុនផ្គត់ផ្គង់ដែលត្រូវបានបម្លែងទៅជារូបិយប័ណ្ណមូលដ្ឋានរបស់ក្រុមហ៊ុន
@@ -2881,6 +3073,7 @@
 apps/erpnext/erpnext/setup/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: Account,Receivable,អ្នកទទួល
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +264,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 សម្រាប់ធាតុការជួបប្រជុំថ្នាក់ក្រោមនឹងត្រូវបានចាត់ទុកថាជាសម្រាប់ការទទួលវត្ថុធាតុដើម។ បើមិនដូច្នោះទេ, ធាតុទាំងអស់ដែលរងការជួបប្រជុំគ្នានេះនឹងត្រូវបានចាត់ទុកជាវត្ថុធាតុដើម។"
@@ -2898,11 +3091,14 @@
 DocType: BOM,Rate Of Materials Based On,អត្រានៃសម្ភារៈមូលដ្ឋាននៅលើ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,ការគាំទ្រ Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,ដោះធីកទាំងអស់
+apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},ក្រុមហ៊ុនត្រូវបានបាត់នៅក្នុងឃ្លាំង {0}
 DocType: POS Profile,Terms and Conditions,លក្ខខណ្ឌ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},ដើម្បីកាលបរិច្ឆេទគួរតែនៅចន្លោះឆ្នាំសារពើពន្ធ។ សន្មត់ថាដើម្បីកាលបរិច្ឆេទ = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","នៅទីនេះអ្នកអាចរក្សាកម្ពស់, ទម្ងន់, អាឡែស៊ី, មានការព្រួយបារម្ភវេជ្ជសាស្រ្តល"
 DocType: Leave Block List,Applies to Company,អនុវត្តទៅក្រុមហ៊ុន
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,មិនអាចលុបចោលដោយសារតែការដាក់ស្នើផ្សារការធាតុមាន {0}
 DocType: Purchase Invoice,In Words,នៅក្នុងពាក្យ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +213,Today is {0}'s birthday!,ថ្ងៃនេះគឺជា {0} &#39;s បានថ្ងៃខួបកំណើត!
 DocType: Production Planning Tool,Material Request For Warehouse,សម្ភារៈស្នើសុំសម្រាប់ឃ្លាំង
 DocType: Sales Order Item,For Production,ចំពោះផលិតកម្ម
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,សូមបញ្ចូលគោលបំណងលក់នៅក្នុងតារាងខាងលើ
@@ -2916,6 +3112,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",ដើម្បីកំណត់ឆ្នាំសារពើពន្ធនេះជាលំនាំដើមសូមចុចលើ &quot;កំណត់ជាលំនាំដើម &#39;
 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 +19,Shortage Qty,កង្វះខាត Qty
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,វ៉ារ្យ៉ង់ធាតុ {0} មានដែលមានគុណលក្ខណៈដូចគ្នា
 DocType: Salary Slip,Salary Slip,ប្រាក់បៀវត្សគ្រូពេទ្យប្រហែលជា
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;ដើម្បីកាលបរិច្ឆេទ&#39; ត្រូវបានទាមទារ
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",បង្កើតវេចខ្ចប់គ្រូពេទ្យប្រហែលជាសម្រាប់កញ្ចប់ត្រូវបានបញ្ជូន។ ត្រូវបានប្រើដើម្បីជូនដំណឹងដល់ចំនួនដែលកញ្ចប់មាតិកាកញ្ចប់និងទំងន់របស់ខ្លួន។
@@ -2926,9 +3123,10 @@
 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.",នៅពេលណាដែលប្រតិបត្តិការដែលបានធីកត្រូវបាន &quot;ផ្តល់ជូន&quot; ដែលជាការលេចឡើងអ៊ីម៉ែលដែលបានបើកដោយស្វ័យប្រវត្តិដើម្បីផ្ញើអ៊ីមែលទៅជាប់ទាក់ទង &quot;ទំនាក់ទំនង&quot; នៅក្នុងប្រតិបត្តិការនោះដោយមានប្រតិបត្តិការជាមួយការភ្ជាប់នេះ។ អ្នកប្រើដែលអាចឬមិនអាចផ្ញើអ៊ីមែល។
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,ការកំណត់សកល
 DocType: Employee Education,Employee Education,បុគ្គលិកអប់រំ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,វាត្រូវបានគេត្រូវការដើម្បីទៅយកលំអិតធាតុ។
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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} គ្មានត្រូវបានទទួលរួចហើយ
 ,Requested Items To Be Transferred,ធាតុដែលបានស្នើសុំឱ្យគេបញ្ជូន
 DocType: Purchase Invoice,Recurring Id,លេខសម្គាល់កើតឡើង
 DocType: Customer,Sales Team Details,ពត៌មានលំអិតការលក់ក្រុមការងារ
@@ -2951,6 +3149,7 @@
 DocType: BOM,Manufacturing User,អ្នកប្រើប្រាស់កម្មន្តសាល
 DocType: Purchase Order,Raw Materials Supplied,វត្ថុធាតុដើមដែលសហការី
 DocType: Purchase Invoice,Recurring Print Format,កើតឡើងទ្រង់ទ្រាយបោះពុម្ព
+DocType: C-Form,Series,កម្រងឯកសារ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,គេរំពឹងថាការដឹកជញ្ជូនមិនអាចកាលបរិច្ឆេទត្រូវតែមុនពេលការទិញលំដាប់កាលបរិច្ឆេទ
 DocType: Appraisal,Appraisal Template,ការវាយតម្លៃទំព័រគំរូ
 DocType: Item Group,Item Classification,ចំណាត់ថ្នាក់ធាតុ
@@ -2996,6 +3195,7 @@
 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}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Warehouse is mandatory,ឃ្លាំងគឺជាការចាំបាច់
 DocType: Supplier,Address and Contacts,អាសយដ្ឋាននិងទំនាក់ទំនង
 DocType: UOM Conversion Detail,UOM Conversion Detail,ពត៌មាននៃការប្រែចិត្តជឿ UOM
@@ -3020,17 +3220,20 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +31,Transaction currency must be same as Payment Gateway currency,រូបិយប័ណ្ណប្រតិបត្តិការត្រូវតែមានដូចគ្នាជារូបិយប័ណ្ណទូទាត់
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,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 +420,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.",មិនអាចប្រកាសបាត់បង់នោះទេព្រោះសម្រង់ត្រូវបានធ្វើឡើង។
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ការទិញកម្មវិធីគ្រប់គ្រងអនុបណ្ឌិត
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,ផលិតកម្មលំដាប់ {0} ត្រូវតែត្រូវបានដាក់ជូន
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},សូមជ្រើសរើសកាលបរិច្ឆេទចាប់ផ្ដើមនិងកាលបរិច្ឆេទបញ្ចប់សម្រាប់ធាតុ {0}
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,របាយការណ៏ដ៏សំខាន់
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ដើម្បីកាលបរិច្ឆេទមិនអាចមានមុនពេលចេញពីកាលបរិច្ឆេទ
 DocType: Purchase Receipt Item,Prevdoc DocType,ចង្អុលបង្ហាញ Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,បន្ថែម / កែសម្រួលតម្លៃទំនិញ
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,ការបញ្ជាទិញរបស់ខ្ញុំ
@@ -3064,30 +3267,35 @@
 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 +273,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 +143,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/public/js/setup_wizard.js +255,Your Suppliers,អ្នកផ្គត់ផ្គង់របស់អ្នក
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Cannot set as Lost as Sales Order is made.,មិនអាចបាត់បង់ដូចដែលបានកំណត់ជាលំដាប់ត្រូវបានធ្វើឱ្យការលក់រថយន្ត។
+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.,រចនាសម្ព័ន្ធប្រាក់ខែមួយទៀត {0} គឺសកម្មសម្រាប់បុគ្គលិក {1} ។ សូមធ្វើឱ្យស្ថានភាពរបស់ខ្លួនអសកម្ម &#39;ដើម្បីដំណើរការ។
 DocType: Purchase Invoice,Contact,ការទំនាក់ទំនង
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,ទទួលបានពី
 DocType: Features Setup,Exports,ការនាំចេញ
 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 +150,Row #{0}: Set Supplier for item {1},ជួរដេក # {0}: កំណត់ផ្គត់ផ្គង់សម្រាប់ធាតុ {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,គេហទំព័ររូបភាព {0} បានភ្ជាប់ទៅនឹងធាតុ {1} មិនអាចត្រូវបានរកឃើញ
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,គេហទំព័ររូបភាព {0} បានភ្ជាប់ទៅនឹងធាតុ {1} មិនអាចត្រូវបានរកឃើញ
 DocType: Issue,Content Type,ប្រភេទមាតិការ
 apps/erpnext/erpnext/setup/setup_wizard/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 +297,Please check Multi Currency option to allow accounts with other currency,សូមពិនិត្យមើលជម្រើសរូបិយវត្ថុពហុដើម្បីអនុញ្ញាតឱ្យគណនីជារូបិយប័ណ្ណផ្សេងទៀត
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,Item: {0} does not exist in the system,ធាតុ: {0} មិនមាននៅក្នុងប្រព័ន្ធ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់តម្លៃទឹកកក
 DocType: Payment Reconciliation,Get Unreconciled Entries,ទទួលបានធាតុ Unreconciled
 DocType: Payment Reconciliation,From Invoice Date,ចាប់ពីកាលបរិច្ឆេទវិក័យប័ត្រ
 DocType: Cost Center,Budgets,ថវិកា
 apps/erpnext/erpnext/public/js/setup_wizard.js +56,What does it do?,តើធ្វើដូចម្ដេច?
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,&#39;មិនមានមិនសៀរៀល&#39; មិនអាចក្លាយជា &#39;បាទ&#39; សម្រាប់ធាតុដែលមិនមែនជាភាគហ៊ុន-
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,&#39;មិនមានមិនសៀរៀល&#39; មិនអាចក្លាយជា &#39;បាទ&#39; សម្រាប់ធាតុដែលមិនមែនជាភាគហ៊ុន-
 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,នាយកគណនី
@@ -3098,18 +3306,22 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},លេខសម្គាល់អ្នកប្រើដែលមិនបានកំណត់សម្រាប់បុគ្គលិក {0}
 DocType: Stock Entry,Default Source Warehouse,លំនាំដើមឃ្លាំងប្រភព
 DocType: Item,Customer Code,លេខកូដអតិថិជន
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},កម្មវិធីរំលឹកខួបកំណើតសម្រាប់ {0}
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,ថ្ងៃចាប់ពីលំដាប់ចុងក្រោយ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Balance Sheet account,ឥណពន្ធវីសាទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
 DocType: Buying Settings,Naming Series,ដាក់ឈ្មោះកម្រងឯកសារ
 DocType: Leave Block List,Leave Block List Name,ទុកឱ្យឈ្មោះបញ្ជីប្លុក
 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 +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,វិក័យប័ត្រការលក់សារ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,គណនី {0} បិទត្រូវតែមានប្រភេទបំណុល / សមភាព
 DocType: Authorization Rule,Based On,ដោយផ្អែកលើការ
 DocType: Sales Order Item,Ordered Qty,បានបញ្ជាឱ្យ Qty
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,ធាតុ {0} ត្រូវបានបិទ
 DocType: Stock Settings,Stock Frozen Upto,រីករាយជាមួយនឹងផ្សារភាគហ៊ុនទឹកកក
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},រយៈពេលចាប់ពីនិងរយៈពេលដើម្បីកាលបរិច្ឆេទចាំបាច់សម្រាប់កើតឡើង {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,សកម្មភាពរបស់គម្រោង / ភារកិច្ច។
@@ -3117,8 +3329,9 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",ទិញត្រូវតែត្រូវបានធីកបើកម្មវិធីសម្រាប់ការត្រូវបានជ្រើសរើសជា {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ការបញ្ចុះតម្លៃត្រូវតែមានតិចជាង 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),បិទការសរសេរចំនួនទឹកប្រាក់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,ជួរដេក # {0}: សូមកំណត់បរិមាណតម្រៀបឡើងវិញ
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,ជួរដេក # {0}: សូមកំណត់បរិមាណតម្រៀបឡើងវិញ
 DocType: Landed Cost Voucher,Landed Cost Voucher,ប័ណ្ណតម្លៃដែលបានចុះចត
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},សូមកំណត់ {0}
 DocType: Purchase Invoice,Repeat on Day of Month,ធ្វើម្តងទៀតនៅថ្ងៃនៃខែ
 DocType: Employee,Health Details,ពត៌មានលំអិតសុខភាព
 DocType: Offer Letter,Offer Letter Terms,ផ្តល់ជូននូវលក្ខខណ្ឌលិខិត
@@ -3128,6 +3341,7 @@
 DocType: Employee External Work History,Salary,ប្រាក់បៀវត្ស
 DocType: Serial No,Delivery Document Type,ដឹកជញ្ជូនប្រភេទឯកសារ
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,ដាក់ស្នើគ្រូពេទ្យប្រហែលជាបានប្រាក់ខែទាំងអស់សម្រាប់លក្ខណៈវិនិច្ឆ័យដែលបានជ្រើសខាងលើ
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} ធាតុដែលបានធ្វើសមកាលកម្ម
 DocType: Sales Order,Partly Delivered,ផ្តល់មួយផ្នែក
 DocType: Sales Invoice,Existing Customer,អតិថិជនដែលមានស្រាប់
 DocType: Email Digest,Receivables,អ្នកទទួល
@@ -3138,6 +3352,7 @@
 DocType: Maintenance Visit,Maintenance Date,ថែទាំកាលបរិច្ឆេទ
 DocType: Purchase Receipt Item,Rejected Serial No,គ្មានសៀរៀលច្រានចោល
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,ព្រឹត្តិប័ត្រព័ត៌មានថ្មីមួយ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},កាលបរិច្ឆេទចាប់ផ្ដើមគួរតែតិចជាងកាលបរិច្ឆេទចុងក្រោយសម្រាប់ធាតុ {0}
 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.","ឧទាហរណ៍: ។ ABCD ##### ប្រសិនបើមានស៊េរីត្រូវបានកំណត់និងគ្មានសៀរៀលមិនត្រូវបានរៀបរាប់នៅក្នុងប្រតិបត្តិការ, លេខសម្គាល់បន្ទាប់មកដោយស្វ័យប្រវត្តិនឹងត្រូវបានបង្កើតដោយផ្អែកលើស៊េរីនេះ។ ប្រសិនបើអ្នកតែងតែចង់និយាយឱ្យបានច្បាស់សៀរៀល Nos សម្រាប់ធាតុនេះ។ ទុកឱ្យវាទទេ។"
 DocType: Upload Attendance,Upload Attendance,វត្តមានផ្ទុកឡើង
@@ -3162,6 +3377,7 @@
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,បេក្ខជនផ្ដល់ការងារ។
 DocType: Notification Control,Prompt for Email on Submission of,ប្រអប់បញ្ចូលអ៊ីមែលនៅលើការដាក់
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,ស្លឹកដែលបានបម្រុងទុកសរុបគឺមានច្រើនជាងថ្ងៃក្នុងអំឡុងពេលនេះ
+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,ការងារលំនាំដើមនៅក្នុងឃ្លាំងវឌ្ឍនភាព
 apps/erpnext/erpnext/config/accounts.py +117,Default settings for accounting transactions.,ការកំណត់លំនាំដើមសម្រាប់ប្រតិបត្តិការគណនេយ្យ។
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +58,Expected Date cannot be before Material Request Date,កាលបរិច្ឆេទគេរំពឹងថានឹងមិនអាចមានមុនពេលដែលកាលបរិច្ឆេទនៃសំណើសុំសម្ភារៈ
@@ -3173,6 +3389,7 @@
 DocType: Sales Order Item,Produced Quantity,បរិមាណដែលបានផលិត
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,វិស្វករ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,សភាអនុស្វែងរក
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Item Code required at Row No {0},កូដធាតុបានទាមទារនៅជួរដេកគ្មាន {0}
 DocType: Sales Partner,Partner Type,ប្រភេទជាដៃគូ
 DocType: Purchase Taxes and Charges,Actual,ពិតប្រាកដ
 DocType: Authorization Rule,Customerwise Discount,Customerwise បញ្ចុះតំលៃ
@@ -3184,7 +3401,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,មើលឥឡូវ
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,ជ្រើសអំឡុងពេលដែលវិក័យប័ត្រដែលនឹងត្រូវបានបង្កើតដោយស្វ័យប្រវត្តិ
 DocType: BOM,Raw Material Cost,វត្ថុធាតុដើមដែលការចំណាយ
-DocType: Item,Re-Order Level,ដីកាសម្រេចកម្រិតឡើងវិញ
+DocType: Item Reorder,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 ដែលអ្នកចង់បានដើម្បីបង្កើនការបញ្ជាទិញផលិតផលឬទាញយកវត្ថុធាតុដើមសម្រាប់ការវិភាគ។
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,ពេញម៉ោង
 DocType: Employee,Applicable Holiday List,បញ្ជីថ្ងៃឈប់សម្រាកដែលអាចអនុវត្តបាន
@@ -3239,8 +3456,10 @@
 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 +559,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}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,សូមបញ្ចូលមជ្ឈមណ្ឌលចំណាយឪពុកម្តាយ
 DocType: Delivery Note,Print Without Amount,បោះពុម្ពដោយគ្មានការចំនួនទឹកប្រាក់
 apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,ប្រភេទពន្ធលើមិនអាចជា &quot;វាយតម្លៃ &#39;ឬ&#39; វាយតម្លៃនិងសរុប &#39;ជាធាតុទាំងអស់នេះគឺជាធាតុដែលមិនមានភាគហ៊ុន
@@ -3285,15 +3504,18 @@
 DocType: Sales Invoice,Rounded Total (Company Currency),សរុបមូល (ក្រុមហ៊ុនរូបិយវត្ថុ)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +95,Cannot covert to Group because Account Type is selected.,មិនអាចសម្ងាត់មួយដើម្បីពូលដោយសារតែប្រភេទគណនីត្រូវបានជ្រើស។
 DocType: Purchase Common,Purchase Common,ទិញទូទៅ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +94,{0} {1} has been modified. Please refresh.,{0} {1} បានកែប្រែទេ។ សូមផ្ទុកឡើងវិញ។
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,បញ្ឈប់ការរបស់អ្នកប្រើពីការធ្វើឱ្យកម្មវិធីដែលបានចាកចេញនៅថ្ងៃបន្ទាប់។
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,អត្ថប្រយោជន៍បុគ្គលិក
 DocType: Sales Invoice,Is POS,តើមានម៉ាស៊ីនឆូតកាត
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Packed quantity must equal quantity for Item {0} in row {1},បរិមាណបរិមាណស្មើនឹងត្រូវ packed សម្រាប់ធាតុ {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.,វិក័យប័ត្របានលើកឡើងដល់អតិថិជន។
 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 +491,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""",កំណត់ថវិកាសម្រាប់មជ្ឈមណ្ឌលតម្លៃនេះ។ ដើម្បីកំណត់សកម្មភាពជាថវិកាបានមើលឃើញថា &quot;ក្រុមហ៊ុនបញ្ជី&quot;
 DocType: Account,Parent Account,គណនីមាតាឬបិតា
@@ -3305,6 +3527,7 @@
 DocType: Pricing Rule,Price,តំលៃលក់
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +99,Employee relieved on {0} must be set as 'Left',បុគ្គលិកធូរស្រាលនៅលើ {0} ត្រូវតែត្រូវបានកំណត់ជា &quot;ឆ្វេង&quot;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",ជ្រើស &quot;បាទ&quot; នឹងផ្តល់ឱ្យអត្តសញ្ញាណតែមួយគត់ដើម្បីឱ្យអង្គភាពគ្នានៃធាតុដែលអាចត្រូវបានមើលនៅក្នុងស៊េរីចៅហ្វាយគ្មាននេះ។
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,ការវាយតម្លៃ {0} បានបង្កើតឡើងសម្រាប់បុគ្គលិក {1} នៅក្នុងជួរកាលបរិច្ឆេទដែលបានផ្ដល់
 DocType: Employee,Education,ការអប់រំ
 DocType: Selling Settings,Campaign Naming By,ដាក់ឈ្មោះការឃោសនាដោយ
 DocType: Employee,Current Address Is,អាសយដ្ឋានបច្ចុប្បន្នគឺ
@@ -3312,7 +3535,8 @@
 DocType: Address,Office,ការិយាល័យ
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,ធាតុទិនានុប្បវត្តិគណនេយ្យ។
 DocType: Delivery Note Item,Available Qty at From Warehouse,ដែលអាចប្រើបាននៅពីឃ្លាំង Qty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,សូមជ្រើសរើសបុគ្គលិកកំណត់ត្រាដំបូង។
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,សូមជ្រើសរើសបុគ្គលិកកំណត់ត្រាដំបូង។
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,សូមបញ្ចូលចំណាយតាមគណនី
 DocType: Account,Stock,ភាគហ៊ុន
@@ -3342,6 +3566,7 @@
 DocType: Hub Settings,Hub Settings,ការកំណត់ហាប់
 DocType: Project,Gross Margin %,រឹម% សរុបបាន
 DocType: BOM,With Operations,ជាមួយនឹងការប្រតិបត្ដិការ
+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,ប្រចាំខែប្រាក់ខែចុះឈ្មោះ
 DocType: Warranty Claim,If different than customer address,បើសិនជាខុសគ្នាជាងអាសយដ្ឋានអតិថិជន
 DocType: BOM Operation,BOM Operation,Bom ប្រតិបត្តិការ
@@ -3350,8 +3575,10 @@
 DocType: POS Profile,POS Profile,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួន
 DocType: Payment Gateway Account,Payment URL Message,សាររបស់ URL ដែលការទូទាត់
 apps/erpnext/erpnext/config/accounts.py +163,"Seasonality for setting budgets, targets etc.",រដូវកាលសម្រាប់ការកំណត់ថវិកាគោលដៅល
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,ជួរដេក {0}: ចំនួនទឹកប្រាក់ទូទាត់មិនអាចត្រូវបានធំជាងចំនួនទឹកប្រាក់ឆ្នើម
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +66,Total Unpaid,សរុបគ្មានប្រាក់ខែ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,កំណត់ហេតុពេលវេលាគឺមិន billable
+apps/erpnext/erpnext/stock/get_item_details.py +118,"Item {0} is a template, please select one of its variants",ធាតុ {0} គឺពុម្ពមួយសូមជ្រើសមួយក្នុងចំណោមវ៉ារ្យ៉ង់របស់ខ្លួន
 apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,អ្នកទិញ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,ប្រាក់ខែសុទ្ធមិនអាចជាអវិជ្ជមាន
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +109,Please enter the Against Vouchers manually,សូមបញ្ចូលប័ណ្ណដោយដៃប្រឆាំងនឹង
@@ -3383,7 +3610,7 @@
 DocType: Item Attribute,Numeric Values,តម្លៃជាលេខ
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,ភ្ជាប់រូបសញ្ញា
 DocType: Customer,Commission Rate,អត្រាប្រាក់កំរៃ
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,ធ្វើឱ្យវ៉ារ្យង់
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,ធ្វើឱ្យវ៉ារ្យង់
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,កម្មវិធីដែលបានឈប់សម្រាកប្លុកដោយនាយកដ្ឋាន។
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,រទេះទទេ
 DocType: Production Order,Actual Operating Cost,ការចំណាយប្រតិបត្តិការបានពិតប្រាកដ
@@ -3399,24 +3626,26 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,អ្នករចនា
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,លក្ខខណ្ឌទំព័រគំរូ
 DocType: Serial No,Delivery Details,ពត៌មានលំអិតដឹកជញ្ជូន
-DocType: Item,Automatically create Material Request if quantity falls below this level,បង្កើតសម្ភារៈស្នើសុំដោយស្វ័យប្រវត្តិបើបរិមាណធ្លាក់នៅក្រោមកម្រិតនេះ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},មជ្ឈមណ្ឌលការចំណាយគឺត្រូវបានទាមទារនៅក្នុងជួរដេក {0} នៅក្នុងពន្ធតារាងសម្រាប់ប្រភេទ {1}
 ,Item-wise Purchase Register,ចុះឈ្មោះទិញធាតុប្រាជ្ញា
 DocType: Batch,Expiry Date,កាលបរិច្ឆេទផុតកំណត់
-apps/erpnext/erpnext/stock/doctype/item/item.py +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item",ដើម្បីកំណត់កម្រិតការរៀបចំធាតុត្រូវតែជាធាតុទិញឬធាតុកម្មន្តសាល
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),(ពាក់កណ្តាលថ្ងៃ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(ពាក់កណ្តាលថ្ងៃ)
 DocType: Supplier,Credit Days,ថ្ងៃឥណទាន
 DocType: Leave Type,Is Carry Forward,គឺត្រូវបានអនុវត្តទៅមុខ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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,វិក័យប័ត្រនៃសម្ភារៈ
+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}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,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 +170,Row {0}: Debit entry can not be linked with a {1},ជួរដេក {0}: ធាតុឥណពន្ធមិនអាចត្រូវបានផ្សារភ្ជាប់ទៅនឹងការ {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,គណនី {0} មិនមាន
 DocType: Account,Cash,ជាសាច់ប្រាក់
 DocType: Employee,Short biography for website and other publications.,ប្រវត្ដិរូបខ្លីសម្រាប់គេហទំព័រនិងសៀវភៅផ្សេងទៀត។
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index 2e43609..a28a1e8 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% ಖ್ಯಾತವಾದ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),ವಿನಿಮಯ ದರ ಅದೇ ಇರಬೇಕು {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ಗ್ರಾಹಕ ಹೆಸರು
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},ಬ್ಯಾಂಕ್ ಖಾತೆಯಿಂದ ಹೆಸರಿನ ಸಾಧ್ಯವಿಲ್ಲ {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},ಬ್ಯಾಂಕ್ ಖಾತೆಯಿಂದ ಹೆಸರಿನ ಸಾಧ್ಯವಿಲ್ಲ {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),ಮಹೋನ್ನತ {0} ಕಡಿಮೆ ಶೂನ್ಯ ಸಾಧ್ಯವಿಲ್ಲ ( {1} )
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,ಹೊಸ ರಜೆ ಅಪ್ಲಿಕೇಶನ್
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,ಹೊಸ ರಜೆ ಅಪ್ಲಿಕೇಶನ್
 apps/erpnext/erpnext/setup/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,ಪಾವತಿ ಖಾತೆಯಿಂದ ಮೋಡ್
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","ಚಟುವಟಿಕೆಗಳು ಲಾಗ್, ಬಿಲ್ಲಿಂಗ್ ಸಮಯ ಟ್ರ್ಯಾಕ್ ಬಳಸಬಹುದಾದ ಕಾರ್ಯಗಳು ಬಳಕೆದಾರರ ನಡೆಸಿದ."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},ಹೊಸ {0}: # {1}
 ,Sales Partners Commission,ಮಾರಾಟದ ಪಾರ್ಟ್ನರ್ಸ್ ಆಯೋಗ
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,ಸಂಕ್ಷೇಪಣ ಹೆಚ್ಚು 5 ಪಾತ್ರಗಳು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,ಸಂಕ್ಷೇಪಣ ಹೆಚ್ಚು 5 ಪಾತ್ರಗಳು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Payment Request,Payment Request,ಪಾವತಿ ವಿನಂತಿ
 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.",ಮೌಲ್ಯ {0} {1} ಐಟಂ ಎಂದು ಮಾರ್ಪಾಟುಗಳು \ ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ ಸಾಧ್ಯವಿಲ್ಲ ಕಾರಣವಾಗಿದ್ದು ಈ ತಳಿಗೆ ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ.
@@ -196,6 +196,7 @@
 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 (%),ದರ ಪಟ್ಟಿ ದರ ರಿಯಾಯಿತಿ (%)
 DocType: Offer Letter,Select Terms and Conditions,ಆಯ್ಕೆ ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,ಔಟ್ ಮೌಲ್ಯ
 DocType: Production Planning Tool,Sales Orders,ಮಾರಾಟ ಆದೇಶಗಳಿಗೆ
 DocType: Purchase Taxes and Charges,Valuation,ಬೆಲೆಕಟ್ಟುವಿಕೆ
 ,Purchase Order Trends,ಆರ್ಡರ್ ಟ್ರೆಂಡ್ಸ್ ಖರೀದಿಸಿ
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,ಟೆಲಿವಿಷನ್
 DocType: Production Order Operation,Updated via 'Time Log','ಟೈಮ್ ಲಾಗ್' ಮೂಲಕ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},ಖಾತೆ {0} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},ಅಡ್ವಾನ್ಸ್ ಪ್ರಮಾಣವನ್ನು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {0} {1}
 DocType: Naming Series,Series List for this Transaction,ಈ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಸರಣಿ ಪಟ್ಟಿ
 DocType: Sales Invoice,Is Opening Entry,ಎಂಟ್ರಿ ಆರಂಭ
 DocType: Customer Group,Mention if non-standard receivable account applicable,ಬಗ್ಗೆ ಸ್ಟಾಂಡರ್ಡ್ ಅಲ್ಲದ ಸ್ವೀಕೃತಿ ಖಾತೆಯನ್ನು ಅನ್ವಯಿಸಿದರೆ
@@ -227,7 +229,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,ಮೇಲೆ ತಿಳಿಸಿದ ಮಾನದಂಡಗಳನ್ನು ಸಂಬಳ ಸ್ಲಿಪ್ ರಚಿಸುತ್ತದೆ .
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,ಯಾವುದೇ ವಿವರಣೆ givenName
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ಖರೀದಿ ವಿನಂತಿ .
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,ಕೇವಲ ಆಯ್ದ ಲೀವ್ ಅನುಮೋದಕ ಈ ರಜೆ ಅಪ್ಲಿಕೇಶನ್ ಸಲ್ಲಿಸಬಹುದು
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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} ಸೆಟಪ್&gt; ಸೆಟ್ಟಿಂಗ್ಗಳು ಮೂಲಕ&gt; ಹೆಸರಿಸುವ ಸರಣಿಯ ಸರಣಿ ಹೆಸರಿಸುವ ಹೊಂದಿಸಿ
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},ವೇರ್ಹೌಸ್ {0} ಸೇರುವುದಿಲ್ಲ ಕಂಪನಿ {1}
 DocType: Item Website Specification,Item Website Specification,ವಸ್ತು ವಿಶೇಷತೆಗಳು ವೆಬ್ಸೈಟ್
 DocType: Payment Tool,Reference No,ಉಲ್ಲೇಖ ಯಾವುದೇ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,ಬಿಡಿ ನಿರ್ಬಂಧಿಸಿದ
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,ಬಿಡಿ ನಿರ್ಬಂಧಿಸಿದ
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,ವಾರ್ಷಿಕ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಐಟಂ
 DocType: Stock Entry,Sales Invoice No,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ನಂ
@@ -249,7 +251,7 @@
 DocType: Pricing Rule,Supplier Type,ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ
 DocType: Item,Publish in Hub,ಹಬ್ ಪ್ರಕಟಿಸಿ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 DocType: Bank Reconciliation,Update Clearance Date,ಅಪ್ಡೇಟ್ ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ
 DocType: Item,Purchase Details,ಖರೀದಿ ವಿವರಗಳು
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,ತೆರಿಗೆಗಳು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,ನೀವು ಹೊರಹಾಕಿದ ನಂತರ ಪಾವತಿ ಎಂಟ್ರಿ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ. ಮತ್ತೆ ಎಳೆಯಲು ದಯವಿಟ್ಟು.
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} ಐಟಂ ತೆರಿಗೆ ಎರಡು ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,ತಿಂಗಳು ವರ್ಷದ ಆಯ್ಕೆಮಾಡಿ
@@ -329,7 +331,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,ನಿಮ್ಮ ಈಮೇಲ್ ವಿಳಾಸ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,ಬಾಂಧವ್ಯ ನೋಡಿ
 DocType: Purchase Order,% Received,% ಸ್ವೀಕರಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,ಈಗಾಗಲೇ ಸೆಟಪ್ ಪೂರ್ಣಗೊಳಿಸಲು!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,ಈಗಾಗಲೇ ಸೆಟಪ್ ಪೂರ್ಣಗೊಳಿಸಲು!
 ,Finished Goods,ಪೂರ್ಣಗೊಂಡ ಸರಕನ್ನು
 DocType: Delivery Note,Instructions,ಸೂಚನೆಗಳು
 DocType: Quality Inspection,Inspected By,ಪರಿಶೀಲನೆ
@@ -354,14 +356,13 @@
 ,Purchase Register,ಖರೀದಿ ನೋಂದಣಿ
 DocType: Landed Cost Item,Applicable Charges,ಅನ್ವಯಿಸುವ ಆರೋಪಗಳನ್ನು
 DocType: Workstation,Consumable Cost,ಉಪಭೋಗ್ಯ ವೆಚ್ಚ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ಪಾತ್ರ ಹೊಂದಿರಬೇಕು 'ಬಿಡಿ ಅನುಮೋದಕ'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ಪಾತ್ರ ಹೊಂದಿರಬೇಕು 'ಬಿಡಿ ಅನುಮೋದಕ'
 DocType: Purchase Receipt,Vehicle Date,ವಾಹನ ದಿನಾಂಕ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,ವೈದ್ಯಕೀಯ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,ಸೋತ ಕಾರಣ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},ಕಾರ್ಯಸ್ಥಳ ಹಾಲಿಡೇ ಪಟ್ಟಿ ಪ್ರಕಾರ ಕೆಳಗಿನ ದಿನಾಂಕಗಳಂದು ಮುಚ್ಚಲಾಗಿದೆ: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,ಅವಕಾಶಗಳು
 DocType: Employee,Single,ಏಕೈಕ
-DocType: Issue,Attachment,ಲಗತ್ತು
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,ಬಜೆಟ್ ಗ್ರೂಪ್ ವೆಚ್ಚ ಸೆಂಟರ್ ಹೊಂದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Account,Cost of Goods Sold,ಮಾರಿದ ವಸ್ತುಗಳ ಬೆಲೆ
 DocType: Purchase Invoice,Yearly,ವಾರ್ಷಿಕ
@@ -390,7 +391,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,ಗುಣಲಕ್ಷಣ {0} ಗುಣಲಕ್ಷಣಗಳು ಟೇಬಲ್ ಅನೇಕ ಬಾರಿ ಆಯ್ಕೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,ಗುಣಲಕ್ಷಣ {0} ಗುಣಲಕ್ಷಣಗಳು ಟೇಬಲ್ ಅನೇಕ ಬಾರಿ ಆಯ್ಕೆ
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,ಅನ್ವಯಿಸುವುದಿಲ್ಲ
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,ಹಾಲಿಡೇ ಮಾಸ್ಟರ್ .
@@ -429,7 +430,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,ಕಾಸ್ಮೆಟಿಕ್ಸ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items","ವಿಲೀನಗೊಳ್ಳಲು , ನಂತರ ಲಕ್ಷಣಗಳು ಐಟಂಗಳನ್ನು ಸಾಮಾನ್ಯ ಇರಬೇಕು"
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","ವಿಲೀನಗೊಳ್ಳಲು , ನಂತರ ಲಕ್ಷಣಗಳು ಐಟಂಗಳನ್ನು ಸಾಮಾನ್ಯ ಇರಬೇಕು"
 DocType: Shipping Rule,Net Weight,ನೆಟ್ ತೂಕ
 DocType: Employee,Emergency Phone,ತುರ್ತು ದೂರವಾಣಿ
 ,Serial No Warranty Expiry,ಸೀರಿಯಲ್ ಭರವಸೆಯಿಲ್ಲ ಅಂತ್ಯ
@@ -440,7 +441,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,ವ್ಯವಸ್ಥಾಪಕ ಉಪಗುತ್ತಿಗೆ
 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,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ ದರ ಕಂಪನಿಯ ಬೇಸ್ ಕರೆನ್ಸಿ ಪರಿವರ್ತನೆ
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},ಖಾತೆ {0} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},ಖಾತೆ {0} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,ಸಂಕ್ಷೇಪಣ ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಕಂಪನಿಗೆ ಬಳಸಲಾಗುತ್ತದೆ
 DocType: Selling Settings,Default Customer Group,ಡೀಫಾಲ್ಟ್ ಗ್ರಾಹಕ ಗುಂಪಿನ
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದಲ್ಲಿ, ' ದುಂಡಾದ ಒಟ್ಟು ' ಕ್ಷೇತ್ರದಲ್ಲಿ ಯಾವುದೇ ವ್ಯವಹಾರದಲ್ಲಿ ಕಾಣಿಸುವುದಿಲ್ಲ"
 DocType: BOM,Operating Cost,ವೆಚ್ಚವನ್ನು
@@ -476,6 +478,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,ಸರಕುಪಟ್ಟಿ ಕೋಷ್ಟಕದಲ್ಲಿ ಯಾವುದೇ ದಾಖಲೆಗಳು
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,ಮೊದಲ ಕಂಪನಿ ಮತ್ತು ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,ಹಣಕಾಸು / ಲೆಕ್ಕಪರಿಶೋಧಕ ವರ್ಷ .
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,ಕ್ರೋಢಿಕೃತ ಮೌಲ್ಯಗಳು
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ಕ್ಷಮಿಸಿ, ಸೀರಿಯಲ್ ಸೂಲ ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
 DocType: Project Task,Project Task,ಪ್ರಾಜೆಕ್ಟ್ ಟಾಸ್ಕ್
 ,Lead Id,ಲೀಡ್ ಸಂ
@@ -497,7 +500,7 @@
 DocType: Quotation,Quotation To,ಉದ್ಧರಣಾ
 DocType: Lead,Middle Income,ಮಧ್ಯಮ
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),ತೆರೆಯುತ್ತಿದೆ ( ಸಿಆರ್)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ನೀವು ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಕೆಲವು ವ್ಯವಹಾರ (ರು) ಮಾಡಿರುವ ಕಾರಣ ಐಟಂ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ {0} ನೇರವಾಗಿ ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ. ನೀವು ಬೇರೆ ಡೀಫಾಲ್ಟ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಬಳಸಲು ಹೊಸ ಐಟಂ ರಚಿಸಬೇಕಾಗಿದೆ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ನೀವು ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಕೆಲವು ವ್ಯವಹಾರ (ರು) ಮಾಡಿರುವ ಕಾರಣ ಐಟಂ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ {0} ನೇರವಾಗಿ ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ. ನೀವು ಬೇರೆ ಡೀಫಾಲ್ಟ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಬಳಸಲು ಹೊಸ ಐಟಂ ರಚಿಸಬೇಕಾಗಿದೆ.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
 DocType: Purchase Order Item,Billed Amt,ಖ್ಯಾತವಾದ ಕಚೇರಿ
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,ಸ್ಟಾಕ್ ನಮೂದುಗಳನ್ನು ಮಾಡಲಾಗುತ್ತದೆ ಇದು ವಿರುದ್ಧ ತಾರ್ಕಿಕ ವೇರ್ಹೌಸ್.
@@ -575,7 +578,7 @@
 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 +543,Item has variants.,ಐಟಂ ವೇರಿಯಂಟ್.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,ಟ್ರೀ ಕೌಟುಂಬಿಕತೆ
@@ -588,6 +591,7 @@
 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 +33,Goods received from Suppliers.,ಗೂಡ್ಸ್ ವಿತರಕರಿಂದ ಪಡೆದ .
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,ಮೌಲ್ಯ
 DocType: Lead,Campaign Name,ಕ್ಯಾಂಪೇನ್ ಹೆಸರು
 ,Reserved,ಮೀಸಲಿಟ್ಟ
 DocType: Purchase Order,Supply Raw Materials,ಪೂರೈಕೆ ರಾ ಮೆಟೀರಿಯಲ್ಸ್
@@ -602,16 +606,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಖಾತೆ ಲೆಡ್ಜರ್ ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Delivery Note,Customer's Purchase Order No,ಗ್ರಾಹಕರ ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ನಂ
 DocType: Employee,Cell Number,ಸೆಲ್ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,ಆಟೋ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ರಚಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,ಆಟೋ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ರಚಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ಲಾಸ್ಟ್
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,ನೀವು ಕಾಲಮ್ 'ಜರ್ನಲ್ ಎಂಟ್ರಿ ವಿರುದ್ಧ' ನಲ್ಲಿ ಪ್ರಸ್ತುತ ಚೀಟಿ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ಶಕ್ತಿ
 DocType: Opportunity,Opportunity From,ಅವಕಾಶದಿಂದ
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,ಮಾಸಿಕ ವೇತನವನ್ನು ಹೇಳಿಕೆ .
 DocType: Item Group,Website Specifications,ವೆಬ್ಸೈಟ್ ವಿಶೇಷಣಗಳು
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},ನಿಮ್ಮ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ದೋಷ {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,ಹೊಸ ಖಾತೆ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: ಗೆ {0} ರೀತಿಯ {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,ರೋ {0}: ಪರಿವರ್ತಿಸುವುದರ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",ಬಹು ಬೆಲೆ ನಿಯಮಗಳು ಒಂದೇ ಮಾನದಂಡವನ್ನು ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಪ್ರಾಶಸ್ತ್ಯವನ್ನು ನಿಗದಿಪಡಿಸಬೇಕು ಸಂಘರ್ಷ ಪರಿಹರಿಸಲು ಮಾಡಿ. ಬೆಲೆ ನಿಯಮಗಳು: {0}
 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.,ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳು ಲೀಫ್ ನೋಡ್ಗಳು ವಿರುದ್ಧ ಮಾಡಬಹುದು. ಗುಂಪುಗಳ ವಿರುದ್ಧ ನಮೂದುಗಳು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಅಥವಾ ಇತರ BOMs ಸಂಬಂಧ ಇದೆ ಎಂದು ಬಿಒಎಮ್ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Opportunity,Maintenance,ಸಂರಕ್ಷಣೆ
@@ -673,7 +679,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,ಬೆಲೆ ಪಟ್ಟಿಯನ್ನು ಅಲ್ಲ
 DocType: Employee,Family Background,ಕೌಟುಂಬಿಕ ಹಿನ್ನೆಲೆ
 DocType: Process Payroll,Send Email,ಇಮೇಲ್ ಕಳುಹಿಸಿ
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},ಎಚ್ಚರಿಕೆ: ಅಮಾನ್ಯ ಲಗತ್ತು {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},ಎಚ್ಚರಿಕೆ: ಅಮಾನ್ಯ ಲಗತ್ತು {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,ಯಾವುದೇ ಅನುಮತಿ
 DocType: Company,Default Bank Account,ಡೀಫಾಲ್ಟ್ ಬ್ಯಾಂಕ್ ಖಾತೆ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",ಪಕ್ಷದ ಆಧಾರದ ಮೇಲೆ ಫಿಲ್ಟರ್ ಆರಿಸಿ ಪಕ್ಷದ ಮೊದಲ ನೀಡಿರಿ
@@ -703,13 +709,13 @@
 DocType: Production Planning Tool,Select Items,ಐಟಂಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} ಬಿಲ್ ವಿರುದ್ಧ {1} ರ {2}
 DocType: Maintenance Visit,Completion Status,ಪೂರ್ಣಗೊಂಡ ಸ್ಥಿತಿ
-DocType: Sales Invoice Item,Target Warehouse,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್
+DocType: Production Order,Target Warehouse,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್
 DocType: Item,Allow over delivery or receipt upto this percent,ಈ ಶೇಕಡಾ ವರೆಗೆ ವಿತರಣೆ ಅಥವಾ ರಶೀದಿ ಮೇಲೆ ಅವಕಾಶ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,ನಿರೀಕ್ಷಿತ ವಿತರಣಾ ದಿನಾಂಕದ ಮೊದಲು ಮಾರಾಟದ ಆದೇಶ ದಿನಾಂಕ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Upload Attendance,Import Attendance,ಆಮದು ಅಟೆಂಡೆನ್ಸ್
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,ಎಲ್ಲಾ ಐಟಂ ಗುಂಪುಗಳು
 DocType: Process Payroll,Activity Log,ಚಟುವಟಿಕೆ ಲಾಗ್
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,ನಿವ್ವಳ ಲಾಭ / ನಷ್ಟ
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,ನಿವ್ವಳ ಲಾಭ / ನಷ್ಟ
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,ಸ್ವಯಂಚಾಲಿತವಾಗಿ ವ್ಯವಹಾರಗಳ ಸಲ್ಲಿಕೆಯಲ್ಲಿ ಸಂದೇಶವನ್ನು ರಚಿಸಿದರು .
 DocType: Production Order,Item To Manufacture,ತಯಾರಿಸಲು ಐಟಂ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} ಸ್ಥಿತಿ {2} ಆಗಿದೆ
@@ -717,7 +723,7 @@
 DocType: Sales Order Item,Projected Qty,ಪ್ರಮಾಣ ಯೋಜಿತ
 DocType: Sales Invoice,Payment Due Date,ಪಾವತಿ ಕಾರಣ ದಿನಾಂಕ
 DocType: Newsletter,Newsletter Manager,ಸುದ್ದಿಪತ್ರ ಮ್ಯಾನೇಜರ್
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಈಗಾಗಲೇ ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಈಗಾಗಲೇ ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',ಉದ್ಘಾಟಿಸುತ್ತಿರುವುದು
 DocType: Notification Control,Delivery Note Message,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಸಂದೇಶ
 DocType: Expense Claim,Expenses,ವೆಚ್ಚಗಳು
@@ -727,7 +733,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,ಸಂಶೋಧನೆ ಮತ್ತು ಅಭಿವೃದ್ಧಿ
 ,Amount to Bill,ಬಿಲ್ ಪ್ರಮಾಣ
 DocType: Company,Registration Details,ನೋಂದಣಿ ವಿವರಗಳು
-DocType: Item,Re-Order Qty,ಮರು ಪ್ರಮಾಣ ಆದೇಶ
+DocType: Item Reorder,Re-Order Qty,ಮರು ಪ್ರಮಾಣ ಆದೇಶ
 DocType: Leave Block List Date,Leave Block List Date,ಖಂಡ ದಿನಾಂಕ ಬಿಡಿ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},ಕಳುಹಿಸಿದನು ಪರಿಶಿಷ್ಟ {0}
 DocType: Pricing Rule,Price or Discount,ಬೆಲೆ ಅಥವಾ ಡಿಸ್ಕೌಂಟ್
@@ -770,7 +776,7 @@
 DocType: Bank Reconciliation,Total Amount,ಒಟ್ಟು ಪ್ರಮಾಣ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,ಇಂಟರ್ನೆಟ್ ಪಬ್ಲಿಷಿಂಗ್
 DocType: Production Planning Tool,Production Orders,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ಸ್
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,ಬ್ಯಾಲೆನ್ಸ್ ಮೌಲ್ಯ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,ಬ್ಯಾಲೆನ್ಸ್ ಮೌಲ್ಯ
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,ಮಾರಾಟ ಬೆಲೆ ಪಟ್ಟಿ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,ಐಟಂಗಳನ್ನು ಸಿಂಕ್ ಪ್ರಕಟಿಸಿ
 DocType: Bank Reconciliation,Account Currency,ಖಾತೆ ಕರೆನ್ಸಿ
@@ -779,7 +785,7 @@
 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 +538,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 DocType: Quality Inspection Reading,Reading 6,6 ಓದುವಿಕೆ
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ಸರಕುಪಟ್ಟಿ ಮುಂಗಡ ಖರೀದಿ
 DocType: Address,Shop,ಅಂಗಡಿ
@@ -856,7 +862,7 @@
 DocType: POS Profile,Cash/Bank Account,ನಗದು / ಬ್ಯಾಂಕ್ ಖಾತೆ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯವನ್ನು ಯಾವುದೇ ಬದಲಾವಣೆ ತೆಗೆದುಹಾಕಲಾಗಿದೆ ಐಟಂಗಳನ್ನು.
 DocType: Delivery Note,Delivery To,ವಿತರಣಾ
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,ರಿಯಾಯಿತಿ
@@ -884,7 +890,7 @@
 DocType: Tax Rule,Shipping State,ಶಿಪ್ಪಿಂಗ್ ರಾಜ್ಯ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,ಐಟಂ ಬಟನ್ 'ಖರೀದಿ ರಸೀದಿಗಳನ್ನು ರಿಂದ ಐಟಂಗಳು ಪಡೆಯಿರಿ' ಬಳಸಿಕೊಂಡು ಸೇರಿಸಬೇಕು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,ಮಾರಾಟ ವೆಚ್ಚಗಳು
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ಬೈಯಿಂಗ್
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ಬೈಯಿಂಗ್
 DocType: GL Entry,Against,ವಿರುದ್ಧವಾಗಿ
 DocType: Item,Default Selling Cost Center,ಡೀಫಾಲ್ಟ್ ಮಾರಾಟ ವೆಚ್ಚ ಸೆಂಟರ್
 DocType: Sales Partner,Implementation Partner,ಅನುಷ್ಠಾನ ಸಂಗಾತಿ
@@ -926,7 +932,7 @@
 DocType: Sales Partner,Distributor,ವಿತರಕ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಿಪ್ಪಿಂಗ್ ರೂಲ್
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',ಸೆಟ್ &#39;ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಅನ್ವಯಿಸು&#39; ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',ಸೆಟ್ &#39;ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಅನ್ವಯಿಸು&#39; ದಯವಿಟ್ಟು
 ,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.,ಟೈಮ್ ದಾಖಲೆಗಳು ಆಯ್ಕೆ ಮತ್ತು ಹೊಸ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ರಚಿಸಲು ಸಲ್ಲಿಸಿ .
@@ -994,9 +1000,9 @@
 DocType: Contact,User ID,ಬಳಕೆದಾರ ID
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,ವೀಕ್ಷಿಸು ಲೆಡ್ಜರ್
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ಮುಂಚಿನ
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group","ಐಟಂ ಗುಂಪು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ , ಐಟಂ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ದಯವಿಟ್ಟು"
 DocType: Production Order,Manufacture against Sales Order,ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ ತಯಾರಿಸಲು
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,ವಿಶ್ವದ ಉಳಿದ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,ಗ್ರಾಸ್ ಪೇ
@@ -1026,7 +1032,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","ಕ್ಷಮಿಸಿ, ಕಂಪನಿಗಳು ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","ಕ್ಷಮಿಸಿ, ಕಂಪನಿಗಳು ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,ಸಣ್ಣ
 DocType: Employee,Employee Number,ನೌಕರರ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},ಕೇಸ್ ಇಲ್ಲ (ಗಳು) ಈಗಾಗಲೇ ಬಳಕೆಯಲ್ಲಿದೆ. ಪ್ರಕರಣ ಸಂಖ್ಯೆ ನಿಂದ ಪ್ರಯತ್ನಿಸಿ {0}
@@ -1045,7 +1051,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,ವ್ಯವಸಾಯ
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,ನಿಮ್ಮ ಉತ್ಪನ್ನಗಳನ್ನು ಅಥವಾ ಸೇವೆಗಳನ್ನು
 DocType: Mode of Payment,Mode of Payment,ಪಾವತಿಯ ಮಾದರಿಯು
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,ವೆಬ್ಸೈಟ್ ಚಿತ್ರ ಸಾರ್ವಜನಿಕ ಕಡತ ಅಥವಾ ವೆಬ್ಸೈಟ್ URL ಇರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,ವೆಬ್ಸೈಟ್ ಚಿತ್ರ ಸಾರ್ವಜನಿಕ ಕಡತ ಅಥವಾ ವೆಬ್ಸೈಟ್ URL ಇರಬೇಕು
 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,ವೇರ್ಹೌಸ್ ಸಂಪರ್ಕ ಮಾಹಿತಿ
@@ -1117,6 +1123,7 @@
 DocType: Address,Utilities,ಉಪಯುಕ್ತತೆಗಳನ್ನು
 DocType: Purchase Invoice Item,Accounting,ಲೆಕ್ಕಪರಿಶೋಧಕ
 DocType: Features Setup,Features Setup,ವೈಶಿಷ್ಟ್ಯಗಳು ಸೆಟಪ್
+DocType: Item,Is Service Item,ಸೇವೆ ಐಟಂ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,ಅಪ್ಲಿಕೇಶನ್ ಅವಧಿಯಲ್ಲಿ ಹೊರಗೆ ರಜೆ ಹಂಚಿಕೆ ಅವಧಿಯಲ್ಲಿ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Activity Cost,Projects,ಯೋಜನೆಗಳು
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,ಹಣಕಾಸಿನ ವರ್ಷ ಆಯ್ಕೆಮಾಡಿ
@@ -1147,7 +1154,7 @@
 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 +465,cannot be greater than 100,100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
 DocType: Maintenance Visit,Unscheduled,ಅನಿಗದಿತ
 DocType: Employee,Owned,ಸ್ವಾಮ್ಯದ
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ಅವಲಂಬಿಸಿರುತ್ತದೆ
@@ -1207,7 +1214,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,ಸರ್ಕಾರ
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು
 DocType: Company,Services,ಸೇವೆಗಳು
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),ಒಟ್ಟು ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),ಒಟ್ಟು ({0})
 DocType: Cost Center,Parent Cost Center,ಪೋಷಕ ವೆಚ್ಚ ಸೆಂಟರ್
 DocType: Sales Invoice,Source,ಮೂಲ
 DocType: Leave Type,Is Leave Without Pay,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ಇದೆ
@@ -1280,17 +1287,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ಪಾವತಿ ಇಮೇಲ್ ಅನ್ನು ಮತ್ತೆ ಕಳುಹಿಸಿ
 DocType: Dependent Task,Dependent Task,ಅವಲಂಬಿತ ಟಾಸ್ಕ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},ರೀತಿಯ ಲೀವ್ {0} ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,ಸೇವಿಸುವ ಪ್ರಮಾಣವನ್ನು
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} ವೀಕ್ಷಿಸಿ
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,ನಗದು ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,ನಗದು ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 DocType: Salary Structure Deduction,Salary Structure Deduction,ಸಂಬಳ ರಚನೆ ಕಳೆಯುವುದು
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ಅಳತೆಯ ಘಟಕ {0} ಹೆಚ್ಚು ಪರಿವರ್ತಿಸುವುದರ ಟೇಬಲ್ ಒಮ್ಮೆ ಹೆಚ್ಚು ನಮೂದಿಸಲಾದ
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ಅಳತೆಯ ಘಟಕ {0} ಹೆಚ್ಚು ಪರಿವರ್ತಿಸುವುದರ ಟೇಬಲ್ ಒಮ್ಮೆ ಹೆಚ್ಚು ನಮೂದಿಸಲಾದ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},ಪಾವತಿ ವಿನಂತಿ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
 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 +182,Quantity must not be more than {0},ಪ್ರಮಾಣ ಹೆಚ್ಚು ಇರಬಾರದು {0}
@@ -1352,7 +1359,7 @@
 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: Packed Item,To Warehouse (Optional),ಮಳಿಗೆಗೆ (ಐಚ್ಛಿಕ)
 DocType: Sales Invoice,Paid Amount (Company Currency),ಪಾವತಿಸಿದ ಮೊತ್ತಕ್ಕೆ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 DocType: Purchase Invoice,Additional Discount,ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ
 DocType: Selling Settings,Selling Settings,ಸೆಟ್ಟಿಂಗ್ಗಳು ಮಾರಾಟ
@@ -1361,7 +1368,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","ಕಂಪನಿ , ತಿಂಗಳ ಮತ್ತು ಹಣಕಾಸಿನ ವರ್ಷ ಕಡ್ಡಾಯ"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,ಮಾರ್ಕೆಟಿಂಗ್ ವೆಚ್ಚಗಳು
 ,Item Shortage Report,ಐಟಂ ಕೊರತೆ ವರದಿ
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ತೂಕ ತುಂಬಾ ""ತೂಕ ಮೈ.ವಿ.ವಿ.ಯ"" ನೀಡಿರಿ \n, ಉಲ್ಲೇಖಿಸಲಾಗಿದೆ"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ತೂಕ ತುಂಬಾ ""ತೂಕ ಮೈ.ವಿ.ವಿ.ಯ"" ನೀಡಿರಿ \n, ಉಲ್ಲೇಖಿಸಲಾಗಿದೆ"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ಈ ನೆಲದ ಎಂಟ್ರಿ ಮಾಡಲು ಬಳಸಲಾಗುತ್ತದೆ ವಿನಂತಿ ವಸ್ತು
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,ಐಟಂ ಏಕ ಘಟಕ .
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',ಟೈಮ್ ಲಾಗ್ ಬ್ಯಾಚ್ {0} ' ಸಲ್ಲಿಸಲಾಗಿದೆ ' ಮಾಡಬೇಕು
@@ -1372,6 +1379,7 @@
 DocType: Employee,Date Of Retirement,ನಿವೃತ್ತಿ ದಿನಾಂಕ
 DocType: Upload Attendance,Get Template,ಟೆಂಪ್ಲೆಟ್ ಪಡೆಯಿರಿ
 DocType: Address,Postal,ಅಂಚೆಯ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext ಸೆಟಪ್ ಪೂರ್ಣಗೊಳಿಸಿ!
 DocType: Item,Weightage,weightage
 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,ಎ ಗ್ರಾಹಕ ಗುಂಪಿನ ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಗ್ರಾಹಕ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಗ್ರಾಹಕ ಗುಂಪಿನ ಹೆಸರನ್ನು ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,ಮೊದಲ {0} ಆಯ್ಕೆ ಮಾಡಿ.
@@ -1400,12 +1408,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ಹಲವು ಕಾಲಮ್ಗಳನ್ನು. ವರದಿಯನ್ನು ರಫ್ತು ಸ್ಪ್ರೆಡ್ಶೀಟ್ ಅಪ್ಲಿಕೇಶನ್ ಬಳಸಿಕೊಂಡು ಅದನ್ನು ಮುದ್ರಿಸಲು.
 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 +139,Main,ಮುಖ್ಯ
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,ಮುಖ್ಯ
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,ಭಿನ್ನ
 DocType: Naming Series,Set prefix for numbering series on your transactions,ನಿಮ್ಮ ವ್ಯವಹಾರಗಳ ಮೇಲೆ ಸರಣಿ ಸಂಖ್ಯೆಗಳನ್ನು ಹೊಂದಿಸಿ ಪೂರ್ವಪ್ರತ್ಯಯ
 DocType: Employee Attendance Tool,Employees HTML,ನೌಕರರು ಎಚ್ಟಿಎಮ್ಎಲ್
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,ನಿಲ್ಲಿಸಿತು ಆದೇಶವನ್ನು ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ . ರದ್ದು ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು .
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,ಡೀಫಾಲ್ಟ್ BOM ({0}) ಈ ಐಟಂ ಅಥವಾ ಅದರ ಟೆಂಪ್ಲೇಟ್ ಸಕ್ರಿಯ ಇರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,ರೂಪಾಂತರಗಳು
@@ -1430,7 +1438,6 @@
 DocType: Sales Order,To Deliver and Bill,ತಲುಪಿಸಿ ಮತ್ತು ಬಿಲ್
 DocType: GL Entry,Credit Amount in Account Currency,ಖಾತೆ ಕರೆನ್ಸಿ ಕ್ರೆಡಿಟ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,ಉತ್ಪಾದನೆ ಸಮಯ ದಾಖಲೆಗಳು.
-DocType: Item,Apply Warehouse-wise Reorder Level,ವೇರ್ಹೌಸ್ ಬಲ್ಲ ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟ ಅರ್ಜಿ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,ಬಿಒಎಮ್ {0} ಸಲ್ಲಿಸಬೇಕು
 DocType: Authorization Control,Authorization Control,ಅಧಿಕಾರ ಕಂಟ್ರೋಲ್
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ರೋ # {0}: ವೇರ್ಹೌಸ್ ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ತಿರಸ್ಕರಿಸಿದರು ಐಟಂ ವಿರುದ್ಧ ಕಡ್ಡಾಯ {1}
@@ -1529,6 +1536,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,ರೋ # {0}: ಆಪರೇಷನ್ {1} ಉತ್ಪಾದನೆ ತಯಾರಾದ ಸರಕುಗಳ {2} ಪ್ರಮಾಣ ಫಾರ್ ಪೂರ್ಣಗೊಳಿಸಿಲ್ಲ ಆರ್ಡರ್ # {3}. ಟೈಮ್ ದಾಖಲೆಗಳು ಮೂಲಕ ಕಾರ್ಯಾಚರಣೆ ಸ್ಥಿತಿ ನವೀಕರಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,ಇನ್ವೆಸ್ಟ್ಮೆಂಟ್ಸ್
 DocType: Issue,Resolution Details,ರೆಸಲ್ಯೂಶನ್ ವಿವರಗಳು
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ಹಂಚಿಕೆಯು
 DocType: Quality Inspection Reading,Acceptance Criteria,ಒಪ್ಪಿಕೊಳ್ಳುವ ಅಳತೆಗೋಲುಗಳನ್ನು
 DocType: Item Attribute,Attribute Name,ಹೆಸರು ಕಾರಣವಾಗಿದ್ದು
 DocType: Item Group,Show In Website,ವೆಬ್ಸೈಟ್ ಹೋಗಿ
@@ -1579,7 +1587,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,ಖರ್ಚು ಹಕ್ಕು ಅನುಮೋದನೆ ಬಾಕಿ ಇದೆ . ಮಾತ್ರ ಖರ್ಚು ಅನುಮೋದಕ ಡೇಟ್ ಮಾಡಬಹುದು .
 DocType: Purchase Invoice,Additional Discount Amount,ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಪ್ರಮಾಣ
 DocType: Leave Block List Allow,Leave Block List Allow,ಬ್ಲಾಕ್ ಲಿಸ್ಟ್ ಅನುಮತಿಸಿ ಬಿಡಿ
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr ಖಾಲಿ ಅಥವಾ ಜಾಗವನ್ನು ಇರುವಂತಿಲ್ಲ
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr ಖಾಲಿ ಅಥವಾ ಜಾಗವನ್ನು ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,ಅಲ್ಲದ ಗ್ರೂಪ್ ಗ್ರೂಪ್
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ಕ್ರೀಡೆ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,ನಿಜವಾದ ಒಟ್ಟು
@@ -1620,7 +1628,7 @@
 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**.,** ಹಣಕಾಸಿನ ವರ್ಷ ** ಒಂದು ಹಣಕಾಸು ವರ್ಷದ ಪ್ರತಿನಿಧಿಸುತ್ತದೆ. ಎಲ್ಲಾ ಲೆಕ್ಕ ನಮೂದುಗಳನ್ನು ಮತ್ತು ಇತರ ಪ್ರಮುಖ ವ್ಯವಹಾರಗಳ ** ** ಹಣಕಾಸಿನ ವರ್ಷ ವಿರುದ್ಧ ಕಂಡುಕೊಳ್ಳಲಾಯಿತು.
 DocType: Opportunity,Customer / Lead Address,ಗ್ರಾಹಕ / ಲೀಡ್ ವಿಳಾಸ
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},ಎಚ್ಚರಿಕೆ: ಬಾಂಧವ್ಯ ಅಮಾನ್ಯ SSL ಪ್ರಮಾಣಪತ್ರ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},ಎಚ್ಚರಿಕೆ: ಬಾಂಧವ್ಯ ಅಮಾನ್ಯ SSL ಪ್ರಮಾಣಪತ್ರ {0}
 DocType: Production Order Operation,Actual Operation Time,ನಿಜವಾದ ಕಾರ್ಯಾಚರಣೆ ಟೈಮ್
 DocType: Authorization Rule,Applicable To (User),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಬಳಕೆದಾರ )
 DocType: Purchase Taxes and Charges,Deduct,ಕಳೆ
@@ -1769,7 +1777,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,ಪ್ರಕರಣ ಸಂಖ್ಯೆ 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,ನೀವು ಮಾರಾಟ ತಂಡವನ್ನು ಮತ್ತು ಮಾರಾಟಕ್ಕೆ ಪಾರ್ಟ್ನರ್ಸ್ ( ಚಾನೆಲ್ ಪಾರ್ಟ್ನರ್ಸ್ ) ಹೊಂದಿದ್ದರೆ ಅವರು ಟ್ಯಾಗ್ ಮತ್ತು ಮಾರಾಟ ಚಟುವಟಿಕೆಯಲ್ಲಿ ಅವರ ಕೊಡುಗೆ ನಿರ್ವಹಿಸಲು ಮಾಡಬಹುದು
 DocType: Item,Show a slideshow at the top of the page,ಪುಟದ ಮೇಲಿರುವ ಒಂದು ಸ್ಲೈಡ್ಶೋ ತೋರಿಸು
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,ಸ್ಟೋರ್ಸ್
+DocType: Item,"Allow in Sales Order of type ""Service""",ಮಾದರಿ &quot;ಸೇವೆ&quot; ಮಾರಾಟ ಆರ್ಡರ್ ಅನುಮತಿಸು
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,ಸ್ಟೋರ್ಸ್
 DocType: Time Log,Projects Manager,ಯೋಜನೆಗಳು ನಿರ್ವಾಹಕ
 DocType: Serial No,Delivery Time,ಡೆಲಿವರಿ ಟೈಮ್
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,ರಂದು ಆಧರಿಸಿ ಏಜಿಂಗ್
@@ -1794,7 +1803,7 @@
 ,Financial Analytics,ಹಣಕಾಸು ಅನಾಲಿಟಿಕ್ಸ್
 DocType: Quality Inspection,Verified By,ಪರಿಶೀಲಿಸಲಾಗಿದೆ
 DocType: Address,Subsidiary,ಸಹಕಾರಿ
-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.","ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವ್ಯವಹಾರಗಳು ಇರುವುದರಿಂದ, ಕಂಪನಿಯ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ . ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಬದಲಾಯಿಸಲು ರದ್ದು ಮಾಡಬೇಕು ."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವ್ಯವಹಾರಗಳು ಇರುವುದರಿಂದ, ಕಂಪನಿಯ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ . ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಬದಲಾಯಿಸಲು ರದ್ದು ಮಾಡಬೇಕು ."
 DocType: Quality Inspection,Purchase Receipt No,ಖರೀದಿ ರಸೀತಿ ನಂ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ಅರ್ನೆಸ್ಟ್ ಮನಿ
 DocType: Process Payroll,Create Salary Slip,ಸಂಬಳ ಸ್ಲಿಪ್ ರಚಿಸಿ
@@ -1842,7 +1851,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","ಸ್ಟಾಕ್ ನವೀಕರಣಗೊಳ್ಳುವುದಿಲ್ಲ, ಸರಕುಪಟ್ಟಿ ಡ್ರಾಪ್ ಹಡಗು ಐಟಂ ಹೊಂದಿದೆ."
 DocType: Newsletter,Test,ಟೆಸ್ಟ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'","ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಸ್ಟಾಕ್ ವ್ಯವಹಾರ ನಿಮಗೆ ಮೌಲ್ಯಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ \ ಈ ಐಟಂ, ಇವೆ ಎಂದು &#39;ಸೀರಿಯಲ್ ಯಾವುದೇ ಹೊಂದಿದೆ&#39;, &#39;ಬ್ಯಾಚ್ ಹೊಂದಿದೆ ಇಲ್ಲ&#39;, &#39;ಸ್ಟಾಕ್ ಐಟಂ&#39; ಮತ್ತು &#39;ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,ತ್ವರಿತ ಜರ್ನಲ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,BOM ಯಾವುದೇ ಐಟಂ agianst ಪ್ರಸ್ತಾಪಿಸಿದ್ದಾರೆ ವೇಳೆ ನೀವು ದರ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
@@ -1951,7 +1960,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,ದಯವಿಟ್ಟು ಡೆಲಿವರಿ ಗಮನಿಸಿ ಮೊದಲ
 DocType: Purchase Invoice,Currency and Price List,ಕರೆನ್ಸಿ ಮತ್ತು ಬೆಲೆ ಪಟ್ಟಿ
 DocType: Opportunity,Customer / Lead Name,ಗ್ರಾಹಕ / ಲೀಡ್ ಹೆಸರು
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ ಪ್ರಸ್ತಾಪಿಸಿದ್ದಾರೆ
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ ಪ್ರಸ್ತಾಪಿಸಿದ್ದಾರೆ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,ಉತ್ಪಾದನೆ
 DocType: Item,Allow Production Order,ಅನುಮತಿಸಿ ಉತ್ಪಾದನೆ ಆರ್ಡರ್
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,ರೋ {0} : ಪ್ರಾರಂಭ ದಿನಾಂಕ ಎಂಡ್ ದಿನಾಂಕದ ಮೊದಲು
@@ -1961,7 +1970,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
 DocType: Salary Structure,Total Earning,ಒಟ್ಟು ದುಡಿಯುತ್ತಿದ್ದ
 DocType: Purchase Receipt,Time at which materials were received,ವಸ್ತುಗಳನ್ನು ಸ್ವೀಕರಿಸಿದ ಯಾವ ಸಮಯದಲ್ಲಿ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,ನನ್ನ ವಿಳಾಸಗಳು
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,ನನ್ನ ವಿಳಾಸಗಳು
 DocType: Stock Ledger Entry,Outgoing Rate,ಹೊರಹೋಗುವ ದರ
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,ಸಂಸ್ಥೆ ಶಾಖೆ ಮಾಸ್ಟರ್ .
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,ಅಥವಾ
@@ -2030,7 +2039,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,ಗ್ರಾಹಕ ಮ್ಯಾನೇಜ್ಮೆಂಟ್ ಗ್ರೂಪ್ ಟ್ರೀ .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,ಹೊಸ ವೆಚ್ಚ ಸೆಂಟರ್ ಹೆಸರು
 DocType: Leave Control Panel,Leave Control Panel,ಕಂಟ್ರೋಲ್ ಪ್ಯಾನಲ್ ಬಿಡಿ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ಕಂಡುಬಂದಿಲ್ಲ. ಸೆಟಪ್> ಮುದ್ರಣ ಮತ್ತು ಬ್ರ್ಯಾಂಡಿಂಗ್ ಒಂದು ಹೊಸ> ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ರಚಿಸಿ.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ಕಂಡುಬಂದಿಲ್ಲ. ಸೆಟಪ್> ಮುದ್ರಣ ಮತ್ತು ಬ್ರ್ಯಾಂಡಿಂಗ್ ಒಂದು ಹೊಸ> ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ರಚಿಸಿ.
 DocType: Appraisal,HR User,ಮಾನವ ಸಂಪನ್ಮೂಲ ಬಳಕೆದಾರ
 DocType: Purchase Invoice,Taxes and Charges Deducted,ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತದೆ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,ತೊಂದರೆಗಳು
@@ -2047,7 +2056,7 @@
 ,Sales Browser,ಮಾರಾಟದ ಬ್ರೌಸರ್
 DocType: Journal Entry,Total Credit,ಒಟ್ಟು ಕ್ರೆಡಿಟ್
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},ಎಚ್ಚರಿಕೆ: ಮತ್ತೊಂದು {0} # {1} ಸ್ಟಾಕ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,ಸ್ಥಳೀಯ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,ದೊಡ್ಡದು
@@ -2066,7 +2075,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ನೀವು ಸೆಟ್ ಮತ್ತು ಗುರಿಗಳನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಆ ಎಲ್ಲಾ ಮಾರಾಟದ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಅನೇಕ ** ಮಾರಾಟದ ವ್ಯಕ್ತಿಗಳು ** ವಿರುದ್ಧ ಟ್ಯಾಗ್ ಮಾಡಬಹುದು.
 ,S.O. No.,S.O. ನಂ
 DocType: Production Order Operation,Make Time Log,ದಾಖಲೆ ಮಾಡಿ
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},{0} ನಿಂದ ಗ್ರಾಹಕ ಲೀಡ್ ರಚಿಸಲು ದಯವಿಟ್ಟು
 DocType: Price List,Applicable for Countries,ದೇಶಗಳು ಅನ್ವಯಿಸುವುದಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,ಕಂಪ್ಯೂಟರ್
@@ -2153,7 +2161,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,ಸಂಬಂಧಿತ ನಮೂದುಗಳು ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,ಸ್ಟಾಕ್ ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ
 DocType: Sales Invoice,Sales Team1,ಮಾರಾಟದ team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,ಐಟಂ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,ಐಟಂ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Sales Invoice,Customer Address,ಗ್ರಾಹಕ ವಿಳಾಸ
 DocType: Payment Request,Recipient and Message,ಸ್ವೀಕರಿಸುವವರ ಮತ್ತು ಸಂದೇಶ
 DocType: Purchase Invoice,Apply Additional Discount On,ಹೆಚ್ಚುವರಿ ರಿಯಾಯತಿ ಅನ್ವಯಿಸು
@@ -2195,7 +2203,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,ಮೌಲ್ಯಾಂಕನ ದರ
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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,ಲಾಗ್ ಮರುಹೆಸರಿಸು
@@ -2233,7 +2241,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,ದಿನಾಂಕ ನಿವಾರಿಸುವ ನಮೂದಿಸಿ.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,ಮೊತ್ತ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,ಮಾತ್ರ ಸಲ್ಲಿಸಿದ ಮಾಡಬಹುದು 'ಅಂಗೀಕಾರವಾದ' ಸ್ಥಿತಿಯನ್ನು ಅನ್ವಯಗಳಲ್ಲಿ ಬಿಡಿ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,ವಿಳಾಸ ಶೀರ್ಷಿಕೆ ಕಡ್ಡಾಯ.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,ವಿಳಾಸ ಶೀರ್ಷಿಕೆ ಕಡ್ಡಾಯ.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ವಿಚಾರಣೆಯ ಮೂಲ ಪ್ರಚಾರ ವೇಳೆ ಪ್ರಚಾರ ಹೆಸರನ್ನು ನಮೂದಿಸಿ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,ಸುದ್ದಿ ಪತ್ರಿಕೆಗಳ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ಹಣಕಾಸಿನ ವರ್ಷ ಆಯ್ಕೆಮಾಡಿ
@@ -2257,6 +2265,7 @@
 DocType: UOM,Must be Whole Number,ಹೋಲ್ ಸಂಖ್ಯೆ ಇರಬೇಕು
 DocType: Leave Control Panel,New Leaves Allocated (In Days),( ದಿನಗಳಲ್ಲಿ) ನಿಗದಿ ಹೊಸ ಎಲೆಗಳು
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+DocType: Sales Invoice Item,Customer Warehouse (Optional),ಗ್ರಾಹಕ ಮಳಿಗೆ (ಐಚ್ಛಿಕ)
 DocType: Pricing Rule,Discount Percentage,ರಿಯಾಯಿತಿ ಶೇಕಡಾವಾರು
 DocType: Payment Reconciliation Invoice,Invoice Number,ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/hooks.py +55,Orders,ಆರ್ಡರ್ಸ್
@@ -2366,7 +2375,7 @@
 DocType: Appraisal,Appraisal,ಬೆಲೆಕಟ್ಟುವಿಕೆ
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,ದಿನಾಂಕ ಪುನರಾವರ್ತಿಸುತ್ತದೆ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,ಅಧಿಕೃತ ಸಹಿ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},ಬಿಡಿ ಅನುಮೋದಕ ಒಂದು ಇರಬೇಕು {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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,ಟೈಮ್
@@ -2535,7 +2544,7 @@
 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 +733,Show tax break-up,ಶೋ ತೆರಿಗೆ ಮುರಿದುಕೊಂಡು
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,ಶೋ ತೆರಿಗೆ ಮುರಿದುಕೊಂಡು
 apps/erpnext/erpnext/accounts/party.py +283,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',ನೀವು ಉತ್ಪಾದನಾ ಚಟುವಟಿಕೆ ಒಳಗೊಂಡಿರುತ್ತವೆ ವೇಳೆ . ಐಟಂ ಸಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ ' ತಯಾರಿಸುತ್ತದೆ '
@@ -2585,7 +2594,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,ಮರು ಮಾದರಿ ಕಂಪನಿ ಹೆಸರು ದೃಢೀಕರಿಸಿ ದಯವಿಟ್ಟು
@@ -2612,9 +2621,6 @@
 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,ಸೇರುವ ದಿನಾಂಕ ಜನ್ಮ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,ಸಂಬಳ ರಚನೆ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","ಬಹು ಬೆಲೆ ರೂಲ್ ಅದೇ ಮಾನದಂಡವನ್ನು ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ, ಪ್ರಾಶಸ್ತ್ಯವನ್ನು ನಿಗದಿಪಡಿಸಬೇಕು \
- ಸಂಘರ್ಷ ಪರಿಹರಿಸಲು ದಯವಿಟ್ಟು. ಬೆಲೆ ನಿಯಮಗಳು: {0}"
 DocType: Account,Bank,ಬ್ಯಾಂಕ್
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ಏರ್ಲೈನ್
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,ಸಂಚಿಕೆ ಮೆಟೀರಿಯಲ್
@@ -2639,7 +2645,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ಸೆಕ್ಯುರಿಟೀಸ್ ಮತ್ತು ಸರಕು ವಿನಿಮಯ
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ಭಿನ್ನ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ &#39;{0}&#39; ಟೆಂಪ್ಲೇಟು ಅದೇ ಇರಬೇಕು &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ಭಿನ್ನ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ &#39;{0}&#39; ಟೆಂಪ್ಲೇಟು ಅದೇ ಇರಬೇಕು &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ಆಧರಿಸಿದ ಲೆಕ್ಕ
 DocType: Delivery Note Item,From Warehouse,ಗೋದಾಮಿನ
 DocType: Purchase Taxes and Charges,Valuation and Total,ಮೌಲ್ಯಾಂಕನ ಮತ್ತು ಒಟ್ಟು
@@ -2648,7 +2654,7 @@
 DocType: Account,Purchase User,ಖರೀದಿ ಬಳಕೆದಾರ
 DocType: Notification Control,Customize the Notification,ಅಧಿಸೂಚನೆ ಕಸ್ಟಮೈಸ್
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,ಕಾರ್ಯಾಚರಣೆ ಕ್ಯಾಶ್ ಫ್ಲೋ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,ಡೀಫಾಲ್ಟ್ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ಅಳಿಸಲಾಗಿಲ್ಲ
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,ಡೀಫಾಲ್ಟ್ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ಅಳಿಸಲಾಗಿಲ್ಲ
 DocType: Sales Invoice,Shipping Rule,ಶಿಪ್ಪಿಂಗ್ ರೂಲ್
 DocType: Manufacturer,Limited to 12 characters,"12 ಪಾತ್ರಗಳು,"
 DocType: Journal Entry,Print Heading,ಪ್ರಿಂಟ್ ಶಿರೋನಾಮೆ
@@ -2742,7 +2748,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,ಪ್ರಾಜೆಕ್ಟ್ ಬಲ್ಲ ದಶಮಾಂಶ ಉದ್ಧರಣ ಲಭ್ಯವಿಲ್ಲ
 DocType: Project,Expected End Date,ನಿರೀಕ್ಷಿತ ಅಂತಿಮ ದಿನಾಂಕ
 DocType: Appraisal Template,Appraisal Template Title,ಅಪ್ರೇಸಲ್ ಟೆಂಪ್ಲೇಟು ಶೀರ್ಷಿಕೆ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,ವ್ಯಾಪಾರದ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,ಆಕರ್ಷಕ ಸೇವೆಗಳು
@@ -2761,7 +2767,7 @@
 DocType: Customer,Default Receivable Accounts,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಗಳು ಡೀಫಾಲ್ಟ್
 DocType: Tax Rule,Billing State,ಬಿಲ್ಲಿಂಗ್ ರಾಜ್ಯ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,ವರ್ಗಾವಣೆ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),( ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಸೇರಿದಂತೆ ) ಸ್ಫೋಟಿಸಿತು BOM ಪಡೆದುಕೊಳ್ಳಿ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),( ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಸೇರಿದಂತೆ ) ಸ್ಫೋಟಿಸಿತು BOM ಪಡೆದುಕೊಳ್ಳಿ
 DocType: Authorization Rule,Applicable To (Employee),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಉದ್ಯೋಗಗಳು)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,ಕಾರಣ ದಿನಾಂಕ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,ಗುಣಲಕ್ಷಣ ಹೆಚ್ಚಳವನ್ನು {0} 0 ಸಾಧ್ಯವಿಲ್ಲ
@@ -2794,7 +2800,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,ನಕಾರಾತ್ಮಕ ಮೌಲ್ಯಾಂಕನ ದರ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Holiday List,Weekly Off,ಸಾಪ್ತಾಹಿಕ ಆಫ್
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ಇ ಜಿ ಫಾರ್ 2012 , 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),ಹಂಗಾಮಿ ಲಾಭ / ನಷ್ಟ (ಕ್ರೆಡಿಟ್)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),ಹಂಗಾಮಿ ಲಾಭ / ನಷ್ಟ (ಕ್ರೆಡಿಟ್)
 DocType: Sales Invoice,Return Against Sales Invoice,ವಿರುದ್ಧ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಹಿಂತಿರುಗಿ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,ಐಟಂ 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},ಕಂಪನಿ ರಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯವನ್ನು {0} ಸೆಟ್ ದಯವಿಟ್ಟು {1}
@@ -2825,6 +2831,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,ಮಕ್ಕಳ ಸೇರಿಸಿ
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,ಪಾತ್ರವನ್ನು ಘನೀಕೃತ ಖಾತೆಗಳು & ಸಂಪಾದಿಸಿ ಘನೀಕೃತ ನಮೂದುಗಳು ಹೊಂದಿಸಲು ಅನುಮತಿಸಲಾದ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,ಆಲ್ಡ್ವಿಚ್ childNodes ಲೆಡ್ಜರ್ ಒಂದು ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ಪರಿವರ್ತಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,ಆರಂಭಿಕ ಮೌಲ್ಯ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,ಸರಣಿ #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,ಮಾರಾಟದ ಮೇಲೆ ಕಮಿಷನ್
 DocType: Offer Letter Term,Value / Description,ಮೌಲ್ಯ / ವಿವರಣೆ
@@ -2858,7 +2865,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,ಯಶಸ್ವಿಯಾಗಿ ಈ ಕಂಪನಿಗೆ ಸಂಬಂಧಿಸಿದ ಎಲ್ಲಾ ವ್ಯವಹಾರಗಳನ್ನು ಅಳಿಸಲಾಗಿದೆ!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,ದಿನಾಂಕದಂದು
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,ಪರೀಕ್ಷಣೆ
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,ಡೀಫಾಲ್ಟ್ ವೇರ್ಹೌಸ್ ಸ್ಟಾಕ್ ಐಟಂ ಕಡ್ಡಾಯ.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},ತಿಂಗಳು ಮತ್ತು ವರ್ಷದ ಸಂಬಳ ಪಾವತಿ {0} {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ಆಟೋ ಇನ್ಸರ್ಟ್ ದರ ಪಟ್ಟಿ ದರ ಕಾಣೆಯಾಗಿದೆ ವೇಳೆ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,ಒಟ್ಟು ಗಳಿಸುವ ಪ್ರಮಾಣ
@@ -2894,7 +2900,7 @@
 DocType: Payment Tool,Set Matching Amounts,ಹೊಂದಿಸಿ ಬರೆಯುವುದು ಪ್ರಮಾಣದಲ್ಲಿ
 DocType: Purchase Invoice,Taxes and Charges Added,ಸೇರಿಸಲಾಗಿದೆ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 ,Sales Funnel,ಮಾರಾಟ ಕೊಳವೆಯನ್ನು
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,ಸಂಕ್ಷೇಪಣ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,ಸಂಕ್ಷೇಪಣ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,ನಮ್ಮ ನವೀಕರಣಗಳನ್ನು ಚಂದಾದಾರರಾಗುವ ನಿಮ್ಮ ಆಸಕ್ತಿಗೆ ಧನ್ಯವಾದಗಳು
 ,Qty to Transfer,ವರ್ಗಾವಣೆ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,ಪಾತ್ರಗಳ ಅಥವಾ ಗ್ರಾಹಕರಿಗೆ ಹಿಟ್ಟಿಗೆ .
@@ -2922,7 +2928,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,ಸರಬರಾಜುದಾರ ನುಡಿಮುತ್ತುಗಳು
 DocType: Quotation,In Words will be visible once you save the Quotation.,ನೀವು ಉದ್ಧರಣ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} ನಿಲ್ಲಿಸಿದಾಗ
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},ಬಾರ್ಕೋಡ್ {0} ಈಗಾಗಲೇ ಐಟಂ ಬಳಸಲಾಗುತ್ತದೆ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,ಮುಂಬರುವ ಕಾರ್ಯಕ್ರಮಗಳು
@@ -2945,7 +2951,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,ಹಣಕಾಸಿನ ವರ್ಷ ಆಯ್ಕೆ ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಪಿಓಎಸ್ ಎಂಟ್ರಿ ಮಾಡಲು ಅಗತ್ಯವಿದೆ
 DocType: Hub Settings,Name Token,ಹೆಸರು ಟೋಕನ್
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ವಿಕ್ರಯ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ವಿಕ್ರಯ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,ಕನಿಷ್ಠ ಒಂದು ಗೋದಾಮಿನ ಕಡ್ಡಾಯ
 DocType: Serial No,Out of Warranty,ಖಾತರಿ ಹೊರಗೆ
 DocType: BOM Replace Tool,Replace,ಬದಲಾಯಿಸಿ
@@ -3068,7 +3074,7 @@
 DocType: Sales Invoice,Paid Amount,ಮೊತ್ತವನ್ನು
 ,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,ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ ಇಲ್ಲ ಎಂದು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಈ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟ್ ಹೊಂದಿಸುವ
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ ಇಲ್ಲ ಎಂದು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಈ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟ್ ಹೊಂದಿಸುವ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ಈಗಾಗಲೇ ಡೆಬಿಟ್ ರಲ್ಲಿ ಖಾತೆ ಸಮತೋಲನ, ನೀವು 'ಕ್ರೆಡಿಟ್' 'ಬ್ಯಾಲೆನ್ಸ್ ಇರಬೇಕು ಹೊಂದಿಸಲು ಅನುಮತಿ ಇಲ್ಲ"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,ಗುಣಮಟ್ಟ ನಿರ್ವಹಣೆ
 DocType: Production Planning Tool,Filter based on customer,ಫಿಲ್ಟರ್ ಗ್ರಾಹಕ ಆಧಾರಿತ
@@ -3169,7 +3175,7 @@
 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 +19,Shortage Qty,ಕೊರತೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
 DocType: Salary Slip,Salary Slip,ಸಂಬಳದ ಸ್ಲಿಪ್
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' ದಿನಾಂಕ ' ಅಗತ್ಯವಿದೆ
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","ಪ್ರವಾಸ ತಲುಪಬೇಕಾದರೆ ಚೂರುಗಳನ್ನು ಪ್ಯಾಕಿಂಗ್ ರಚಿಸಿ. ಪ್ಯಾಕೇಜ್ ಸಂಖ್ಯೆ, ಪ್ಯಾಕೇಜ್ ್ಷೀಸಿ ಮತ್ತು ಅದರ ತೂಕ ತಿಳಿಸಲು ಬಳಸಲಾಗುತ್ತದೆ."
@@ -3180,7 +3186,7 @@
 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 +749,It is needed to fetch Item Details.,ಇದು ಐಟಂ ವಿವರಗಳು ತರಲು ಅಗತ್ಯವಿದೆ.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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} ಈಗಾಗಲೇ ಸ್ವೀಕರಿಸಲಾಗಿದೆ
@@ -3206,6 +3212,7 @@
 DocType: BOM,Manufacturing User,ಉತ್ಪಾದನಾ ಬಳಕೆದಾರ
 DocType: Purchase Order,Raw Materials Supplied,ವಿತರಿಸುತ್ತಾರೆ ರಾ ಮೆಟೀರಿಯಲ್ಸ್
 DocType: Purchase Invoice,Recurring Print Format,ಮರುಕಳಿಸುವ ಪ್ರಿಂಟ್ ಫಾರ್ಮ್ಯಾಟ್
+DocType: C-Form,Series,ಸರಣಿ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Appraisal,Appraisal Template,ಅಪ್ರೇಸಲ್ ಟೆಂಪ್ಲೇಟು
 DocType: Item Group,Item Classification,ಐಟಂ ವರ್ಗೀಕರಣ
@@ -3292,7 +3299,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},ಸಾಲು {0}: ಒಂದು ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರವೇಶ ಈಗಾಗಲೇ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.","ಸೋತು ಉದ್ಧರಣ ಮಾಡಲಾಗಿದೆ ಏಕೆಂದರೆ , ಘೋಷಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ಖರೀದಿ ಮಾಸ್ಟರ್ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸಬೇಕು
@@ -3300,7 +3307,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,ಮುಖ್ಯ ವರದಿಗಳು
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ಇಲ್ಲಿಯವರೆಗೆ fromDate ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,/ ಸಂಪಾದಿಸಿ ಬೆಲೆಗಳು ಸೇರಿಸಿ
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,ನನ್ನ ಆರ್ಡರ್ಸ್
@@ -3348,7 +3355,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},ರೋ # {0}: ಐಟಂ ಹೊಂದಿಸಿ ಸರಬರಾಜುದಾರ {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,ಐಟಂ {1} ಜೋಡಿಸಲಾದ ವೆಬ್ಸೈಟ್ ಚಿತ್ರ {0} ದೊರೆಯುತ್ತಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,ಐಟಂ {1} ಜೋಡಿಸಲಾದ ವೆಬ್ಸೈಟ್ ಚಿತ್ರ {0} ದೊರೆಯುತ್ತಿಲ್ಲ
 DocType: Issue,Content Type,ವಿಷಯ ಪ್ರಕಾರ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ಗಣಕಯಂತ್ರ
 DocType: Item,List this Item in multiple groups on the website.,ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಅನೇಕ ಗುಂಪುಗಳಲ್ಲಿ ಈ ಐಟಂ ಪಟ್ಟಿ .
@@ -3362,7 +3369,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,' ಸೀರಿಯಲ್ ನಂ ಹ್ಯಾಸ್ ' ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ' ಹೌದು ' ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'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,ಖಾತೆ ಹೆಡ್
@@ -3388,7 +3395,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,ಖಾತೆ {0} ಮುಚ್ಚುವ ರೀತಿಯ ಹೊಣೆಗಾರಿಕೆ / ಇಕ್ವಿಟಿ ಇರಬೇಕು
 DocType: Authorization Rule,Based On,ಆಧರಿಸಿದೆ
 DocType: Sales Order Item,Ordered Qty,ಪ್ರಮಾಣ ಆದೇಶ
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Stock Settings,Stock Frozen Upto,ಸ್ಟಾಕ್ ಘನೀಕೃತ ವರೆಗೆ
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},ಗೆ ಅವಧಿಯ ಮರುಕಳಿಸುವ ಕಡ್ಡಾಯವಾಗಿ ದಿನಾಂಕಗಳನ್ನು ಅವಧಿಯಲ್ಲಿ {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,ಪ್ರಾಜೆಕ್ಟ್ ಚಟುವಟಿಕೆ / ಕೆಲಸ .
@@ -3396,7 +3403,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","ಅನ್ವಯಿಸುವ ಹಾಗೆ ಆರಿಸಿದರೆ ಖರೀದಿ, ಪರೀಕ್ಷಿಸಬೇಕು {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ರಿಯಾಯಿತಿ ಕಡಿಮೆ 100 ಇರಬೇಕು
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ಪ್ರಮಾಣದ ಆಫ್ ಬರೆಯಿರಿ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,ರೋ # {0}: ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,ರೋ # {0}: ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ ಹೊಂದಿಸಿ
 DocType: Landed Cost Voucher,Landed Cost Voucher,ಇಳಿಯಿತು ವೆಚ್ಚ ಚೀಟಿ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},ಸೆಟ್ ದಯವಿಟ್ಟು {0}
 DocType: Purchase Invoice,Repeat on Day of Month,ತಿಂಗಳಿನ ದಿನ ಪುನರಾವರ್ತಿಸಿ
@@ -3469,7 +3476,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ಈಗ ವೀಕ್ಷಿಸಿ
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,ಸರಕುಪಟ್ಟಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ರಚಿಸಲಾಗಿದೆ ಮಾಡಿದಾಗ ಅವಧಿಯಲ್ಲಿ ಆಯ್ಕೆ
 DocType: BOM,Raw Material Cost,ರಾ ಮೆಟೀರಿಯಲ್ ವೆಚ್ಚ
-DocType: Item,Re-Order Level,ಮರು ಕ್ರಮಾಂಕದ ಮಟ್ಟ
+DocType: Item Reorder,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.,ನೀವು ಉತ್ಪಾದನೆ ಆದೇಶಗಳನ್ನು ಹೆಚ್ಚಿಸಲು ಅಥವಾ ವಿಶ್ಲೇಷಣೆ ಕಚ್ಚಾ ವಸ್ತುಗಳನ್ನು ಡೌನ್ಲೋಡ್ ಬಯಸುವ ಐಟಂಗಳನ್ನು ಮತ್ತು ಯೋಜಿಸಿದ ಪ್ರಮಾಣ ನಮೂದಿಸಿ.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,ಅರೆಕಾಲಿಕ
 DocType: Employee,Applicable Holiday List,ಅನ್ವಯಿಸುವ ಹಾಲಿಡೇ ಪಟ್ಟಿ
@@ -3524,7 +3531,7 @@
 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 +573,Please specify Attribute Value for attribute {0},ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3603,7 +3610,7 @@
 DocType: Address,Office,ಕಚೇರಿ
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,ಲೆಕ್ಕಪರಿಶೋಧಕ ಜರ್ನಲ್ ನಮೂದುಗಳು .
 DocType: Delivery Note Item,Available Qty at From Warehouse,ಗೋದಾಮಿನ ಲಭ್ಯವಿದೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,ಮೊದಲ ನೌಕರರ ರೆಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,ಮೊದಲ ನೌಕರರ ರೆಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
@@ -3678,7 +3685,7 @@
 DocType: Item Attribute,Numeric Values,ಸಂಖ್ಯೆಯ ಮೌಲ್ಯಗಳನ್ನು
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,ಲೋಗೋ ಲಗತ್ತಿಸಿ
 DocType: Customer,Commission Rate,ಕಮಿಷನ್ ದರ
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,ಭಿನ್ನ ಮಾಡಿ
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,ಭಿನ್ನ ಮಾಡಿ
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,ಇಲಾಖೆ ರಜೆ ಅನ್ವಯಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ .
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,ಕಾರ್ಟ್ ಖಾಲಿಯಾಗಿದೆ
 DocType: Production Order,Actual Operating Cost,ನಿಜವಾದ ವೆಚ್ಚವನ್ನು
@@ -3695,15 +3702,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item","ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟದ ಹೊಂದಿಸಲು, ಐಟಂ ಖರೀದಿ ಐಟಂ ಅಥವಾ ಮ್ಯಾನುಫ್ಯಾಕ್ಚರಿಂಗ್ ಐಟಂ ಇರಬೇಕು"
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),(ಅರ್ಧ ದಿನ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(ಅರ್ಧ ದಿನ)
 DocType: Supplier,Credit Days,ಕ್ರೆಡಿಟ್ ಡೇಸ್
 DocType: Leave Type,Is Carry Forward,ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ ಇದೆ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,BOM ಐಟಂಗಳು ಪಡೆಯಿರಿ
diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv
index e106b22..ca6a081 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% 청구
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),환율은 동일해야합니다 {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,고객 이름
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},은행 계정으로 명명 할 수없는 {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},은행 계정으로 명명 할 수없는 {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),뛰어난 {0}보다 작을 수 없습니다에 대한 ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,새로운 허가 신청
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,새로운 허가 신청
 apps/erpnext/erpnext/setup/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,지불 계정의 모드
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","활동 로그, 결제 시간을 추적하기 위해 사용할 수있는 작업에 대한 사용자에 의해 수행."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},새로운 {0} : # {1}
 ,Sales Partners Commission,영업 파트너위원회
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,약어는 5 개 이상의 문자를 가질 수 없습니다
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,약어는 5 개 이상의 문자를 가질 수 없습니다
 DocType: Payment Request,Payment Request,지불 요청
 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.",값이 {0} {1} 항목으로 변형 \에서 제거 할 수없는 속성이 속성으로 존재한다.
@@ -196,6 +196,7 @@
 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 (%),가격 목록 요금에 할인 (%)
 DocType: Offer Letter,Select Terms and Conditions,이용 약관 선택
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,제한 값
 DocType: Production Planning Tool,Sales Orders,판매 주문
 DocType: Purchase Taxes and Charges,Valuation,평가
 ,Purchase Order Trends,주문 동향을 구매
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,텔레비전
 DocType: Production Order Operation,Updated via 'Time Log','소요시간 로그'를 통해 업데이트 되었습니다.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},계정 {0}이 회사에 속하지 않는 {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},사전 금액보다 클 수 없습니다 {0} {1}
 DocType: Naming Series,Series List for this Transaction,이 트랜잭션에 대한 시리즈 일람
 DocType: Sales Invoice,Is Opening Entry,개시 항목
 DocType: Customer Group,Mention if non-standard receivable account applicable,표준이 아닌 채권 계정 (해당되는 경우)
@@ -227,7 +229,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,위에서 언급 한 기준에 대한 급여 명세서를 작성합니다.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,주어진 설명이 없습니다
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,구입 요청합니다.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,만 선택 안함 승인자이 허가 신청을 제출할 수 있습니다
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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} 설정&gt; 설정을 통해&gt; 명명 시리즈에 대한 시리즈를 명명 설정을하세요
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},웨어 하우스는 {0}에 속하지 않는 회사 {1}
 DocType: Item Website Specification,Item Website Specification,항목 웹 사이트 사양
 DocType: Payment Tool,Reference No,참조 번호
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,남겨 차단
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,남겨 차단
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,연간
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,재고 조정 항목
 DocType: Stock Entry,Sales Invoice No,판매 송장 번호
@@ -249,7 +251,7 @@
 DocType: Pricing Rule,Supplier Type,공급 업체 유형
 DocType: Item,Publish in Hub,허브에 게시
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,{0} 항목 취소
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,{0} 항목 취소
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,자료 요청
 DocType: Bank Reconciliation,Update Clearance Date,업데이트 통관 날짜
 DocType: Item,Purchase Details,구매 상세 정보
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,상품 수령증
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,세금 설정
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,당신이 그것을 끌어 후 결제 항목이 수정되었습니다.다시 당깁니다.
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} 항목의 세금에 두 번 입력
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,월 및 연도를 선택하세요
@@ -329,7 +331,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,귀하의 이메일 주소
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,첨부 파일을 참조하시기 바랍니다
 DocType: Purchase Order,% Received,% 수신
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,이미 설치 완료!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,이미 설치 완료!
 ,Finished Goods,완성품
 DocType: Delivery Note,Instructions,지침
 DocType: Quality Inspection,Inspected By,검사
@@ -354,14 +356,13 @@
 ,Purchase Register,회원에게 구매
 DocType: Landed Cost Item,Applicable Charges,적용 요금
 DocType: Workstation,Consumable Cost,소모품 비용
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 역할이 있어야합니다 '휴가 승인'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 역할이 있어야합니다 '휴가 승인'
 DocType: Purchase Receipt,Vehicle Date,차량 날짜
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,의료
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,잃는 이유
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},워크 스테이션 홀리데이 목록에 따라 다음과 같은 날짜에 닫혀 : {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,기회
 DocType: Employee,Single,미혼
-DocType: Issue,Attachment,첨부
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,예산은 그룹의 비용 센터를 설정할 수 없습니다
 DocType: Account,Cost of Goods Sold,매출원가
 DocType: Purchase Invoice,Yearly,매년
@@ -390,7 +391,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,속성 {0} 속성 테이블에서 여러 번 선택
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,속성 {0} 속성 테이블에서 여러 번 선택
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,적용 할 수 없음
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,휴일 마스터.
@@ -429,7 +430,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,화장품
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items",병합하려면 다음과 같은 속성이 두 항목에 대해 동일해야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items",병합하려면 다음과 같은 속성이 두 항목에 대해 동일해야합니다
 DocType: Shipping Rule,Net Weight,순중량
 DocType: Employee,Emergency Phone,긴급 전화
 ,Serial No Warranty Expiry,일련 번호 보증 만료
@@ -440,7 +441,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,관리 하도급
 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,가격 목록 통화는 회사의 기본 통화로 변환하는 속도에
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},계정 {0} 회사에 속하지 않는 {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},계정 {0} 회사에 속하지 않는 {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,약어는 이미 다른 회사에 사용
 DocType: Selling Settings,Default Customer Group,기본 고객 그룹
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","사용하지 않으면, '둥근 총'이 필드는 모든 트랜잭션에서 볼 수 없습니다"
 DocType: BOM,Operating Cost,운영 비용
@@ -476,6 +478,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,송장 테이블에있는 레코드 없음
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,첫번째 회사와 파티 유형을 선택하세요
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,금융 / 회계 연도.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,누적 값
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","죄송합니다, 시리얼 NOS는 병합 할 수 없습니다"
 DocType: Project Task,Project Task,프로젝트 작업
 ,Lead Id,리드 아이디
@@ -497,7 +500,7 @@
 DocType: Quotation,Quotation To,에 견적
 DocType: Lead,Middle Income,중간 소득
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),오프닝 (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,이미 다른 UOM 일부 거래 (들)을 만들었 때문에 항목에 대한 측정의 기본 단위는 {0} 직접 변경할 수 없습니다. 당신은 다른 기본 UOM을 사용하여 새 항목을 작성해야합니다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,이미 다른 UOM 일부 거래 (들)을 만들었 때문에 항목에 대한 측정의 기본 단위는 {0} 직접 변경할 수 없습니다. 당신은 다른 기본 UOM을 사용하여 새 항목을 작성해야합니다.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,할당 된 금액은 음수 일 수 없습니다
 DocType: Purchase Order Item,Billed Amt,청구 AMT 사의
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,재고 항목이 만들어지는에 대해 논리적 창고.
@@ -575,7 +578,7 @@
 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 +543,Item has variants.,항목 변종이있다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,나무의 종류
@@ -588,6 +591,7 @@
 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 +33,Goods received from Suppliers.,제품은 공급 업체에서 받았다.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,값에서
 DocType: Lead,Campaign Name,캠페인 이름
 ,Reserved,예약
 DocType: Purchase Order,Supply Raw Materials,공급 원료
@@ -602,16 +606,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,기존 거래와 계정 원장으로 변환 할 수 없습니다
 DocType: Delivery Note,Customer's Purchase Order No,고객의 구매 주문 번호
 DocType: Employee,Cell Number,핸드폰 번호
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,자동 자료 요청 생성
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,자동 자료 요청 생성
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,상실
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,당신은 열 '저널 항목에 대하여'에서 현재의 바우처를 입력 할 수 없습니다
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,에너지
 DocType: Opportunity,Opportunity From,기회에서
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,월급의 문.
 DocType: Item Group,Website Specifications,웹 사이트 사양
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},당신의 주소 템플릿에 오류가 있습니다 {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,새 계정
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}에서 {0} 유형의 {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,행 {0} : 변환 계수는 필수입니다
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",여러 가격 규칙은 동일한 기준으로 존재 우선 순위를 할당하여 충돌을 해결하십시오. 가격 규칙 : {0}
 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.,회계 항목은 리프 노드에 대해 할 수있다. 그룹에 대한 항목은 허용되지 않습니다.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,비활성화하거나 다른 BOM을 함께 연결되어로 BOM을 취소 할 수 없습니다
 DocType: Opportunity,Maintenance,유지
@@ -673,7 +679,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,가격 목록을 선택하지
 DocType: Employee,Family Background,가족 배경
 DocType: Process Payroll,Send Email,이메일 보내기
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},경고 : 잘못된 첨부 파일 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},경고 : 잘못된 첨부 파일 {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,아무 권한이 없습니다
 DocType: Company,Default Bank Account,기본 은행 계좌
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",파티를 기반으로 필터링하려면 선택 파티 첫 번째 유형
@@ -703,13 +709,13 @@
 DocType: Production Planning Tool,Select Items,항목 선택
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} 빌에 대해 {1} 일자 {2}
 DocType: Maintenance Visit,Completion Status,완료 상태
-DocType: Sales Invoice Item,Target Warehouse,목표웨어 하우스
+DocType: Production Order,Target Warehouse,목표웨어 하우스
 DocType: Item,Allow over delivery or receipt upto this percent,이 퍼센트 개까지 배달 또는 영수증을 통해 허용
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,예상 배달 날짜 이전에 판매 주문 날짜가 될 수 없습니다
 DocType: Upload Attendance,Import Attendance,수입 출석
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,모든 상품 그룹
 DocType: Process Payroll,Activity Log,활동 로그
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,당기 순이익 / 손실
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,당기 순이익 / 손실
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,자동 거래의 제출에 메시지를 작성합니다.
 DocType: Production Order,Item To Manufacture,제조 품목에
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} 상태가 {2}이다
@@ -717,7 +723,7 @@
 DocType: Sales Order Item,Projected Qty,수량을 예상
 DocType: Sales Invoice,Payment Due Date,지불 기한
 DocType: Newsletter,Newsletter Manager,뉴스 관리자
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,항목 변형 {0} 이미 동일한 속성을 가진 존재
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,항목 변형 {0} 이미 동일한 속성을 가진 존재
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;열기&#39;
 DocType: Notification Control,Delivery Note Message,납품서 메시지
 DocType: Expense Claim,Expenses,비용
@@ -727,7 +733,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,연구 개발 (R & D)
 ,Amount to Bill,빌 금액
 DocType: Company,Registration Details,등록 세부 사항
-DocType: Item,Re-Order Qty,다시 주문 수량
+DocType: Item Reorder,Re-Order Qty,다시 주문 수량
 DocType: Leave Block List Date,Leave Block List Date,차단 목록 날짜를 남겨
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},에 보낼 예정 {0}
 DocType: Pricing Rule,Price or Discount,가격 또는 할인
@@ -770,7 +776,7 @@
 DocType: Bank Reconciliation,Total Amount,총액
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,인터넷 게시
 DocType: Production Planning Tool,Production Orders,생산 주문
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,잔고액
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,잔고액
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,판매 가격 목록
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,항목을 동기화 게시
 DocType: Bank Reconciliation,Account Currency,계정 통화
@@ -779,7 +785,7 @@
 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 +538,Item Variants {0} updated,항목 변형 {0} 업데이트
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,항목 변형 {0} 업데이트
 DocType: Quality Inspection Reading,Reading 6,6 읽기
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,송장 전진에게 구입
 DocType: Address,Shop,상점
@@ -856,7 +862,7 @@
 DocType: POS Profile,Cash/Bank Account,현금 / 은행 계좌
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,양 또는 값의 변화없이 제거 항목.
 DocType: Delivery Note,Delivery To,에 배달
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,속성 테이블은 필수입니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,할인
@@ -884,7 +890,7 @@
 DocType: Tax Rule,Shipping State,배송 상태
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,항목 버튼 '구매 영수증에서 항목 가져 오기'를 사용하여 추가해야합니다
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,영업 비용
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,표준 구매
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,표준 구매
 DocType: GL Entry,Against,에 대하여
 DocType: Item,Default Selling Cost Center,기본 판매 비용 센터
 DocType: Sales Partner,Implementation Partner,구현 파트너
@@ -926,7 +932,7 @@
 DocType: Sales Partner,Distributor,분배 자
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,쇼핑 카트 배송 규칙
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,생산 순서는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',설정 &#39;에 추가 할인을 적용&#39;하세요
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',설정 &#39;에 추가 할인을 적용&#39;하세요
 ,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.,시간 로그를 선택하고 새로운 판매 송장을 만들 제출.
@@ -994,9 +1000,9 @@
 DocType: Contact,User ID,사용자 ID
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,보기 원장
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,처음
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group",항목 그룹이 동일한 이름을 가진 항목의 이름을 변경하거나 항목 그룹의 이름을 바꾸십시오
 DocType: Production Order,Manufacture against Sales Order,판매 주문에 대해 제조
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,세계의 나머지
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,총 지불
@@ -1026,7 +1032,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","죄송합니다, 회사는 병합 할 수 없습니다"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","죄송합니다, 회사는 병합 할 수 없습니다"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,작은
 DocType: Employee,Employee Number,직원 수
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},케이스 없음 (들)을 이미 사용.케이스 없음에서 시도 {0}
@@ -1045,7 +1051,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,농업
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,귀하의 제품이나 서비스
 DocType: Mode of Payment,Mode of Payment,결제 방식
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,웹 사이트의 이미지가 공개 파일 또는 웹 사이트 URL이어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,웹 사이트의 이미지가 공개 파일 또는 웹 사이트 URL이어야합니다
 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,창고 연락처 정보
@@ -1117,6 +1123,7 @@
 DocType: Address,Utilities,"공공요금(전기세, 상/하 수도세, 가스세, 쓰레기세 등)"
 DocType: Purchase Invoice Item,Accounting,회계
 DocType: Features Setup,Features Setup,기능 설정
+DocType: Item,Is Service Item,서비스 항목은
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,신청 기간은 외부 휴가 할당 기간이 될 수 없습니다
 DocType: Activity Cost,Projects,프로젝트
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,회계 연도를 선택하십시오
@@ -1147,7 +1154,7 @@
 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 +465,cannot be greater than 100,100보다 큰 수 없습니다
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
 DocType: Maintenance Visit,Unscheduled,예약되지 않은
 DocType: Employee,Owned,소유
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,무급 휴가에 따라 다름
@@ -1207,7 +1214,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,통치 체제
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,항목 변형
 DocType: Company,Services,Services (서비스)
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),전체 ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),전체 ({0})
 DocType: Cost Center,Parent Cost Center,부모의 비용 센터
 DocType: Sales Invoice,Source,소스
 DocType: Leave Type,Is Leave Without Pay,지불하지 않고 남겨주세요
@@ -1280,17 +1287,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,지불 이메일을 다시 보내
 DocType: Dependent Task,Dependent Task,종속 작업
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},유형의 휴가는 {0}을 넘을 수 없습니다 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,소비 금액
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0}보기
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,현금의 순 변화
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,현금의 순 변화
 DocType: Salary Structure Deduction,Salary Structure Deduction,급여 구조 공제
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,측정 단위는 {0}보다 변환 계수 표에 두 번 이상 입력 한
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,측정 단위는 {0}보다 변환 계수 표에 두 번 이상 입력 한
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},지불 요청이 이미 존재 {0}
 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 +182,Quantity must not be more than {0},수량 이하이어야한다 {0}
@@ -1352,7 +1359,7 @@
 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: Packed Item,To Warehouse (Optional),웨어 하우스 (선택 사항)
 DocType: Sales Invoice,Paid Amount (Company Currency),지불 금액 (회사 통화)
 DocType: Purchase Invoice,Additional Discount,추가 할인
 DocType: Selling Settings,Selling Settings,판매 설정
@@ -1361,7 +1368,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","회사, 월, 회계 연도는 필수입니다"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,마케팅 비용
 ,Item Shortage Report,매물 부족 보고서
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","무게도 ""무게 UOM""를 언급 해주십시오 \n, 언급"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","무게도 ""무게 UOM""를 언급 해주십시오 \n, 언급"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,자료 요청이 재고 항목을 확인하는 데 사용
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,항목의 하나의 단위.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',시간 로그 일괄 {0} '제출'해야
@@ -1372,6 +1379,7 @@
 DocType: Employee,Date Of Retirement,은퇴 날짜
 DocType: Upload Attendance,Get Template,양식 구하기
 DocType: Address,Postal,우편의
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext 설치가 완료!
 DocType: Item,Weightage,Weightage
 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,고객 그룹이 동일한 이름으로 존재하는 것은 고객의 이름을 변경하거나 고객 그룹의 이름을 바꾸십시오
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,먼저 {0}을 선택하십시오.
@@ -1400,12 +1408,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,열이 너무 많습니다.보고서를 내 보낸 스프레드 시트 응용 프로그램을 사용하여 인쇄 할 수 있습니다.
 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 +139,Main,주요 기능
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,주요 기능
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,변체
 DocType: Naming Series,Set prefix for numbering series on your transactions,트랜잭션에 일련 번호에 대한 설정 접두사
 DocType: Employee Attendance Tool,Employees HTML,직원 HTML을
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,정지 순서는 취소 할 수 없습니다.취소 멈추지.
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,기본 BOM은 ({0})이 항목 또는 템플릿에 대한 활성화되어 있어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,변종
@@ -1430,7 +1438,6 @@
 DocType: Sales Order,To Deliver and Bill,제공 및 법안
 DocType: GL Entry,Credit Amount in Account Currency,계정 통화 신용의 양
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,제조 시간 로그.
-DocType: Item,Apply Warehouse-wise Reorder Level,창고 현명한 재주문 수준을 적용
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM은 {0} 제출해야합니다
 DocType: Authorization Control,Authorization Control,권한 제어
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},행 번호 {0} : 창고 거부 거부 항목에 대해 필수입니다 {1}
@@ -1529,6 +1536,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,행 번호 {0} : 작업 {1} 생산에서 완제품 {2} 수량에 대한 완료되지 않은 주문 # {3}.시간 로그를 통해 동작 상태를 업데이트하세요
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,투자
 DocType: Issue,Resolution Details,해상도 세부 사항
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,할당
 DocType: Quality Inspection Reading,Acceptance Criteria,허용 기준
 DocType: Item Attribute,Attribute Name,속성 이름
 DocType: Item Group,Show In Website,웹 사이트에 표시
@@ -1579,7 +1587,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,비용 청구가 승인 대기 중입니다.만 비용 승인자 상태를 업데이트 할 수 있습니다.
 DocType: Purchase Invoice,Additional Discount Amount,추가 할인 금액
 DocType: Leave Block List Allow,Leave Block List Allow,차단 목록은 허용 남겨
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,약어는 비워둘수 없습니다
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,약어는 비워둘수 없습니다
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,비 그룹에 그룹
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,스포츠
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,실제 총
@@ -1620,7 +1628,7 @@
 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**.,** 회계 연도는 ** 금융 년도 나타냅니다.모든 회계 항목 및 기타 주요 거래는 ** ** 회계 연도에 대해 추적됩니다.
 DocType: Opportunity,Customer / Lead Address,고객 / 리드 주소
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},경고 : 첨부 파일에 잘못된 SSL 인증서 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},경고 : 첨부 파일에 잘못된 SSL 인증서 {0}
 DocType: Production Order Operation,Actual Operation Time,실제 작업 시간
 DocType: Authorization Rule,Applicable To (User),에 적용 (사용자)
 DocType: Purchase Taxes and Charges,Deduct,공제
@@ -1769,7 +1777,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,케이스 번호는 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,당신이 판매 팀 및 판매 파트너 (채널 파트너)가있는 경우 그들은 태그 및 영업 활동에 기여를 유지 할 수 있습니다
 DocType: Item,Show a slideshow at the top of the page,페이지의 상단에 슬라이드 쇼보기
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,상점
+DocType: Item,"Allow in Sales Order of type ""Service""",유형 &quot;서비스&quot;의 판매 주문에 허용
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,상점
 DocType: Time Log,Projects Manager,프로젝트 관리자
 DocType: Serial No,Delivery Time,배달 시간
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,을 바탕으로 고령화
@@ -1794,7 +1803,7 @@
 ,Financial Analytics,재무 분석
 DocType: Quality Inspection,Verified By,에 의해 확인
 DocType: Address,Subsidiary,자회사
-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.","기존의 트랜잭션이 있기 때문에, 회사의 기본 통화를 변경할 수 없습니다.거래 기본 통화를 변경하려면 취소해야합니다."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","기존의 트랜잭션이 있기 때문에, 회사의 기본 통화를 변경할 수 없습니다.거래 기본 통화를 변경하려면 취소해야합니다."
 DocType: Quality Inspection,Purchase Receipt No,구입 영수증 없음
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,계약금
 DocType: Process Payroll,Create Salary Slip,급여 슬립을 만듭니다
@@ -1842,7 +1851,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,원료는 비워 둘 수 없습니다.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","주식을 업데이트 할 수 없습니다, 송장은 하락 선박 항목이 포함되어 있습니다."
 DocType: Newsletter,Test,미리 보기
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'","기존의 주식 거래는의 값을 변경할 수 없습니다 \이 항목에 대한 있기 때문에 &#39;일련 번호를 가지고&#39;, &#39;배치를 가지고 없음&#39;, &#39;주식 항목으로&#39;와 &#39;평가 방법&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,빠른 분개
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,BOM 어떤 항목 agianst 언급 한 경우는 속도를 변경할 수 없습니다
@@ -1951,7 +1960,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,제발 배달 주 처음
 DocType: Purchase Invoice,Currency and Price List,통화 및 가격 목록
 DocType: Opportunity,Customer / Lead Name,고객 / 리드 명
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,통관 날짜가 언급되지 않았습니다
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,통관 날짜가 언급되지 않았습니다
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,생산
 DocType: Item,Allow Production Order,허용 생산 주문
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,행 {0} : 시작 날짜가 종료 날짜 이전이어야합니다
@@ -1961,7 +1970,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,총 적립
 DocType: Purchase Receipt,Time at which materials were received,재료가 수신 된 시간입니다
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,내 주소
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,내 주소
 DocType: Stock Ledger Entry,Outgoing Rate,보내는 속도
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,조직 분기의 마스터.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,또는
@@ -2030,7 +2039,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,고객 그룹 트리를 관리 할 수 있습니다.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,새로운 비용 센터의 이름
 DocType: Leave Control Panel,Leave Control Panel,제어판에게 남겨
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,기본 주소 템플릿을 찾을 수 없습니다.설정> 인쇄 및 브랜딩에서 새> 주소 템플릿을 생성 해주세요.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,기본 주소 템플릿을 찾을 수 없습니다.설정> 인쇄 및 브랜딩에서 새> 주소 템플릿을 생성 해주세요.
 DocType: Appraisal,HR User,HR 사용자
 DocType: Purchase Invoice,Taxes and Charges Deducted,차감 세금과 요금
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,문제
@@ -2047,7 +2056,7 @@
 ,Sales Browser,판매 브라우저
 DocType: Journal Entry,Total Credit,총 크레딧
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},경고 : 또 다른 {0} # {1} 재고 항목에 대해 존재 {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,지역정보 검색
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,큰
@@ -2066,7 +2075,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,당신이 설정 한 목표를 모니터링 할 수 있도록 모든 판매 트랜잭션은 여러 ** 판매 사람 **에 태그 할 수 있습니다.
 ,S.O. No.,SO 번호
 DocType: Production Order Operation,Make Time Log,시간 로그를 확인하십시오
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,재주문 수량을 설정하세요
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},리드에서 고객을 생성 해주세요 {0}
 DocType: Price List,Applicable for Countries,국가에 대한 적용
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,컴퓨터
@@ -2153,7 +2161,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,관련 항목을보세요
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,재고에 대한 회계 항목
 DocType: Sales Invoice,Sales Team1,판매 Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,{0} 항목이 존재하지 않습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,{0} 항목이 존재하지 않습니다
 DocType: Sales Invoice,Customer Address,고객 주소
 DocType: Payment Request,Recipient and Message,받는 사람 및 메시지
 DocType: Purchase Invoice,Apply Additional Discount On,추가 할인에 적용
@@ -2195,7 +2203,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,평가 평가
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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,로그인에게 이름 바꾸기
@@ -2233,7 +2241,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,날짜를 덜어 입력 해 주시기 바랍니다.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,휴가신청은  '승인'상태로 제출 될 수있다
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,주소 제목은 필수입니다.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,주소 제목은 필수입니다.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,메시지의 소스 캠페인 경우 캠페인의 이름을 입력
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,신문 발행인
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,회계 연도 선택
@@ -2257,6 +2265,7 @@
 DocType: UOM,Must be Whole Number,전체 숫자 여야합니다
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(일) 할당 된 새로운 잎
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,일련 번호 {0}이 (가) 없습니다
+DocType: Sales Invoice Item,Customer Warehouse (Optional),고객웨어 하우스 (선택 사항)
 DocType: Pricing Rule,Discount Percentage,할인 비율
 DocType: Payment Reconciliation Invoice,Invoice Number,송장 번호
 apps/erpnext/erpnext/hooks.py +55,Orders,명령
@@ -2366,7 +2375,7 @@
 DocType: Appraisal,Appraisal,펑가
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,날짜는 반복된다
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,공인 서명자
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},남겨 승인 중 하나 여야합니다 {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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,시작 시간
@@ -2535,7 +2544,7 @@
 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 +733,Show tax break-up,쇼 세금 해체
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,쇼 세금 해체
 apps/erpnext/erpnext/accounts/party.py +283,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',당신이 생산 활동에 참여합니다.항목을 활성화는 '제조'
@@ -2585,7 +2594,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,다시 입력 회사 이름은 확인하시기 바랍니다
@@ -2612,9 +2621,6 @@
 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,가입 날짜는 출생의 날짜보다 커야합니다
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,급여 체계
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","여러 가격 규칙이 동일한 기준 존재, 우선 순위를 할당하여 \
- 충돌을 해결하십시오.가격 규칙 : {0}"
 DocType: Account,Bank,은행
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,항공 회사
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,문제의 소재
@@ -2639,7 +2645,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,증권 및 상품 교환
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',변형에 대한 측정의 기본 단위는 &#39;{0}&#39;템플릿에서와 동일해야합니다 &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',변형에 대한 측정의 기본 단위는 &#39;{0}&#39;템플릿에서와 동일해야합니다 &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,에 의거에게 계산
 DocType: Delivery Note Item,From Warehouse,창고에서
 DocType: Purchase Taxes and Charges,Valuation and Total,평가 및 총
@@ -2648,7 +2654,7 @@
 DocType: Account,Purchase User,구매 사용자
 DocType: Notification Control,Customize the Notification,알림 사용자 지정
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,운영으로 인한 현금 흐름
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,기본 주소 템플릿을 삭제할 수 없습니다
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,기본 주소 템플릿을 삭제할 수 없습니다
 DocType: Sales Invoice,Shipping Rule,배송 규칙
 DocType: Manufacturer,Limited to 12 characters,12 자로 제한
 DocType: Journal Entry,Print Heading,인쇄 제목
@@ -2742,7 +2748,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,프로젝트 와이즈 데이터는 견적을 사용할 수 없습니다
 DocType: Project,Expected End Date,예상 종료 날짜
 DocType: Appraisal Template,Appraisal Template Title,평가 템플릿 제목
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,광고 방송
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,멋진 서비스
@@ -2761,7 +2767,7 @@
 DocType: Customer,Default Receivable Accounts,미수금 기본
 DocType: Tax Rule,Billing State,결제 주
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,이체
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),(서브 어셈블리 포함) 폭발 BOM 가져 오기
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),(서브 어셈블리 포함) 폭발 BOM 가져 오기
 DocType: Authorization Rule,Applicable To (Employee),에 적용 (직원)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,마감일은 필수입니다
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,속성에 대한 증가는 {0} 0이 될 수 없습니다
@@ -2794,7 +2800,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,부정 평가 비율은 허용되지 않습니다
 DocType: Holiday List,Weekly Off,주간 끄기
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","예를 들어, 2012 년, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),임시 이익 / 손실 (신용)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),임시 이익 / 손실 (신용)
 DocType: Sales Invoice,Return Against Sales Invoice,에 대하여 견적서를 돌려줍니다
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,항목 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},회사에 기본값 {0}을 설정하십시오 {1}
@@ -2825,6 +2831,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,자식 추가
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,역할 동결 계정 및 편집 동결 항목을 설정할 수
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,이 자식 노드를 가지고 원장 비용 센터로 변환 할 수 없습니다
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,영업 가치
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,직렬 #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,판매에 대한 수수료
 DocType: Offer Letter Term,Value / Description,값 / 설명
@@ -2858,7 +2865,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,성공적으로이 회사에 관련된 모든 트랜잭션을 삭제!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,날짜에로
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,근신
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,기본 창고 재고 상품에 대한 필수입니다.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},달의 급여의 지급 {0}과 연도 {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,자동 삽입 가격표 속도없는 경우
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,총 지불 금액
@@ -2894,7 +2900,7 @@
 DocType: Payment Tool,Set Matching Amounts,설정 매칭 금액
 DocType: Purchase Invoice,Taxes and Charges Added,추가 세금 및 수수료
 ,Sales Funnel,판매 퍼넬
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,약자는 필수입니다
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,약자는 필수입니다
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,우리의 업데이 트에 가입에 관심을 가져 주셔서 감사합니다
 ,Qty to Transfer,전송하는 수량
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,리드 또는 고객에게 인용.
@@ -2922,7 +2928,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,공급 업체 견적
 DocType: Quotation,In Words will be visible once you save the Quotation.,당신은 견적을 저장 한 단어에서 볼 수 있습니다.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1}이 정지 될
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},바코드 {0}이 (가) 이미 상품에 사용되는 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,다가오는 이벤트
@@ -2944,7 +2950,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,회계 연도 선택 ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS 프로필 POS 항목을 만드는 데 필요한
 DocType: Hub Settings,Name Token,이름 토큰
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,표준 판매
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,표준 판매
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,이어야 한 창고는 필수입니다
 DocType: Serial No,Out of Warranty,보증 기간 만료
 DocType: BOM Replace Tool,Replace,교체
@@ -3067,7 +3073,7 @@
 DocType: Sales Invoice,Paid Amount,지불 금액
 ,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,다른 기본이 없기 때문에 기본적으로이 주소 템플릿 설정
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,다른 기본이 없기 때문에 기본적으로이 주소 템플릿 설정
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","이미 직불의 계정 잔액, 당신은 같은 '신용', '균형이어야합니다'설정할 수 없습니다"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,품질 관리
 DocType: Production Planning Tool,Filter based on customer,필터 고객에 따라
@@ -3168,7 +3174,7 @@
 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 +19,Shortage Qty,부족 수량
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
 DocType: Salary Slip,Salary Slip,급여 전표
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'마감일자'필요
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","패키지가 제공하는 슬립 포장 생성합니다.패키지 번호, 패키지 내용과 그 무게를 통보하는 데 사용됩니다."
@@ -3179,7 +3185,7 @@
 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 +749,It is needed to fetch Item Details.,그것은 상품 상세을 가져 오기 위해 필요하다.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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}이 (가) 이미 수신 된
@@ -3205,6 +3211,7 @@
 DocType: BOM,Manufacturing User,제조 사용자
 DocType: Purchase Order,Raw Materials Supplied,공급 원료
 DocType: Purchase Invoice,Recurring Print Format,반복 인쇄 형식
+DocType: C-Form,Series,시리즈
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,예상 배송 날짜는 구매 주문 날짜 전에 할 수 없습니다
 DocType: Appraisal,Appraisal Template,평가 템플릿
 DocType: Item Group,Item Classification,품목 분류
@@ -3291,7 +3298,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},행 {0} : 재주문 항목이 이미이웨어 하우스 존재 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.","손실로 견적이되었습니다 때문에, 선언 할 수 없습니다."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,구매 마스터 관리자
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,생산 오더 {0} 제출해야합니다
@@ -3299,7 +3306,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,주 보고서
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,지금까지 날로부터 이전 할 수 없습니다
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc의 문서 종류
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,가격 추가/편집
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,내 주문
@@ -3347,7 +3354,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},행 번호 {0} 항목에 대한 설정 공급 업체 {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,부품 {1}에 연결된 웹 사이트 콘텐츠 {0}를 찾을 수없는
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,부품 {1}에 연결된 웹 사이트 콘텐츠 {0}를 찾을 수없는
 DocType: Issue,Content Type,컨텐츠 유형
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,컴퓨터
 DocType: Item,List this Item in multiple groups on the website.,웹 사이트에 여러 그룹에이 항목을 나열합니다.
@@ -3361,7 +3368,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,'시리얼 번호를 가지고'재고 항목에 대해 '예'일 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'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,계정 헤드
@@ -3387,7 +3394,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,계정 {0}을 닫으면 형 책임 / 주식이어야합니다
 DocType: Authorization Rule,Based On,에 근거
 DocType: Sales Order Item,Ordered Qty,수량 주문
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,항목 {0} 사용할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,항목 {0} 사용할 수 없습니다
 DocType: Stock Settings,Stock Frozen Upto,재고 동결 개까지
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},에서와 기간 반복 필수 날짜로 기간 {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,프로젝트 활동 / 작업.
@@ -3395,7 +3402,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",해당 법령에가로 선택된 경우 구매 확인해야합니다 {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,할인 100 미만이어야합니다
 DocType: Purchase Invoice,Write Off Amount (Company Currency),금액을 상각 (회사 통화)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,행 번호 {0} : 재주문 수량을 설정하세요
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,행 번호 {0} : 재주문 수량을 설정하세요
 DocType: Landed Cost Voucher,Landed Cost Voucher,착륙 비용 바우처
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},설정하십시오 {0}
 DocType: Purchase Invoice,Repeat on Day of Month,이달의 날 반복
@@ -3468,7 +3475,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,지금보기
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,송장이 자동으로 생성됩니다 기간을 선택
 DocType: BOM,Raw Material Cost,원료 비용
-DocType: Item,Re-Order Level,다시 주문 수준
+DocType: Item Reorder,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.,당신이 생산 주문을 올리거나 분석을위한 원시 자료를 다운로드하고자하는 항목 및 계획 수량을 입력합니다.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,파트 타임으로
 DocType: Employee,Applicable Holiday List,해당 휴일 목록
@@ -3523,7 +3530,7 @@
 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 +573,Please specify Attribute Value for attribute {0},속성에 대한 속성 값을 지정하십시오 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3602,7 +3609,7 @@
 DocType: Address,Office,사무실
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,회계 분개.
 DocType: Delivery Note Item,Available Qty at From Warehouse,창고에서 이용 가능한 수량
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,먼저 직원 레코드를 선택하십시오.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,먼저 직원 레코드를 선택하십시오.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,비용 계정을 입력하십시오
@@ -3677,7 +3684,7 @@
 DocType: Item Attribute,Numeric Values,숫자 값
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,로고 첨부
 DocType: Customer,Commission Rate,위원회 평가
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,변형을 확인
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,변형을 확인
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,부서에서 허가 응용 프로그램을 차단합니다.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,바구니가 비어 있습니다
 DocType: Production Order,Actual Operating Cost,실제 운영 비용
@@ -3694,15 +3701,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item",재주문 수준을 설정하려면 항목은 구매 상품 또는 제조 품목이어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),(반나절)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(반나절)
 DocType: Supplier,Credit Days,신용 일
 DocType: Leave Type,Is Carry Forward,이월된다
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,BOM에서 항목 가져 오기
diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv
index 0693f15..4794b54 100644
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% Jāmaksā
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Valūtas kurss ir tāds pats kā {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Klienta vārds
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Bankas konts nevar tikt nosaukts par {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Bankas konts nevar tikt nosaukts par {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Iekavēti {0} nevar būt mazāka par nulli ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Jauns atvaļinājuma pieteikums
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Jauns atvaļinājuma pieteikums
 apps/erpnext/erpnext/setup/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
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log par veiktajām darbībām, ko lietotāji pret uzdevumu, ko var izmantot, lai izsekotu laiku, rēķinu."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Jaunais {0}: # {1}
 ,Sales Partners Commission,Sales Partners Komisija
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Saīsinājums nedrīkst būt vairāk par 5 rakstzīmes
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Saīsinājums nedrīkst būt vairāk par 5 rakstzīmes
 DocType: Payment Request,Payment Request,Maksājuma pieprasījums
 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.",Atribūta vērtība {0} nevar noņemt no {1} kā postenī VARIANTU \ pastāv ar šo atribūtu.
@@ -195,6 +195,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,Izvēlieties Noteikumi un nosacījumi
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,out Value
 DocType: Production Planning Tool,Sales Orders,Pārdošanas pasūtījumu
 DocType: Purchase Taxes and Charges,Valuation,Vērtējums
 ,Purchase Order Trends,Pirkuma pasūtījuma tendences
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televīzija
 DocType: Production Order Operation,Updated via 'Time Log',"Atjaunināt, izmantojot ""Time Ieiet"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konts {0} nepieder Sabiedrībai {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Advance summa nevar būt lielāka par {0} {1}
 DocType: Naming Series,Series List for this Transaction,Sērija saraksts par šo darījumu
 DocType: Sales Invoice,Is Opening Entry,Vai atvēršana Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Pieminēt ja nestandarta saņemama konts piemērojams
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Izveido atalgojumu par iepriekš minētajiem kritērijiem.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Apraksts nav dota
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Pieprasīt iegādei.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/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&gt; Uzstādījumi&gt; nosaucot Series"
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Noliktava {0} nepieder uzņēmumam {1}
 DocType: Item Website Specification,Item Website Specification,Postenis Website Specifikācija
 DocType: Payment Tool,Reference No,Atsauces Nr
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Atstājiet Bloķēts
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Atstājiet Bloķēts
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,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
@@ -248,7 +250,7 @@
 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 +606,Item {0} is cancelled,Postenis {0} ir atcelts
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Postenis {0} ir atcelts
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Materiāls Pieprasījums
 DocType: Bank Reconciliation,Update Clearance Date,Update Klīrenss Datums
 DocType: Item,Purchase Details,Pirkuma Details
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Piegāde Note
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Iestatīšana Nodokļi
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} ieraksta divreiz Vienības nodokli
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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"
@@ -327,7 +329,7 @@
 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 +215,Please see attachment,"Lūdzu, skatiet pielikumu"
 DocType: Purchase Order,% Received,% Saņemts
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Setup Jau Complete !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Setup Jau Complete !!
 ,Finished Goods,Gatavās preces
 DocType: Delivery Note,Instructions,Instrukcijas
 DocType: Quality Inspection,Inspected By,Pārbaudīti Līdz
@@ -352,14 +354,13 @@
 ,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 +169,{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 +189,{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/setup_wizard/install_fixtures.py +39,Medical,Medicīnisks
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Iemesls zaudēt
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},"Darbstacija ir slēgta šādos datumos, kā par Holiday saraksts: {0}"
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Iespējas
 DocType: Employee,Single,Viens
-DocType: Issue,Attachment,Pieķeršanās
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budžets nevar iestatīt Group Cost Center
 DocType: Account,Cost of Goods Sold,Pārdotās produkcijas ražošanas izmaksas
 DocType: Purchase Invoice,Yearly,Katru gadu
@@ -388,7 +389,7 @@
 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 +564,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 +550,Attribute {0} selected multiple times in Attributes Table,Prasme {0} izvēlēts vairākas reizes atribūtos tabulā
 DocType: HR Settings,Employee record is created using selected field. ,"Darbinieku ieraksts tiek izveidota, izmantojot izvēlēto laukumu."
 DocType: Sales Order,Not Applicable,Nav piemērojams
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Holiday meistars.
@@ -427,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Kosmētika
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"To merge, following properties must be same for both items","Apvienoties, šādi īpašībām jābūt vienādam abiem posteņiem"
 DocType: Shipping Rule,Net Weight,Neto svars
 DocType: Employee,Emergency Phone,Avārijas Phone
 ,Serial No Warranty Expiry,Sērijas Nr Garantija derīguma
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Managing Apakšuzņēmēji
 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ā"
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konts {0} nav pieder uzņēmumam: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Konts {0} nav pieder uzņēmumam: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Abreviatūra jau tiek izmantots citam uzņēmumam
 DocType: Selling Settings,Default Customer Group,Default Klientu Group
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ja atslēgt ""noapaļots Kopā"" lauks nebūs redzama nevienā darījumā"
 DocType: BOM,Operating Cost,Darbības izmaksas
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Nav atrasti rēķinu tabulas ieraksti
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Lūdzu, izvēlieties Uzņēmumu un Party tips pirmais"
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Finanšu / grāmatvedības gadā.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Uzkrātās vērtības
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Atvainojiet, Serial Nos nevar tikt apvienots"
 DocType: Project Task,Project Task,Projekta uzdevums
 ,Lead Id,Potenciālā klienta ID
@@ -492,7 +495,7 @@
 DocType: Quotation,Quotation To,Citāts Lai
 DocType: Lead,Middle Income,Middle Ienākumi
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Atvere (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Default mērvienība postenī {0} nevar mainīt tieši tāpēc, ka jums jau ir zināma darījuma (-us) ar citu UOM. Jums būs nepieciešams, lai izveidotu jaunu posteni, lai izmantotu citu Default UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Default mērvienība postenī {0} nevar mainīt tieši tāpēc, ka jums jau ir zināma darījuma (-us) ar citu UOM. Jums būs nepieciešams, lai izveidotu jaunu posteni, lai izmantotu citu Default UOM."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Piešķirtā summa nevar būt negatīvs
 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.
@@ -570,7 +573,7 @@
 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 +543,Item has variants.,Prece ir varianti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -583,6 +586,7 @@
 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 +33,Goods received from Suppliers.,"Preces, kas saņemti no piegādātājiem."
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,vērtība
 DocType: Lead,Campaign Name,Kampaņas nosaukums
 ,Reserved,Rezervēts
 DocType: Purchase Order,Supply Raw Materials,Piegādes izejvielas
@@ -597,16 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Konts ar esošo darījumu nevar pārvērst par virsgrāmatā
 DocType: Delivery Note,Customer's Purchase Order No,Klienta Pasūtījuma Nr
 DocType: Employee,Cell Number,Šūnu skaits
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Materiālu Pieprasījumi Radušies
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Auto Materiālu Pieprasījumi Radušies
 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 +126,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/setup_wizard/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.
 DocType: Item Group,Website Specifications,Website specifikācijas
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Tur ir kļūda jūsu adrešu veidni {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Jauns konts
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: No {0} tipa {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rinda {0}: pārveidošanas koeficients ir obligāta
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Vairāki Cena Noteikumi pastāv ar tiem pašiem kritērijiem, lūdzu atrisināt konfliktus, piešķirot prioritāti. Cena Noteikumi: {0}"
 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.,Grāmatvedības Ierakstus var veikt pret lapu mezgliem. Ieraksti pret grupām nav atļauts.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nevar atslēgt vai anulēt BOM, jo tas ir saistīts ar citām BOMs"
 DocType: Opportunity,Maintenance,Uzturēšana
@@ -649,7 +655,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,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/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Brīdinājums: Invalid Pielikums {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Brīdinājums: Invalid Pielikums {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nē Atļauja
 DocType: Company,Default Bank Account,Default bankas kontu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Lai filtrētu pamatojoties uz partijas, izvēlieties Party Type pirmais"
@@ -679,13 +685,13 @@
 DocType: Production Planning Tool,Select Items,Izvēlieties preces
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} pret likumprojektu {1} datēts {2}
 DocType: Maintenance Visit,Completion Status,Pabeigšana statuss
-DocType: Sales Invoice Item,Target Warehouse,Mērķa Noliktava
+DocType: Production Order,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 +50,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/setup_wizard/install_fixtures.py +17,All Item Groups,Visi punkts grupas
 DocType: Process Payroll,Activity Log,Aktivitāte Log
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Neto peļņa / zaudējumi
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Neto peļņa / zaudējumi
 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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} statuss ir {2}
@@ -693,7 +699,7 @@
 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
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Postenis Variant {0} jau eksistē ar tiem pašiem atribūtiem
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Postenis Variant {0} jau eksistē ar tiem pašiem atribūtiem
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Atklāšana&quot;
 DocType: Notification Control,Delivery Note Message,Piegāde Note Message
 DocType: Expense Claim,Expenses,Izdevumi
@@ -703,7 +709,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Pētniecība un attīstība
 ,Amount to Bill,"Summa, Bill"
 DocType: Company,Registration Details,Reģistrācija Details
-DocType: Item,Re-Order Qty,Re-Order Daudz
+DocType: Item Reorder,Re-Order Qty,Re-Order Daudz
 DocType: Leave Block List Date,Leave Block List Date,Atstājiet Block saraksts datums
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Plānots sūtīt uz {0}
 DocType: Pricing Rule,Price or Discount,Cenu vai Atlaide
@@ -746,7 +752,7 @@
 DocType: Bank Reconciliation,Total Amount,Kopējā summa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Interneta Publishing
 DocType: Production Planning Tool,Production Orders,Ražošanas Pasūtījumi
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Bilance Value
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Bilance Value
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Pārdošanas Cenrādis
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicēt sinhronizēt priekšmetus
 DocType: Bank Reconciliation,Account Currency,Konta valūta
@@ -755,7 +761,7 @@
 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 +538,Item Variants {0} updated,Postenis Variants {0} atjaunināta
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -832,7 +838,7 @@
 DocType: POS Profile,Cash/Bank Account,Naudas / bankas kontu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Atribūts tabula ir obligāta
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Atlaide
@@ -860,7 +866,7 @@
 DocType: Tax Rule,Shipping State,Piegāde Valsts
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Postenī, jāpievieno, izmantojot ""dabūtu preces no pirkumu čekus 'pogu"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Pārdošanas izmaksas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Standard Pirkšana
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Standard Pirkšana
 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
@@ -902,7 +908,7 @@
 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 +210,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/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Lūdzu noteikt &quot;piemērot papildu Atlaide On&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Lūdzu noteikt &quot;piemērot papildu Atlaide On&quot;
 ,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."
@@ -970,9 +976,9 @@
 DocType: Contact,User ID,Lietotāja ID
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,View Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Senākās
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Izgatavojam pret pārdošanas rīkojumu
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Pārējā pasaule
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1002,7 +1008,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Atvainojiet, uzņēmumi nevar tikt apvienots"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Atvainojiet, uzņēmumi nevar tikt apvienots"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Mazs
 DocType: Employee,Employee Number,Darbinieku skaits
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"Gadījums (-i), kas jau ir lietošanā. Izmēģināt no lietā Nr {0}"
@@ -1021,7 +1027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Lauksaimniecība
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Savus produktus vai pakalpojumus
 DocType: Mode of Payment,Mode of Payment,Maksājuma veidu
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Website Image vajadzētu būt publiski failu vai tīmekļa URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Website Image vajadzētu būt publiski failu vai tīmekļa URL
 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
@@ -1093,6 +1099,7 @@
 DocType: Address,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,Grāmatvedība
 DocType: Features Setup,Features Setup,Features Setup
+DocType: Item,Is Service Item,Vai Service postenis
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Pieteikumu iesniegšanas termiņš nevar būt ārpus atvaļinājuma piešķiršana periods
 DocType: Activity Cost,Projects,Projekti
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Lūdzu, izvēlieties saimnieciskais gads"
@@ -1123,7 +1130,7 @@
 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 +465,cannot be greater than 100,nevar būt lielāks par 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Postenis {0} nav krājums punkts
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1182,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Valdība
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Postenis Variants
 DocType: Company,Services,Pakalpojumi
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Kopā ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Kopā ({0})
 DocType: Cost Center,Parent Cost Center,Parent Izmaksu centrs
 DocType: Sales Invoice,Source,Avots
 DocType: Leave Type,Is Leave Without Pay,Vai atstāt bez Pay
@@ -1255,17 +1262,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Atkārtoti nosūtīt maksājumu E-pasts
 DocType: Dependent Task,Dependent Task,Atkarīgs Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} View
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Neto izmaiņas naudas
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Neto izmaiņas naudas
 DocType: Salary Structure Deduction,Salary Structure Deduction,Algu struktūra atskaitīšana
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Maksājuma pieprasījums jau eksistē {0}
 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 +182,Quantity must not be more than {0},Daudzums nedrīkst būt lielāks par {0}
@@ -1327,7 +1334,7 @@
 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: Packed 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
@@ -1336,7 +1343,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Company, mēnesis un gads tiek obligāta"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Mārketinga izdevumi
 ,Item Shortage Report,Postenis trūkums ziņojums
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Svars ir minēts, \ nLūdzu nerunājot ""Svara UOM"" too"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Svars ir minēts, \ nLūdzu nerunājot ""Svara UOM"" too"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,"Materiāls Pieprasījums izmantoti, lai šā krājuma Entry"
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Viena vienība posteņa.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',"Time Log Partijas {0} ir ""Iesniegtie"""
@@ -1347,6 +1354,7 @@
 DocType: Employee,Date Of Retirement,Brīža līdz pensionēšanās
 DocType: Upload Attendance,Get Template,Saņemt Template
 DocType: Address,Postal,Pasta
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 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"
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,"Lūdzu, izvēlieties {0} pirmās."
@@ -1375,12 +1383,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,"Pārāk daudz kolonnas. Eksportēt ziņojumu un izdrukāt to, izmantojot izklājlapu lietotni."
 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 +139,Main,Galvenais
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Galvenais
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variants
 DocType: Naming Series,Set prefix for numbering series on your transactions,Uzstādīt tituls numerāciju sērijas par jūsu darījumiem
 DocType: Employee Attendance Tool,Employees HTML,darbinieki HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,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 +367,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/stock/doctype/item/item.py +361,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
@@ -1405,7 +1413,6 @@
 DocType: Sales Order,To Deliver and Bill,Rīkoties un Bill
 DocType: GL Entry,Credit Amount in Account Currency,Kredīta summa konta valūtā
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Laika Baļķi ražošanā.
-DocType: Item,Apply Warehouse-wise Reorder Level,Piesakies Warehouse-gudro Pārkārtot Level
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} jāiesniedz
 DocType: Authorization Control,Authorization Control,Autorizācija Control
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Noraidīts Warehouse ir obligāta pret noraidīts postenī {1}
@@ -1503,6 +1510,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,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} nav pabeigta {2} Daudz gatavo preču ražošanas kārtību # {3}. Lūdzu, atjauniniet darbības statusu, izmantojot Time Baļķi"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investīcijas
 DocType: Issue,Resolution Details,Izšķirtspēja Details
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,piešķīrumi
 DocType: Quality Inspection Reading,Acceptance Criteria,Pieņemšanas kritēriji
 DocType: Item Attribute,Attribute Name,Atribūta nosaukums
 DocType: Item Group,Show In Website,Show In Website
@@ -1553,7 +1561,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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
 DocType: Leave Block List Allow,Leave Block List Allow,Atstājiet Block Latviešu Atļaut
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr nevar būt tukšs vai telpa
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr nevar būt tukšs vai telpa
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Group Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sporta
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Kopā Faktiskais
@@ -1594,7 +1602,7 @@
 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 **.
 DocType: Opportunity,Customer / Lead Address,Klients / Lead adrese
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Brīdinājums: Invalid SSL sertifikātu par arestu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Brīdinājums: Invalid SSL sertifikātu par arestu {0}
 DocType: Production Order Operation,Actual Operation Time,Faktiskais Darbības laiks
 DocType: Authorization Rule,Applicable To (User),Piemērojamais Lai (lietotājs)
 DocType: Purchase Taxes and Charges,Deduct,Atskaitīt
@@ -1743,7 +1751,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case No. nevar būt 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,"Ja jums ir pārdošanas komandas un Sale Partneri (kanāla partneri), tās var iezīmētas un saglabāt savu ieguldījumu pārdošanas aktivitātes"
 DocType: Item,Show a slideshow at the top of the page,Parādiet slaidrādi augšpusē lapas
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Veikali
+DocType: Item,"Allow in Sales Order of type ""Service""",Atļaut pārdošanas rīkojumu tipa &quot;Service&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Veikali
 DocType: Time Log,Projects Manager,Projektu vadītāja
 DocType: Serial No,Delivery Time,Piegādes laiks
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Novecošanās Based On
@@ -1768,7 +1777,7 @@
 ,Financial Analytics,Finanšu Analytics
 DocType: Quality Inspection,Verified By,Verified by
 DocType: Address,Subsidiary,Filiāle
-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.","Nevar mainīt uzņēmuma noklusējuma valūtu, jo ir kādi darījumi. Darījumi jāanulē, lai mainītu noklusējuma valūtu."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nevar mainīt uzņēmuma noklusējuma valūtu, jo ir kādi darījumi. Darījumi jāanulē, lai mainītu noklusējuma valūtu."
 DocType: Quality Inspection,Purchase Receipt No,Pirkuma čeka Nr
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Rokas naudas
 DocType: Process Payroll,Create Salary Slip,Izveidot algas lapu
@@ -1816,7 +1825,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Izejvielas nevar būt tukšs.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Nevarēja atjaunināt sastāvu, rēķins ir piliens kuģniecības objektu."
 DocType: Newsletter,Test,Pārbaude
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 &quot;Has Sērijas nē&quot;, &quot;Vai partijas Nē&quot;, &quot;Vai Stock Vienība&quot; un &quot;vērtēšanas metode&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Jūs nevarat mainīt likmi, ja BOM minēja agianst jebkuru posteni"
@@ -1905,7 +1914,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Lūdzu Piegāde piezīme pirmais
 DocType: Purchase Invoice,Currency and Price List,Valūta un Cenrādis
 DocType: Opportunity,Customer / Lead Name,Klients / Lead Name
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Klīrenss datums nav minēts
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Klīrenss datums nav minēts
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Ražošana
 DocType: Item,Allow Production Order,Atļaut Ražošanas rīkojums
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Rinda {0}: Sākuma datumam jābūt pirms beigu datuma
@@ -1915,7 +1924,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 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 +118,My Addresses,Mani adreses
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Mani adreses
 DocType: Stock Ledger Entry,Outgoing Rate,Izejošais Rate
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Organizācija filiāle meistars.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,vai
@@ -1984,7 +1993,7 @@
 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 +302,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 +95,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."
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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
 DocType: Purchase Invoice,Taxes and Charges Deducted,Nodokļi un maksājumi Atskaitīts
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Jautājumi
@@ -2001,7 +2010,7 @@
 ,Sales Browser,Sales Browser
 DocType: Journal Entry,Total Credit,Kopā Credit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,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/setup_wizard/setup_wizard.py +392,Local,Vietējs
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Liels
@@ -2020,7 +2029,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Visi pārdošanas darījumi var tagged pret vairāku ** pārdevēji **, lai jūs varat noteikt un kontrolēt mērķus."
 ,S.O. No.,SO No.
 DocType: Production Order Operation,Make Time Log,Padarīt Time Ieiet
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Lūdzu noteikt pasūtīšanas daudzumu
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},"Lūdzu, izveidojiet Klientam no Svins {0}"
 DocType: Price List,Applicable for Countries,Piemērojams valstīs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Datori
@@ -2095,7 +2103,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Saņemt attiecīgus ierakstus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Grāmatvedības Entry par noliktavā
 DocType: Sales Invoice,Sales Team1,Sales team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Postenis {0} nepastāv
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Postenis {0} nepastāv
 DocType: Sales Invoice,Customer Address,Klientu adrese
 DocType: Payment Request,Recipient and Message,Saņēmējs un Message
 DocType: Purchase Invoice,Apply Additional Discount On,Piesakies Papildu atlaide
@@ -2137,7 +2145,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Vērtēšanas Rate
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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
@@ -2175,7 +2183,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Ievadiet atbrīvojot datumu.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Tikai ar statusu ""Apstiprināts"" var iesniegt Atvaļinājuma pieteikumu"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Adrese sadaļa ir obligāta.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Adrese sadaļa ir obligāta.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Ievadiet nosaukumu, kampaņas, ja avots izmeklēšanas ir kampaņa"
 apps/erpnext/erpnext/setup/setup_wizard/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
@@ -2199,6 +2207,7 @@
 DocType: UOM,Must be Whole Number,Jābūt veselam skaitlim
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Jaunas lapas Piešķirtas (dienās)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Sērijas Nr {0} nepastāv
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Klientu Noliktava (pēc izvēles)
 DocType: Pricing Rule,Discount Percentage,Atlaide procentuālā
 DocType: Payment Reconciliation Invoice,Invoice Number,Rēķina numurs
 apps/erpnext/erpnext/hooks.py +55,Orders,Pasūtījumi
@@ -2308,7 +2317,7 @@
 DocType: Appraisal,Appraisal,Novērtējums
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datums tiek atkārtots
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Autorizēts Parakstītājs
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,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 +184,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
@@ -2477,7 +2486,7 @@
 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
 DocType: Sales Order Item,Supplier delivers to Customer,Piegādātājs piegādā Klientam
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Rādīt nodokļu break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Rādīt nodokļu break-up
 apps/erpnext/erpnext/accounts/party.py +283,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"""
@@ -2526,7 +2535,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,"Lūdzu, atkārtoti tipa uzņēmuma nosaukums, lai apstiprinātu"
@@ -2553,8 +2562,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Algu struktūra
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"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/setup_wizard/industry_type.py +9,Airline,Aviokompānija
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Jautājums Materiāls
@@ -2579,7 +2586,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vērtspapīru un preču biržu
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default mērvienība Variant &#39;{0}&#39; jābūt tāds pats kā Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default mērvienība Variant &#39;{0}&#39; jābūt tāds pats kā Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,"Aprēķināt, pamatojoties uz"
 DocType: Delivery Note Item,From Warehouse,No Noliktava
 DocType: Purchase Taxes and Charges,Valuation and Total,Vērtēšana un Total
@@ -2588,7 +2595,7 @@
 DocType: Account,Purchase User,Iegādāties lietotāju
 DocType: Notification Control,Customize the Notification,Pielāgot paziņojumu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Naudas plūsma no darbības
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Default Adrese Template nevar izdzēst
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Default Adrese Template nevar izdzēst
 DocType: Sales Invoice,Shipping Rule,Piegāde noteikums
 DocType: Manufacturer,Limited to 12 characters,Ierobežots līdz 12 simboliem
 DocType: Journal Entry,Print Heading,Print virsraksts
@@ -2681,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,Tirdzniecības
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
@@ -2700,7 +2707,7 @@
 DocType: Customer,Default Receivable Accounts,Default parādi Debitoru
 DocType: Tax Rule,Billing State,Norēķinu Valsts
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Nodošana
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Atnest eksplodēja BOM (ieskaitot mezglus)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,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 +95,Due Date is mandatory,Due Date ir obligāts
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Pieaugums par atribūtu {0} nevar būt 0
@@ -2733,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Pagaidu peļņa / zaudējumi (kredīts)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Pagaidu peļņa / zaudējumi (kredīts)
 DocType: Sales Invoice,Return Against Sales Invoice,Atgriešanās ar pārdošanas rēķinu
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Prece 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Lūdzu iestatīt noklusēto vērtību {0} kompānijā {1}
@@ -2764,6 +2771,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Pievienot Child
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Loma atļauts noteikt iesaldētos kontus un rediģēt Saldētas Ieraksti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Nevar pārvērst izmaksu centru, lai grāmatai, jo tā ir bērnu mezgliem"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,atklāšanas Value
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Sērijas #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Komisijas apjoms
 DocType: Offer Letter Term,Value / Description,Vērtība / Apraksts
@@ -2797,7 +2805,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Veiksmīgi svītrots visas ar šo uzņēmumu darījumus!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kā datumā
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probācija
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Default Noliktava ir obligāta krājumu postenī.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Samaksa algas par mēnesi {0} un gads {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto ievietot Cenrādis likme, ja trūkst"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Kopējais samaksāto summu
@@ -2833,7 +2840,7 @@
 DocType: Payment Tool,Set Matching Amounts,Uzlikt atbilstības Summas
 DocType: Purchase Invoice,Taxes and Charges Added,Nodokļi un maksājumi Pievienoja
 ,Sales Funnel,Pārdošanas piltuve
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Saīsinājums ir obligāta
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Saīsinājums ir obligāta
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Paldies par jūsu interesi par Parakstoties uz mūsu jaunumiem
 ,Qty to Transfer,Daudz Transfer
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citāti par potenciālajiem klientiem vai klientiem.
@@ -2861,7 +2868,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0}{1} ir apturēta
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Svītrkodu {0} jau izmanto postenī {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Gaidāmie notikumi
@@ -2883,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Izvēlieties fiskālajā gadā ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS Profile jāveic POS Entry
 DocType: Hub Settings,Name Token,Nosaukums Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Standard pārdošana
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Standard pārdošana
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -3006,7 +3013,7 @@
 DocType: Sales Invoice,Paid Amount,Samaksāta summa
 ,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"
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,"Šī adrese veidne kā noklusējuma iestatījums, jo nav cita noklusējuma"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konta atlikums jau debets, jums nav atļauts noteikt ""Balance Must Be"", jo ""Kredīts"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Kvalitātes vadība
 DocType: Production Planning Tool,Filter based on customer,"Filtrs, pamatojoties uz klientu"
@@ -3107,7 +3114,7 @@
 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 +19,Shortage Qty,Trūkums Daudz
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Postenis variants {0} nepastāv ar tiem pašiem atribūtiem
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Lai datums"" ir nepieciešama"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Izveidot iepakošanas lapas par paketes jāpiegādā. Izmanto, lai paziņot Iepakojumu skaits, iepakojuma saturu un tā svaru."
@@ -3118,7 +3125,7 @@
 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 +749,It is needed to fetch Item Details.,"Tas ir vajadzīgs, lai atnest Papildus informācija."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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
@@ -3144,6 +3151,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: C-Form,Series,Sērija
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,Postenis klasifikācija
@@ -3219,7 +3227,7 @@
 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 +434,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 +420,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."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Pirkuma Master vadītājs
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Ražošanas Order {0} jāiesniedz
@@ -3227,7 +3235,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Galvenie Ziņojumi
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Līdz šim nevar būt agrāk no dienas
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Pievienot / rediģēt Cenas
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Mani Pasūtījumi
@@ -3275,7 +3283,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Row # {0}: Set Piegādātājs posteni {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Website Image {0} pievienots posteni {1} nevar atrast
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Website Image {0} pievienots posteni {1} nevar atrast
 DocType: Issue,Content Type,Content Type
 apps/erpnext/erpnext/setup/setup_wizard/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ā.
@@ -3289,7 +3297,7 @@
 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 +357,'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 +351,'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
@@ -3315,7 +3323,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Noslēguma kontu {0} jābūt tipa Atbildības / Equity
 DocType: Authorization Rule,Based On,Pamatojoties uz
 DocType: Sales Order Item,Ordered Qty,Sakārtots Daudz
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Postenis {0} ir invalīds
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +168,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.
@@ -3323,7 +3331,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Pirkšana jāpārbauda, ja nepieciešams, par ir izvēlēts kā {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Atlaide jābūt mazāk nekā 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Norakstīt summu (Company valūta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Row # {0}: Lūdzu noteikt pasūtīšanas daudzumu
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Row # {0}: Lūdzu noteikt pasūtīšanas daudzumu
 DocType: Landed Cost Voucher,Landed Cost Voucher,Izkrauti izmaksas kuponu
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Lūdzu noteikt {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Atkārtot mēneša diena
@@ -3395,7 +3403,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Skatīt Tagad
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Izvēlieties laiku, kad rēķins tiks ģenerētas automātiski"
 DocType: BOM,Raw Material Cost,Izejvielas izmaksas
-DocType: Item,Re-Order Level,Re-Order līmenis
+DocType: Item Reorder,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.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Nepilna laika
 DocType: Employee,Applicable Holiday List,Piemērojams brīvdienu sarakstu
@@ -3450,7 +3458,7 @@
 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 +573,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 +559,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}
@@ -3529,7 +3537,7 @@
 DocType: Address,Office,Birojs
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Grāmatvedības dienasgrāmatas ieraksti.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Pieejams Daudz at No noliktavas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,"Lūdzu, izvēlieties Darbinieku Ierakstīt pirmās."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,"Lūdzu, izvēlieties Darbinieku Ierakstīt pirmās."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,Ievadiet izdevumu kontu
@@ -3604,7 +3612,7 @@
 DocType: Item Attribute,Numeric Values,Skaitliskām vērtībām
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Pievienojiet Logo
 DocType: Customer,Commission Rate,Komisija Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Padarīt Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Padarīt Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Block atvaļinājums iesniegumi departamentā.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Grozs ir tukšs
 DocType: Production Order,Actual Operating Cost,Faktiskā ekspluatācijas izmaksas
@@ -3621,15 +3629,14 @@
 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 +380,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 +419,"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 +408,"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 +380, (Half Day),(puse dienas)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Dabūtu preces no BOM
diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv
index f6592cf..1a9d6a3 100644
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% Опишан
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Девизниот курс мора да биде иста како {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Име на купувачи
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Банкарска сметка не може да се именува како {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Банкарска сметка не може да се именува како {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Најдобро за {0} не може да биде помала од нула ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Нов Оставете апликација
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Нов Оставете апликација
 apps/erpnext/erpnext/setup/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,Начин на плаќање сметка
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Дневник на дејностите што се вршат од страна на корисниците против задачи кои може да се користи за следење на времето, платежна."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Нов {0}: # {1}
 ,Sales Partners Commission,Продај Партнери комисија
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Кратенка не може да има повеќе од 5 знаци
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Кратенка не може да има повеќе од 5 знаци
 DocType: Payment Request,Payment Request,Барање за исплата
 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.",Вредноста на атрибутот {0} не може да биде отстранет од {1} како точка Варијанти \ постојат со овој атрибут.
@@ -195,6 +195,7 @@
 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 (%),Попуст на Ценовник стапка (%)
 DocType: Offer Letter,Select Terms and Conditions,Изберете Услови и правила
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,Од вредност
 DocType: Production Planning Tool,Sales Orders,Продај Нарачка
 DocType: Purchase Taxes and Charges,Valuation,Вреднување
 ,Purchase Order Trends,Нарачка трендови
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Телевизија
 DocType: Production Order Operation,Updated via 'Time Log',Ажурираат преку &quot;Време Вклучи се &#39;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},На сметка {0} не му припаѓа на компанијата {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Однапред сума не може да биде поголема од {0} {1}
 DocType: Naming Series,Series List for this Transaction,Серија Листа за оваа трансакција
 DocType: Sales Invoice,Is Opening Entry,Се отвора Влегување
 DocType: Customer Group,Mention if non-standard receivable account applicable,Да се наведе ако нестандардни побарувања сметка за важечките
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Создава плата се лизга за горенаведените критериуми.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Нема опис даден
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Барање за купување.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Само избраните Остави Approver може да го достави овој Оставете апликација
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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} преку подесување&gt; Settings&gt; Именување Серија
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Магацински {0} не му припаѓа на компанијата {1}
 DocType: Item Website Specification,Item Website Specification,Точка на вебсајт Спецификација
 DocType: Payment Tool,Reference No,Референтен број
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Остави блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,Остави блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Акции помирување Точка
 DocType: Stock Entry,Sales Invoice No,Продај фактура Не
@@ -248,7 +250,7 @@
 DocType: Pricing Rule,Supplier Type,Добавувачот Тип
 DocType: Item,Publish in Hub,Објави во Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,Точка {0} е откажана
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Точка {0} е откажана
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Материјал Барање
 DocType: Bank Reconciliation,Update Clearance Date,Ажурирање Чистење Датум
 DocType: Item,Purchase Details,Купување Детали за
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Потврда за испорака
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Поставување Даноци
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Плаќање Влегување е изменета откако ќе го влечат. Ве молиме да се повлече повторно.
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} влезе двапати во точка Данок
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,Ве молиме изберете месец и година
@@ -327,7 +329,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Вашиот е-мејл адреса
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,Ве молиме погледнете приврзаност
 DocType: Purchase Order,% Received,% Доби
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Поставување веќе е завршено !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Поставување веќе е завршено !!
 ,Finished Goods,Готови производи
 DocType: Delivery Note,Instructions,Инструкции
 DocType: Quality Inspection,Inspected By,Прегледано од страна на
@@ -352,14 +354,13 @@
 ,Purchase Register,Купување Регистрирај се
 DocType: Landed Cost Item,Applicable Charges,Се применува Давачки
 DocType: Workstation,Consumable Cost,Потрошни Цена
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора да имаат улога &quot;Остави Approver&quot;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора да имаат улога &quot;Остави Approver&quot;
 DocType: Purchase Receipt,Vehicle Date,Датум на возилото
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Медицинска
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина за губење
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Работна станица е затворена на следните датуми како на летни Листа на: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Можности
 DocType: Employee,Single,Еден
-DocType: Issue,Attachment,Прилог
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Буџетот не може да се постави на трошоците центар група
 DocType: Account,Cost of Goods Sold,Трошоците на продадени производи
 DocType: Purchase Invoice,Yearly,Годишно
@@ -388,7 +389,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} одбрани неколку пати во атрибути на табелата
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} одбрани неколку пати во атрибути на табелата
 DocType: HR Settings,Employee record is created using selected field. ,Рекорд вработен е креирана преку избрани поле.
 DocType: Sales Order,Not Applicable,Не е применливо
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Одмор господар.
@@ -427,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Козметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items","За да се логирате, следниве својства мора да биде иста за двата предмети"
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","За да се логирате, следниве својства мора да биде иста за двата предмети"
 DocType: Shipping Rule,Net Weight,Нето тежина
 DocType: Employee,Emergency Phone,Итни Телефон
 ,Serial No Warranty Expiry,Сериски Нема гаранција Важи
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Управување Склучување
 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,Стапка по која Ценовник валута е претворена во основна валута компанијата
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},На сметка {0} не му припаѓа на компанијата: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},На сметка {0} не му припаѓа на компанијата: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Кратенка веќе се користи за друга компанија
 DocType: Selling Settings,Default Customer Group,Стандардната група на потрошувачи
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ако оневозможи, полето &quot;Заоблени Вкупно &#39;не ќе бидат видливи во секоја трансакција"
 DocType: BOM,Operating Cost,Оперативните трошоци
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Не се пронајдени во табелата Фактура рекорди
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Ве молиме изберете компанија и Партијата Тип прв
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Финансиски / пресметковната година.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Акумулирана вредности
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","За жал, сериски броеви не можат да се спојат"
 DocType: Project Task,Project Task,Проектна задача
 ,Lead Id,Водач Id
@@ -492,7 +495,7 @@
 DocType: Quotation,Quotation To,Котација на
 DocType: Lead,Middle Income,Среден приход
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Отворање (ЦР)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Стандардно единица мерка за Точка {0} не можат да се менуваат директно затоа што веќе се направени некои трансакција (а) со друг UOM. Ќе треба да се создаде нова точка да се користи различен Default UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Стандардно единица мерка за Точка {0} не можат да се менуваат директно затоа што веќе се направени некои трансакција (а) со друг UOM. Ќе треба да се создаде нова точка да се користи различен Default UOM.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Распределени износ не може да биде негативен
 DocType: Purchase Order Item,Billed Amt,Таксуваната Амт
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Логична Магацински против кои се направени записи парк.
@@ -570,7 +573,7 @@
 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 +543,Item has variants.,Ставка има варијанти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,Тип на дрвото
@@ -583,6 +586,7 @@
 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 +33,Goods received from Suppliers.,Примената стока од добавувачите.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,во вредност
 DocType: Lead,Campaign Name,Име на кампања
 ,Reserved,Задржани
 DocType: Purchase Order,Supply Raw Materials,Снабдување со суровини
@@ -597,16 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Сметка со постоечките трансакцијата не може да се конвертира Леџер
 DocType: Delivery Note,Customer's Purchase Order No,Клиентите нарачка Не
 DocType: Employee,Cell Number,Мобилен Број
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Авто Материјал Барања Генерирано
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Авто Материјал Барања Генерирано
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Си ја заборавивте
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Вие не може да влезе во тековната ваучер во &quot;Против весник Влегување&quot; колона
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Енергија
 DocType: Opportunity,Opportunity From,Можност од
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Месечен извештај плата.
 DocType: Item Group,Website Specifications,Веб-страница Спецификации
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Има грешка во Вашата адреса шаблонот {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Нова сметка
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Од {0} од типот на {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор на конверзија е задолжително
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Повеќе Правила Цена постои со истите критериуми, ве молиме да го реши конфликтот со давање приоритет. Правила Цена: {0}"
 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.,Сметководствени записи може да се направи против лист јазли. Записи од групите не се дозволени.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да го деактивирате или да го откажете Бум како што е поврзано со други BOMs
 DocType: Opportunity,Maintenance,Одржување
@@ -649,7 +655,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,Ценовник не е избрано
 DocType: Employee,Family Background,Семејно потекло
 DocType: Process Payroll,Send Email,Испрати E-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Предупредување: Невалиден прилог {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Предупредување: Невалиден прилог {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Нема дозвола
 DocType: Company,Default Bank Account,Стандардно банкарска сметка
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","За филтрирање врз основа на партија, изберете партија Тип прв"
@@ -679,13 +685,13 @@
 DocType: Production Planning Tool,Select Items,Одбирајте ги изборните ставки
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} од Бил {1} датум {2}
 DocType: Maintenance Visit,Completion Status,Проектот Статус
-DocType: Sales Invoice Item,Target Warehouse,Целна Магацински
+DocType: Production Order,Target Warehouse,Целна Магацински
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволете врз доставувањето или приемот до овој процент
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,Се очекува испорака датум не може да биде пред Продај Побарувања Датум
 DocType: Upload Attendance,Import Attendance,Увоз Публика
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Сите Точка групи
 DocType: Process Payroll,Activity Log,Активност Влез
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Нето добивка / загуба
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Нето добивка / загуба
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматски компонира порака на поднесување на трансакции.
 DocType: Production Order,Item To Manufacture,Ставка за производство
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статус е {2}
@@ -693,7 +699,7 @@
 DocType: Sales Order Item,Projected Qty,Проектирани Количина
 DocType: Sales Invoice,Payment Due Date,Плаќање Поради Датум
 DocType: Newsletter,Newsletter Manager,Билтен менаџер
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Ставка Варијанта {0} веќе постои со истите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Ставка Варијанта {0} веќе постои со истите атрибути
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Отворање&#39;
 DocType: Notification Control,Delivery Note Message,Испратница порака
 DocType: Expense Claim,Expenses,Трошоци
@@ -703,7 +709,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Истражување и развој
 ,Amount to Bill,Износот на Бил
 DocType: Company,Registration Details,Детали за регистрација
-DocType: Item,Re-Order Qty,Повторно да Количина
+DocType: Item Reorder,Re-Order Qty,Повторно да Количина
 DocType: Leave Block List Date,Leave Block List Date,Остави Забрани Листа Датум
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Треба да се испрати до {0}
 DocType: Pricing Rule,Price or Discount,Цена или попуст
@@ -746,7 +752,7 @@
 DocType: Bank Reconciliation,Total Amount,Вкупниот износ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Интернет издаваштво
 DocType: Production Planning Tool,Production Orders,Производство Нарачка
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Биланс вредност
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Биланс вредност
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Цена за продажба Листа
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Го објави за да ги синхронизирате предмети
 DocType: Bank Reconciliation,Account Currency,Валута сметка
@@ -755,7 +761,7 @@
 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 +538,Item Variants {0} updated,Точка Варијанти {0} ажурирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,Точка Варијанти {0} ажурирани
 DocType: Quality Inspection Reading,Reading 6,Читање 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Купување на фактура напредување
 DocType: Address,Shop,Продавница
@@ -832,7 +838,7 @@
 DocType: POS Profile,Cash/Bank Account,Пари / банка сметка
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Отстранет предмети без промена во количината или вредноста.
 DocType: Delivery Note,Delivery To,Испорака на
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,Атрибут маса е задолжително
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Попуст
@@ -860,7 +866,7 @@
 DocType: Tax Rule,Shipping State,Превозот држава
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Ставка мора да се додаде со користење на &quot;се предмети од Набавка Разписки&quot; копчето
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Трошоци за продажба
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Стандардна Купување
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Стандардна Купување
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,Стандардно Продажба Цена центар
 DocType: Sales Partner,Implementation Partner,Партнер имплементација
@@ -902,7 +908,7 @@
 DocType: Sales Partner,Distributor,Дистрибутер
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корпа за испорака Правило
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,Производство на налози {0} мора да биде укинат пред да го раскине овој Продај Побарувања
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Ве молиме да се постави на &quot;Примени Дополнителни попуст на &#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Ве молиме да се постави на &quot;Примени Дополнителни попуст на &#39;
 ,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.,Изберете Време на дневници и поднесете да се создаде нов Продај фактура.
@@ -970,9 +976,9 @@
 DocType: Contact,User ID,ID на корисникот
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Види Леџер
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Први
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group","Ставка група постои со истото име, Ве молиме да се промени името на точка или преименувате групата точка"
 DocType: Production Order,Manufacture against Sales Order,Производство против Продај Побарувања
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Остатокот од светот
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,Бруто плата
@@ -1002,7 +1008,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","За жал, компаниите не можат да се спојат"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","За жал, компаниите не можат да се спојат"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Мали
 DocType: Employee,Employee Number,Број вработен
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Нема случај (и) веќе е во употреба. Обидете се од случај не {0}
@@ -1021,7 +1027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Земјоделството
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Вашите производи или услуги
 DocType: Mode of Payment,Mode of Payment,Начин на плаќање
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Веб-страница на слика треба да биде јавен датотеката или URL на веб страната
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Веб-страница на слика треба да биде јавен датотеката или URL на веб страната
 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,Магацински Контакт Инфо
@@ -1093,6 +1099,7 @@
 DocType: Address,Utilities,Комунални услуги
 DocType: Purchase Invoice Item,Accounting,Сметководство
 DocType: Features Setup,Features Setup,Карактеристики подесување
+DocType: Item,Is Service Item,Е послужната ствар
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Период апликација не може да биде надвор одмор период распределба
 DocType: Activity Cost,Projects,Проекти
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Ве молиме изберете фискалната година
@@ -1123,7 +1130,7 @@
 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 +465,cannot be greater than 100,не може да биде поголема од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Точка {0} не е парк Точка
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Точка {0} не е парк Точка
 DocType: Maintenance Visit,Unscheduled,Непланирана
 DocType: Employee,Owned,Сопственост
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Зависи неплатено отсуство
@@ -1182,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Владата
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Точка Варијанти
 DocType: Company,Services,Услуги
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Вкупно ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Вкупно ({0})
 DocType: Cost Center,Parent Cost Center,Родител цена центар
 DocType: Sales Invoice,Source,Извор
 DocType: Leave Type,Is Leave Without Pay,Е неплатено отсуство
@@ -1255,17 +1262,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Препратат на плаќање E-mail
 DocType: Dependent Task,Dependent Task,Зависни Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},Отсуство од типот {0} не може да биде подолг од {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,Конзумира Износ
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Види
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Нето промени во Пари
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Нето промени во Пари
 DocType: Salary Structure Deduction,Salary Structure Deduction,Структура плата Одбивање
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица мерка {0} е внесен повеќе од еднаш во конверзија Фактор Табела
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица мерка {0} е внесен повеќе од еднаш во конверзија Фактор Табела
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Веќе постои плаќање Барам {0}
 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 +182,Quantity must not be more than {0},Кол не смее да биде повеќе од {0}
@@ -1327,7 +1334,7 @@
 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: Packed Item,To Warehouse (Optional),До Магацински (опционално)
 DocType: Sales Invoice,Paid Amount (Company Currency),Платениот износ (Фирма валута)
 DocType: Purchase Invoice,Additional Discount,Дополнителен попуст
 DocType: Selling Settings,Selling Settings,Продажба Settings
@@ -1336,7 +1343,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Компанија, месец и фискалната година е задолжително"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Маркетинг трошоци
 ,Item Shortage Report,Точка Недостаток Извештај
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се споменува, \ Променете спомене &quot;Тежина UOM&quot; премногу"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се споменува, \ Променете спомене &quot;Тежина UOM&quot; премногу"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Материјал Барање користат да се направи овој парк Влегување
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Една единица на некој објект.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Време Вклучи Серија {0} мора да биде предаден &quot;
@@ -1347,6 +1354,7 @@
 DocType: Employee,Date Of Retirement,Датум на заминување во пензија
 DocType: Upload Attendance,Get Template,Земете Шаблон
 DocType: Address,Postal,Поштенските
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 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,"А група на клиентите постои со истото име, ве молиме промена на името на клиентите или преименување на група на купувачи"
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Ве молиме изберете {0} прво.
@@ -1375,12 +1383,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Премногу колона. Извоз на извештајот и печатење со помош на апликацијата табела.
 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 +139,Main,Главните
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Главните
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Варијанта
 DocType: Naming Series,Set prefix for numbering series on your transactions,Намести префикс за нумерирање серија на вашиот трансакции
 DocType: Employee Attendance Tool,Employees HTML,вработените HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,Престана да не може да се откаже. Отпушвам да ја откажете.
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,Стандардно Бум ({0}) мора да бидат активни за оваа стварта или нејзиниот дефиниција
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,Варијанти
@@ -1405,7 +1413,6 @@
 DocType: Sales Order,To Deliver and Bill,Да дава и Бил
 DocType: GL Entry,Credit Amount in Account Currency,Износ на кредитот во профил Валута
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Време на дневници за производство.
-DocType: Item,Apply Warehouse-wise Reorder Level,Применуваат Магацински-мудар Пренареждане Ниво
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,Бум {0} мора да се поднесе
 DocType: Authorization Control,Authorization Control,Овластување за контрола
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ред # {0}: Отфрлени Магацински е задолжително против отфрли Точка {1}
@@ -1503,6 +1510,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Ред # {0}: Операција {1} не е завршена за {2} Количина на готови производи во производството со цел # {3}. Ве молиме да се ажурира статусот работењето преку Време на дневници
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Инвестиции
 DocType: Issue,Resolution Details,Резолуцијата Детали за
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,алокации
 DocType: Quality Inspection Reading,Acceptance Criteria,Прифаќање критериуми
 DocType: Item Attribute,Attribute Name,Атрибут Име
 DocType: Item Group,Show In Website,Прикажи Во вебсајт
@@ -1553,7 +1561,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,Сметка тврдат дека е во очекување на одобрување. Само на сметка Approver може да го ажурира статусот.
 DocType: Purchase Invoice,Additional Discount Amount,Дополнителен попуст Износ
 DocType: Leave Block List Allow,Leave Block List Allow,Остави Забрани Листа Дозволете
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr не може да биде празно или простор
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr не може да биде празно или простор
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Група за Не-групата
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спорт
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Вкупно Крај
@@ -1594,7 +1602,7 @@
 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**.,** Фискалната година ** претставува финансиска година. Сите сметководствени записи и други големи трансакции се следи против ** ** фискалната година.
 DocType: Opportunity,Customer / Lead Address,Клиент / Водечки адреса
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Предупредување: Невалиден SSL сертификат прикачување {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Предупредување: Невалиден SSL сертификат прикачување {0}
 DocType: Production Order Operation,Actual Operation Time,Крај на време операција
 DocType: Authorization Rule,Applicable To (User),Се применуваат за (Корисник)
 DocType: Purchase Taxes and Charges,Deduct,Одземе
@@ -1743,7 +1751,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,На случај бр не може да биде 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,Ако имате тим за продажба и продажба Партнери (Канал партнери) можат да бидат означени и одржување на нивниот придонес во активноста за продажба
 DocType: Item,Show a slideshow at the top of the page,Прикажи слајдшоу на врвот на страната
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Продавници
+DocType: Item,"Allow in Sales Order of type ""Service""",Дозволете во Продај Побарувања од типот &quot;Услуга&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Продавници
 DocType: Time Log,Projects Manager,Менаџер проекти
 DocType: Serial No,Delivery Time,Време на испорака
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Стареењето Врз основа на
@@ -1768,7 +1777,7 @@
 ,Financial Analytics,Финансиски анализи
 DocType: Quality Inspection,Verified By,Заверена од
 DocType: Address,Subsidiary,Подружница
-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.","Не може да се промени стандардно валута компанијата, бидејќи постојат постојните трансакции. Трансакции треба да бидат откажани да се промени валута на стандардните."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Не може да се промени стандардно валута компанијата, бидејќи постојат постојните трансакции. Трансакции треба да бидат откажани да се промени валута на стандардните."
 DocType: Quality Inspection,Purchase Receipt No,Купување Потврда Не
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Искрена пари
 DocType: Process Payroll,Create Salary Slip,Креирај Плата фиш
@@ -1816,7 +1825,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,"Суровини, не може да биде празна."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Не може да го ажурира трговија, фактура содржи капка превозот ставка."
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'","Како што постојат постојните акции трансакции за оваа точка, \ вие не може да се промени на вредностите на &quot;Мора Сериски Не&quot;, &quot;Дали Серија Не&quot;, &quot;Дали берза точка&quot; и &quot;метода на проценка&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Брзо весник Влегување
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Вие не може да го промени стапка ако Бум споменати agianst која било ставка
@@ -1905,7 +1914,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Ве молиме Испратница прв
 DocType: Purchase Invoice,Currency and Price List,Валута и Ценовник
 DocType: Opportunity,Customer / Lead Name,Клиент / Водечки Име
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Чистење Датум кои не се споменати
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Чистење Датум кои не се споменати
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Производство
 DocType: Item,Allow Production Order,Им овозможи на производството со цел
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Ред {0}: Почеток Датум мора да биде пред Крај Датум
@@ -1915,7 +1924,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,Вкупно Заработувајќи
 DocType: Purchase Receipt,Time at which materials were received,На кој беа примени материјали време
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,Мои адреси
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Мои адреси
 DocType: Stock Ledger Entry,Outgoing Rate,Тековна стапка
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Организација гранка господар.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,или
@@ -1984,7 +1993,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Управување на клиентите група на дрвото.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Нова цена центар Име
 DocType: Leave Control Panel,Leave Control Panel,Остави контролен панел
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Не стандардно адреса Шаблон најде. Ве молиме да се создаде нов една од подесување&gt; Печатење и Брендирање&gt; Адреса Шаблон.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Не стандардно адреса Шаблон најде. Ве молиме да се создаде нов една од подесување&gt; Печатење и Брендирање&gt; Адреса Шаблон.
 DocType: Appraisal,HR User,HR пристап
 DocType: Purchase Invoice,Taxes and Charges Deducted,Даноци и давачки одземени
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Прашања
@@ -2001,7 +2010,7 @@
 ,Sales Browser,Продажбата Browser
 DocType: Journal Entry,Total Credit,Вкупно кредитни
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Постои Друга {0} {1} # против влез парк {2}: опомена
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Локалните
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Големи
@@ -2020,7 +2029,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Сите Продажбата Трансакцијата може да бидат означени против повеќе ** продажба на лица **, така што ќе може да се постави и да се следи цели."
 ,S.O. No.,ПА број
 DocType: Production Order Operation,Make Time Log,Најдете време се Влез
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Ве молиме да го поставите редоследот квантитетот
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Ве молиме да се создаде клиент од водечкиот {0}
 DocType: Price List,Applicable for Countries,Применливи за земјите
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Компјутери
@@ -2095,7 +2103,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Добие релевантни записи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Сметководство за влез на берза
 DocType: Sales Invoice,Sales Team1,Продажбата Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Точка {0} не постои
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Точка {0} не постои
 DocType: Sales Invoice,Customer Address,Клиент адреса
 DocType: Payment Request,Recipient and Message,Примачот и порака
 DocType: Purchase Invoice,Apply Additional Discount On,Да важат и дополнителни попуст на
@@ -2137,7 +2145,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Вреднување стапка
 apps/erpnext/erpnext/stock/get_item_details.py +274,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} не постои во горната табела &quot;Набавка Разписки&quot;
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,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 +155,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,Преименувај Влез
@@ -2175,7 +2183,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Ве молиме внесете ослободување датум.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,АМТ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Остави само Пријавите со статус &#39;одобрена &quot;може да се поднесе
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Наслов адреса е задолжително.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Наслов адреса е задолжително.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Внесете го името на кампања, ако извор на истрага е кампања"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Новински издавачи
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Изберете фискалната година
@@ -2199,6 +2207,7 @@
 DocType: UOM,Must be Whole Number,Мора да биде цел број
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нови лисја распределени (во денови)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Сериски № {0} не постои
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Магацински клиентите (опционално)
 DocType: Pricing Rule,Discount Percentage,Процент попуст
 DocType: Payment Reconciliation Invoice,Invoice Number,Број на фактура
 apps/erpnext/erpnext/hooks.py +55,Orders,Нарачка
@@ -2308,7 +2317,7 @@
 DocType: Appraisal,Appraisal,Процена
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Датум се повторува
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Овластен потписник
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},Остави approver мора да биде еден од {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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,Почеток Време
@@ -2477,7 +2486,7 @@
 DocType: BOM Replace Tool,BOM Replace Tool,Бум Заменете алатката
 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 +733,Show tax break-up,Шоуто данок распадот
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Шоуто данок распадот
 apps/erpnext/erpnext/accounts/party.py +283,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',Ако се вклучат во производна активност. Овозможува Точка &quot;е произведен&quot;
@@ -2526,7 +2535,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,Ве молиме име ре-вид на компанија за да се потврди
@@ -2553,8 +2562,6 @@
 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,Датум на приклучување мора да биде поголем Датум на раѓање
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Структура плата
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Повеќе Цена правило постои со истите критериуми, ве молиме решавање \ конфликт со давање приоритет. Цена Правила: {0}"
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиокомпанијата
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Материјал прашање
@@ -2579,7 +2586,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Хартии од вредност и стоковни берзи
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Стандардно единица мерка за Варијанта &#39;{0}&#39; мора да биде иста како и во Мострата &quot;{1}&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Стандардно единица мерка за Варијанта &#39;{0}&#39; мора да биде иста како и во Мострата &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,Се пресмета врз основа на
 DocType: Delivery Note Item,From Warehouse,Од магацин
 DocType: Purchase Taxes and Charges,Valuation and Total,Вреднување и вкупно
@@ -2588,7 +2595,7 @@
 DocType: Account,Purchase User,Набавка пристап
 DocType: Notification Control,Customize the Notification,Персонализација на известувањето
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Парични текови од работење
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Стандардно адреса Шаблон не може да се избришат
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Стандардно адреса Шаблон не може да се избришат
 DocType: Sales Invoice,Shipping Rule,Испорака Правило
 DocType: Manufacturer,Limited to 12 characters,Ограничен на 12 карактери
 DocType: Journal Entry,Print Heading,Печати Заглавие
@@ -2681,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,Проект-мудар податоци не се достапни за котација
 DocType: Project,Expected End Date,Се очекува Крај Датум
 DocType: Appraisal Template,Appraisal Template Title,Процена Шаблон Наслов
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,Комерцијален
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Прекрасно Услуги
@@ -2700,7 +2707,7 @@
 DocType: Customer,Default Receivable Accounts,Стандардно сметки побарувања
 DocType: Tax Rule,Billing State,Платежна држава
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Трансфер
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Земи експлодира Бум (вклучувајќи ги и потсклопови)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),Земи експлодира Бум (вклучувајќи ги и потсклопови)
 DocType: Authorization Rule,Applicable To (Employee),Применливи To (вработените)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,Поради Датум е задолжително
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Интервалот за Атрибут {0} не може да биде 0
@@ -2733,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Негативни Вреднување стапка не е дозволено
 DocType: Holiday List,Weekly Off,Неделен Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","За пример, 2012 година, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Привремени Добивка / загуба (кредитни)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Привремени Добивка / загуба (кредитни)
 DocType: Sales Invoice,Return Against Sales Invoice,Врати против Продај фактура
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Точка 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Поставете ја стандардната вредност {0} во компанијата {1}
@@ -2764,6 +2771,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Додади детето
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Улогата дозволено да го поставите замрзнати сметки &amp; Уреди Замрзнати записи
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Не може да се конвертира цена центар за книга како што има дете јазли
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,отворање вредност
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Сериски #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Комисијата за Продажба
 DocType: Offer Letter Term,Value / Description,Вредност / Опис
@@ -2797,7 +2805,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Успешно избришани сите трансакции поврзани со оваа компанија!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Како на датум
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Условна казна
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Стандардно Магацински е задолжително за акциите точка.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Исплата на плата за месец {0} и годината {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Авто вметнете Ценовник стапка ако недостасува
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Вкупно исплатен износ
@@ -2833,7 +2840,7 @@
 DocType: Payment Tool,Set Matching Amounts,Намести појавување на Износите
 DocType: Purchase Invoice,Taxes and Charges Added,Даноци и давачки Додадено
 ,Sales Funnel,Продажбата на инка
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Кратенка задолжително
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Кратенка задолжително
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Ви благодариме за вашиот интерес во зачлениш на нашиот ажурирања
 ,Qty to Transfer,Количина да се Трансфер на
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Цитати да се води или клиенти.
@@ -2861,7 +2868,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,Добавувачот цитат
 DocType: Quotation,In Words will be visible once you save the Quotation.,Во Зборови ќе бидат видливи откако ќе го спаси котација.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} е запрен
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Баркод {0} веќе се користи во точка {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Престојни настани
@@ -2883,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Изберете фискалната година ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS Профил потребно да се направи ПОС Влегување
 DocType: Hub Settings,Name Token,Име знак
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Стандардна Продажба
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Стандардна Продажба
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Барем еден магацин е задолжително
 DocType: Serial No,Out of Warranty,Надвор од гаранција
 DocType: BOM Replace Tool,Replace,Заменете
@@ -3006,7 +3013,7 @@
 DocType: Sales Invoice,Paid Amount,Уплатениот износ
 ,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,Поставуањето на оваа адреса Шаблон како стандардно што не постои друг стандардно
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,Поставуањето на оваа адреса Шаблон како стандардно што не постои друг стандардно
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс на сметка веќе во Дебитна, не Ви е дозволено да се постави рамнотежа мора да биде &quot;како&quot; кредит &quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Управување со квалитет
 DocType: Production Planning Tool,Filter based on customer,Филтер врз основа на клиент
@@ -3107,7 +3114,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Да го поставите на оваа фискална година како стандарден, кликнете на &quot;Постави како стандарден&quot;"
 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 +19,Shortage Qty,Недостаток Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
 DocType: Salary Slip,Salary Slip,Плата фиш
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Да најдам &#39;е потребен
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Генерирање пакување измолкнува за пакети да бидат испорачани. Се користи за да го извести пакет број, содржината на пакетот и неговата тежина."
@@ -3118,7 +3125,7 @@
 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.","Кога било кој од обележаните трансакции се &quot;поднесе&quot;, е-мејл pop-up автоматски се отвори да се испрати е-маил до поврзани &quot;Контакт&quot; во таа трансакција, со трансакцијата како прилог. Корисникот може или не може да го испрати е-мејл."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Општи нагодувања
 DocType: Employee Education,Employee Education,Вработен образование
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,Потребно е да се достигне цена Ставка Детали.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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} е веќе доби
@@ -3144,6 +3151,7 @@
 DocType: BOM,Manufacturing User,Производство пристап
 DocType: Purchase Order,Raw Materials Supplied,Суровини Опрема што се испорачува
 DocType: Purchase Invoice,Recurring Print Format,Повторувачки печатење формат
+DocType: C-Form,Series,Серија
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,Се очекува испорака датум не може да биде пред нарачка Датум
 DocType: Appraisal,Appraisal Template,Процена Шаблон
 DocType: Item Group,Item Classification,Точка Класификација
@@ -3219,7 +3227,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},Ред {0}: Тоа е внесување Пренареждане веќе постои за оваа магацин {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.","Не може да се декларираат како изгубени, бидејќи цитат е направен."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Купување мајстор менаџер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Производство на налози {0} мора да се поднесе
@@ -3227,7 +3235,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Главни извештаи
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,До денес не може да биде пред од денот
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Додај / Уреди цени
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Мои нарачки
@@ -3275,7 +3283,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Ред # {0}: Постави Добавувачот за ставката {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Веб-страница на слика {0} прилог Точка {1} Не може да се најде
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Веб-страница на слика {0} прилог Точка {1} Не може да се најде
 DocType: Issue,Content Type,Типот на содржина
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Компјутер
 DocType: Item,List this Item in multiple groups on the website.,Листа на оваа точка во повеќе групи на веб страната.
@@ -3289,7 +3297,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Мора Сериски Не&quot; не може да биде &quot;Да&quot; за не-парк точка
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Мора Сериски Не&quot; не може да биде &quot;Да&quot; за не-парк точка
 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,Сметка на главата
@@ -3315,7 +3323,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Завршната сметка {0} мора да биде од типот Одговорност / инвестициски фондови
 DocType: Authorization Rule,Based On,Врз основа на
 DocType: Sales Order Item,Ordered Qty,Нареди Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Ставката {0} е оневозможено
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Ставката {0} е оневозможено
 DocType: Stock Settings,Stock Frozen Upto,Акции Замрзнати до
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},Период од периодот и роковите на задолжителна за периодични {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Проектна активност / задача.
@@ -3323,7 +3331,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Купување мора да се провери, ако е применливо за е избран како {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Попуст смее да биде помал од 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Отпише Износ (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Ред # {0}: Поставете редоследот квантитетот
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Ред # {0}: Поставете редоследот квантитетот
 DocType: Landed Cost Voucher,Landed Cost Voucher,Слета Цена на ваучер
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Ве молиме да се постави {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Повторете на Денот од месецот
@@ -3395,7 +3403,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Прикажи Сега
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Изберете го периодот кога фактурата ќе се генерираат автоматски
 DocType: BOM,Raw Material Cost,Суровина трошоци
-DocType: Item,Re-Order Level,Повторно да Ниво
+DocType: Item Reorder,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.,Внесете предмети и планирани Количина за која сакате да се зголеми производството наредби или преземете суровини за анализа.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Скратено работно време
 DocType: Employee,Applicable Holiday List,Применливи летни Листа
@@ -3450,7 +3458,7 @@
 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 +573,Please specify Attribute Value for attribute {0},Ве молиме наведете Атрибут Вредноста за атрибутот {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3529,7 +3537,7 @@
 DocType: Address,Office,Канцеларија
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Сметководствени записи во дневникот.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Количина на располагање од магацин
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Ве молиме изберете Снимај вработените во прв план.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,Ве молиме изберете Снимај вработените во прв план.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,Ве молиме внесете сметка сметка
@@ -3604,7 +3612,7 @@
 DocType: Item Attribute,Numeric Values,Нумерички вредности
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Прикачи Logo
 DocType: Customer,Commission Rate,Комисијата стапка
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Направи Варијанта
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Направи Варијанта
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Апликации одмор блок од страна на одделот.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Кошничка е празна
 DocType: Production Order,Actual Operating Cost,Крај на оперативни трошоци
@@ -3621,15 +3629,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Да го поставите нивото редоследот точка мора да биде Набавка Точка или Производство Точка
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),(Полудневен)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(Полудневен)
 DocType: Supplier,Credit Days,Кредитна дена
 DocType: Leave Type,Is Carry Forward,Е пренесување
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Се предмети од бирото
diff --git a/erpnext/translations/ml.csv b/erpnext/translations/ml.csv
index 4b4ae91..f244fa3 100644
--- a/erpnext/translations/ml.csv
+++ b/erpnext/translations/ml.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% വസതി
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),വിനിമയ നിരക്ക് {1} {0} അതേ ആയിരിക്കണം ({2})
 DocType: Sales Invoice,Customer Name,ഉപഭോക്താവിന്റെ പേര്
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},ബാങ്ക് അക്കൗണ്ട് {0} എന്ന് നാമകരണം ചെയ്യാൻ കഴിയില്ല
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},ബാങ്ക് അക്കൗണ്ട് {0} എന്ന് നാമകരണം ചെയ്യാൻ കഴിയില്ല
 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 +173,Outstanding for {0} cannot be less than zero ({1}),പ്രമുഖ {0} പൂജ്യം ({1}) കുറവായിരിക്കണം കഴിയില്ല വേണ്ടി
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,വരി # {0}: {2} ({3} / {4}): റേറ്റ് {1} അതേ ആയിരിക്കണം
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,New Leave Application,പുതിയ അനുവാദ ആപ്ലിക്കേഷൻ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,പുതിയ അനുവാദ ആപ്ലിക്കേഷൻ
 apps/erpnext/erpnext/setup/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,പേയ്മെന്റ് അക്കൗണ്ട് മോഡ്
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","ട്രാക്കിംഗ് സമയം, ബില്ലിംഗ് ഉപയോഗിക്കാൻ കഴിയും ചുമതലകൾ നേരെ ഉപയോക്താക്കൾ നടത്തുന്ന പ്രവർത്തനങ്ങൾ രേഖകൾ."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},പുതിയ {0}: # {1}
 ,Sales Partners Commission,സെയിൽസ് പങ്കാളികൾ കമ്മീഷൻ
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,ചുരുക്കെഴുത്ത് ലധികം 5 പ്രതീകങ്ങൾ കഴിയില്ല
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,ചുരുക്കെഴുത്ത് ലധികം 5 പ്രതീകങ്ങൾ കഴിയില്ല
 DocType: Payment Request,Payment Request,പേയ്മെന്റ് അഭ്യർത്ഥന
 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.",മൂല്യം {0} ഇനം രൂപഭേദങ്ങൾ \ ആയി {1} നിന്ന് നീക്കം ചെയ്യാൻ കഴിയില്ല ആട്രിബ്യൂട്ട് ഈ ഗുണം കൊണ്ട് നിലവിലില്ല.
@@ -195,6 +195,7 @@
 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 (%),വില പട്ടിക നിരക്ക് (%) ന് ഡിസ്കൗണ്ട്
 DocType: Offer Letter,Select Terms and Conditions,നിബന്ധനകളും വ്യവസ്ഥകളും തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,മൂല്യം ഔട്ട്
 DocType: Production Planning Tool,Sales Orders,സെയിൽസ് ഉത്തരവുകൾ
 DocType: Purchase Taxes and Charges,Valuation,വിലമതിക്കല്
 ,Purchase Order Trends,ഓർഡർ ട്രെൻഡുകൾ വാങ്ങുക
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,ടെലിവിഷൻ
 DocType: Production Order Operation,Updated via 'Time Log',&#39;ടൈം ലോഗ്&#39; വഴി അപ്ഡേറ്റ്
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},അക്കൗണ്ട് {0} കമ്പനി {1} സ്വന്തമല്ല
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},അഡ്വാൻസ് തുക {0} {1} ശ്രേഷ്ഠ പാടില്ല
 DocType: Naming Series,Series List for this Transaction,ഈ ഇടപാടിനായി സീരീസ് പട്ടിക
 DocType: Sales Invoice,Is Opening Entry,എൻട്രി തുറക്കുകയാണ്
 DocType: Customer Group,Mention if non-standard receivable account applicable,സ്റ്റാൻഡേർഡ് അല്ലാത്ത സ്വീകരിക്കുന്ന അക്കൌണ്ട് ബാധകമാണെങ്കിൽ പ്രസ്താവിക്കുക
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,മുകളിൽ സൂചിപ്പിച്ച മാനദണ്ഡങ്ങൾ ശമ്പളം സ്ലിപ്പ് തയ്യാറാക്കുന്നു.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,വിവരണം നൽകിയിട്ടില്ല
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,വാങ്ങിയതിന് അഭ്യർത്ഥന.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,മാത്രം തിരഞ്ഞെടുത്ത അനുവാദ Approver ഈ അനുവാദ ആപ്ലിക്കേഷൻ സമർപ്പിക്കാം
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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,സെറ്റപ്പ്&gt; ക്രമീകരണങ്ങൾ&gt; പേരിട്ടു സീരീസ് വഴി {0} വേണ്ടി സീരീസ് നാമകരണം സജ്ജീകരിക്കുക
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},വെയർഹൗസ് {0} കൂട്ടത്തിന്റെ {1} സ്വന്തമല്ല
 DocType: Item Website Specification,Item Website Specification,ഇനം വെബ്സൈറ്റ് സ്പെസിഫിക്കേഷൻ
 DocType: Payment Tool,Reference No,റഫറൻസ് ഇല്ല
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,വിടുക തടയപ്പെട്ട
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},ഇനം {0} {1} ജീവിതം അതിന്റെ അവസാനം എത്തിയിരിക്കുന്നു
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,വിടുക തടയപ്പെട്ട
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},ഇനം {0} {1} ജീവിതം അതിന്റെ അവസാനം എത്തിയിരിക്കുന്നു
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,വാർഷിക
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ഓഹരി അനുരഞ്ജനം ഇനം
 DocType: Stock Entry,Sales Invoice No,സെയിൽസ് ഇൻവോയിസ് ഇല്ല
@@ -248,7 +250,7 @@
 DocType: Pricing Rule,Supplier Type,വിതരണക്കാരൻ തരം
 DocType: Item,Publish in Hub,ഹബ് ലെ പ്രസിദ്ധീകരിക്കുക
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,ഇനം {0} റദ്ദാക്കി
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,ഇനം {0} റദ്ദാക്കി
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന
 DocType: Bank Reconciliation,Update Clearance Date,അപ്ഡേറ്റ് ക്ലിയറൻസ് തീയതി
 DocType: Item,Purchase Details,വിശദാംശങ്ങൾ വാങ്ങുക
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,ഡെലിവറി നോട്ട്
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,നികുതികൾ സജ്ജമാക്കുന്നു
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,നിങ്ങൾ അതു കടിച്ചുകീറി ശേഷം പെയ്മെന്റ് എൻട്രി പരിഷ്ക്കരിച്ചു. വീണ്ടും തുടയ്ക്കുക ദയവായി.
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} ഇനം നികുതി തവണ പ്രവേശിച്ചപ്പോൾ
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,മാസം വർഷം തിരഞ്ഞെടുക്കുക
@@ -327,7 +329,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,നിങ്ങളുടെ ഇമെയിൽ വിലാസം
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,അറ്റാച്ച്മെന്റ് ദയവായി
 DocType: Purchase Order,% Received,% ലഭിച്ചു
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,ഇതിനകം പൂർത്തിയാക്കുക സെറ്റപ്പ് !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,ഇതിനകം പൂർത്തിയാക്കുക സെറ്റപ്പ് !!
 ,Finished Goods,ഫിനിഷ്ഡ് സാധനങ്ങളുടെ
 DocType: Delivery Note,Instructions,നിർദ്ദേശങ്ങൾ
 DocType: Quality Inspection,Inspected By,പരിശോധിച്ചത്
@@ -352,14 +354,13 @@
 ,Purchase Register,രജിസ്റ്റർ വാങ്ങുക
 DocType: Landed Cost Item,Applicable Charges,ബാധകമായ നിരക്കുകളും
 DocType: Workstation,Consumable Cost,Consumable ചെലവ്
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) പങ്ക് &#39;അനുവാദ Approver&#39; ഉണ്ടായിരിക്കണം
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) പങ്ക് &#39;അനുവാദ Approver&#39; ഉണ്ടായിരിക്കണം
 DocType: Purchase Receipt,Vehicle Date,വാഹന തീയതി
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,മെഡിക്കൽ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,നഷ്ടപ്പെടുമെന്നു കാരണം
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},വർക്ക്സ്റ്റേഷൻ ഹോളിഡേ പട്ടിക പ്രകാരം താഴെപ്പറയുന്ന തീയതികളിൽ അടച്ചിടുന്നു: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,അവസരങ്ങൾ
 DocType: Employee,Single,സിംഗിൾ
-DocType: Issue,Attachment,അറ്റാച്ചുമെൻറ്
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,ബജറ്റ് ഗ്രൂപ്പ് ചെലവ് കേന്ദ്രം വേണ്ടി സജ്ജമാക്കാൻ കഴിയില്ല
 DocType: Account,Cost of Goods Sold,വിറ്റ സാധനങ്ങളുടെ വില
 DocType: Purchase Invoice,Yearly,വാർഷികം
@@ -388,7 +389,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,ഗുണ {0} വിശേഷണങ്ങൾ പട്ടിക ഒന്നിലധികം തവണ തെരഞ്ഞെടുത്തു
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,ഗുണ {0} വിശേഷണങ്ങൾ പട്ടിക ഒന്നിലധികം തവണ തെരഞ്ഞെടുത്തു
 DocType: HR Settings,Employee record is created using selected field. ,ജീവനക്കാർ റെക്കോർഡ് തിരഞ്ഞെടുത്ത ഫീൽഡ് ഉപയോഗിച്ച് സൃഷ്ടിക്കപ്പെട്ടിരിക്കുന്നത്.
 DocType: Sales Order,Not Applicable,ബാധകമല്ല
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,ഹോളിഡേ മാസ്റ്റർ.
@@ -427,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,കോസ്മെറ്റിക്സ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items","ലയിപ്പിക്കാൻ, താഴെ പറയുന്ന ആണ് ഇരു ഇനങ്ങളുടെ ഒരേ ആയിരിക്കണം"
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","ലയിപ്പിക്കാൻ, താഴെ പറയുന്ന ആണ് ഇരു ഇനങ്ങളുടെ ഒരേ ആയിരിക്കണം"
 DocType: Shipping Rule,Net Weight,മൊത്തം ഭാരം
 DocType: Employee,Emergency Phone,എമർജൻസി ഫോൺ
 ,Serial No Warranty Expiry,സീരിയൽ വാറണ്ടിയില്ല കാലഹരണ
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,മാനേജിംഗ് ചൂടുകാലമാണെന്നത്
 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,വില പട്ടിക കറൻസി കമ്പനിയുടെ അടിത്തറ കറൻസി മാറ്റുമ്പോൾ തോത്
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},അക്കൗണ്ട് {0} കമ്പനി ഭാഗമല്ല: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},അക്കൗണ്ട് {0} കമ്പനി ഭാഗമല്ല: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,ഇതിനകം മറ്റൊരു കമ്പനി ഉപയോഗിക്കുന്ന ചുരുക്കെഴുത്ത്
 DocType: Selling Settings,Default Customer Group,സ്ഥിരസ്ഥിതി ഉപഭോക്തൃ ഗ്രൂപ്പ്
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","അപ്രാപ്തമാക്കുകയാണെങ്കിൽ, &#39;വൃത്തത്തിലുള്ള ആകെ&#39; ഫീൽഡ് ഒരു ഇടപാടിലും ദൃശ്യമാകില്ല"
 DocType: BOM,Operating Cost,ഓപ്പറേറ്റിംഗ് ചെലവ്
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,ഇൻവോയിസ് പട്ടികയിൽ കണ്ടെത്തിയില്ല റെക്കോർഡുകൾ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"ആദ്യം കമ്പനി, പാർട്ടി ടൈപ്പ് തിരഞ്ഞെടുക്കുക"
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,ഫിനാൻഷ്യൽ / അക്കൌണ്ടിംഗ് വർഷം.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,കുമിഞ്ഞു മൂല്യങ്ങൾ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ക്ഷമിക്കണം, സീരിയൽ ഒഴിവ് ലയിപ്പിക്കാൻ കഴിയില്ല"
 DocType: Project Task,Project Task,പ്രോജക്ട് ടാസ്ക്
 ,Lead Id,ലീഡ് ഐഡി
@@ -492,7 +495,7 @@
 DocType: Quotation,Quotation To,ക്വട്ടേഷൻ ചെയ്യുക
 DocType: Lead,Middle Income,മിഡിൽ ആദായ
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),തുറക്കുന്നു (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,നിങ്ങൾ ഇതിനകം മറ്റൊരു UOM കൊണ്ട് ചില ഇടപാട് (ങ്ങൾ) നടത്തിയതിനാലോ ഇനം അളവ് സ്വതവേയുള്ള യൂണിറ്റ് {0} നേരിട്ട് മാറ്റാൻ കഴിയില്ല. നിങ്ങൾ ഒരു വ്യത്യസ്ത സ്വതേ UOM ഉപയോഗിക്കാൻ ഒരു പുതിയ ഇനം സൃഷ്ടിക്കേണ്ടതുണ്ട്.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,നിങ്ങൾ ഇതിനകം മറ്റൊരു UOM കൊണ്ട് ചില ഇടപാട് (ങ്ങൾ) നടത്തിയതിനാലോ ഇനം അളവ് സ്വതവേയുള്ള യൂണിറ്റ് {0} നേരിട്ട് മാറ്റാൻ കഴിയില്ല. നിങ്ങൾ ഒരു വ്യത്യസ്ത സ്വതേ UOM ഉപയോഗിക്കാൻ ഒരു പുതിയ ഇനം സൃഷ്ടിക്കേണ്ടതുണ്ട്.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,പദ്ധതി തുക നെഗറ്റീവ് ആയിരിക്കാൻ കഴിയില്ല
 DocType: Purchase Order Item,Billed Amt,വസതി ശാരീരിക
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,സ്റ്റോക്ക് എൻട്രികൾ നിർമ്മിക്കുന്ന നേരെ ഒരു ലോജിക്കൽ വെയർഹൗസ്.
@@ -570,7 +573,7 @@
 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 +543,Item has variants.,ഇനം വകഭേദങ്ങളും ഉണ്ട്.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,ട്രീ തരം
@@ -583,6 +586,7 @@
 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 +33,Goods received from Suppliers.,ചരക്ക് വിതരണക്കാരിൽനിന്നുമാണ് ലഭിച്ചു.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,മൂല്യത്തിൽ
 DocType: Lead,Campaign Name,കാമ്പെയ്ൻ പേര്
 ,Reserved,വാര്ത്തയും
 DocType: Purchase Order,Supply Raw Materials,സപ്ലൈ അസംസ്കൃത വസ്തുക്കൾ
@@ -597,16 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,നിലവിലുള്ള ഇടപാട് ഉപയോഗിച്ച് അക്കൗണ്ട് ലെഡ്ജർ പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല
 DocType: Delivery Note,Customer's Purchase Order No,കസ്റ്റമർ പർച്ചേസ് ഓർഡർ ഇല്ല
 DocType: Employee,Cell Number,സെൽ നമ്പർ
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,യാന്ത്രികമായി സൃഷ്ടിച്ചത് മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,യാന്ത്രികമായി സൃഷ്ടിച്ചത് മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,നഷ്ടപ്പെട്ട
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,നിങ്ങൾ കോളം &#39;ജേർണൽ എൻട്രി എഗൻസ്റ്റ്&#39; നിലവിലുള്ള വൗച്ചർ നൽകുക കഴിയില്ല
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,എനർജി
 DocType: Opportunity,Opportunity From,നിന്ന് ഓപ്പർച്യൂനിറ്റി
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,പ്രതിമാസ ശമ്പളം പ്രസ്താവന.
 DocType: Item Group,Website Specifications,വെബ്സൈറ്റ് വ്യതിയാനങ്ങൾ
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},നിങ്ങളുടെ വിലാസ ഫലകം {0} ഒരു പിശക് ഉണ്ട്
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,പുതിയ അക്കൗണ്ട്
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: {1} തരത്തിലുള്ള {0} നിന്ന്
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,വരി {0}: പരിവർത്തന ഫാക്ടർ നിർബന്ധമായും
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","ഒന്നിലധികം വില നിയമങ്ങൾ തിരയാം നിലവിലുള്ളതിനാൽ, മുൻഗണന നൽകിക്കൊണ്ട് വൈരുദ്ധ്യം പരിഹരിക്കുക. വില നിയമങ്ങൾ: {0}"
 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.,അക്കൗണ്ടിംഗ് എൻട്രികൾ ഇല നോഡുകൾ നേരെ കഴിയും. ഗ്രൂപ്പുകൾ നേരെ എൻട്രികൾ അനുവദനീയമല്ല.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,അത് മറ്റ് BOMs ബന്ധിപ്പിച്ചിരിക്കുന്നതു പോലെ BOM നിർജ്ജീവമാക്കി അല്ലെങ്കിൽ റദ്ദാക്കാൻ കഴിയില്ല
 DocType: Opportunity,Maintenance,മെയിൻറനൻസ്
@@ -649,7 +655,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,വില പട്ടിക തിരഞ്ഞെടുത്തിട്ടില്ല
 DocType: Employee,Family Background,കുടുംബ പശ്ചാത്തലം
 DocType: Process Payroll,Send Email,ഇമെയിൽ അയയ്ക്കുക
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},മുന്നറിയിപ്പ്: അസാധുവായ സഹപത്രങ്ങൾ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},മുന്നറിയിപ്പ്: അസാധുവായ സഹപത്രങ്ങൾ {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,ഇല്ല അനുമതി
 DocType: Company,Default Bank Account,സ്ഥിരസ്ഥിതി ബാങ്ക് അക്കൗണ്ട്
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","പാർട്ടി അടിസ്ഥാനമാക്കി ഫിൽട്ടർ, ആദ്യം പാർട്ടി ടൈപ്പ് തിരഞ്ഞെടുക്കുക"
@@ -679,13 +685,13 @@
 DocType: Production Planning Tool,Select Items,ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} ബിൽ {1} നേരെ {2} dated
 DocType: Maintenance Visit,Completion Status,പൂർത്തീകരണവും അവസ്ഥ
-DocType: Sales Invoice Item,Target Warehouse,ടാർജറ്റ് വെയർഹൗസ്
+DocType: Production Order,Target Warehouse,ടാർജറ്റ് വെയർഹൗസ്
 DocType: Item,Allow over delivery or receipt upto this percent,ഈ ശതമാനം വരെ ഡെലിവറി അല്ലെങ്കിൽ രസീത് മേൽ അനുവദിക്കുക
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,പ്രതീക്ഷിച്ച ഡെലിവറി തീയതി സെയിൽസ് ഓർഡർ തീയതി മുമ്പ് ആകാൻ പാടില്ല
 DocType: Upload Attendance,Import Attendance,ഇംപോർട്ട് ഹാജർ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,എല്ലാ ഇനം ഗ്രൂപ്പുകൾ
 DocType: Process Payroll,Activity Log,പ്രവർത്തന ലോഗ്
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,അറ്റാദായം / നഷ്ടം
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,അറ്റാദായം / നഷ്ടം
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,യാന്ത്രികമായി ഇടപാടുകളുടെ സമർപ്പിക്കാനുള്ള സന്ദേശം എഴുതുക.
 DocType: Production Order,Item To Manufacture,നിർമ്മിക്കാനുള്ള ഇനം
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} നില {2} ആണ്
@@ -693,7 +699,7 @@
 DocType: Sales Order Item,Projected Qty,അനുമാനിക്കപ്പെടുന്ന Qty
 DocType: Sales Invoice,Payment Due Date,പെയ്മെന്റ് നിശ്ചിത തീയതിയിൽ
 DocType: Newsletter,Newsletter Manager,വാർത്താക്കുറിപ്പ് മാനേജർ
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,ഇനം വേരിയന്റ് {0} ഇതിനകം അതേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,ഇനം വേരിയന്റ് {0} ഇതിനകം അതേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;തുറക്കുന്നു&#39;
 DocType: Notification Control,Delivery Note Message,ഡെലിവറി നോട്ട് സന്ദേശം
 DocType: Expense Claim,Expenses,ചെലവുകൾ
@@ -703,7 +709,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,ഗവേഷണവും വികസനവും
 ,Amount to Bill,ബിൽ തുക
 DocType: Company,Registration Details,രജിസ്ട്രേഷൻ വിവരങ്ങൾ
-DocType: Item,Re-Order Qty,വീണ്ടും ഓർഡർ Qty
+DocType: Item Reorder,Re-Order Qty,വീണ്ടും ഓർഡർ Qty
 DocType: Leave Block List Date,Leave Block List Date,ബ്ലോക്ക് പട്ടിക തീയതി വിടുക
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},{0} അയയ്ക്കുവാൻ ഷെഡ്യൂൾഡ്
 DocType: Pricing Rule,Price or Discount,വില അല്ലെങ്കിൽ ഡിസ്ക്കൌണ്ട്
@@ -746,7 +752,7 @@
 DocType: Bank Reconciliation,Total Amount,മൊത്തം തുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,ഇന്റർനെറ്റ് പ്രസിദ്ധീകരിക്കൽ
 DocType: Production Planning Tool,Production Orders,പ്രൊഡക്ഷൻ ഓർഡറുകൾ
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,ബാലൻസ് മൂല്യം
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,ബാലൻസ് മൂല്യം
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,സെയിൽസ് വില പട്ടിക
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,ഇനങ്ങളുടെ സമന്വയിപ്പിക്കാൻ പ്രസിദ്ധീകരിക്കുക
 DocType: Bank Reconciliation,Account Currency,അക്കൗണ്ട് കറന്സി
@@ -755,7 +761,7 @@
 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 +538,Item Variants {0} updated,ഇനം രൂപഭേദങ്ങൾ {0} നവീകരിച്ചത്
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,ഇനം രൂപഭേദങ്ങൾ {0} നവീകരിച്ചത്
 DocType: Quality Inspection Reading,Reading 6,6 Reading
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,വാങ്ങൽ ഇൻവോയിസ് അഡ്വാൻസ്
 DocType: Address,Shop,കട
@@ -832,7 +838,7 @@
 DocType: POS Profile,Cash/Bank Account,ക്യാഷ് / ബാങ്ക് അക്കൗണ്ട്
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,അളവ് അല്ലെങ്കിൽ മൂല്യം മാറ്റമൊന്നും വരുത്താതെ ഇനങ്ങളെ നീക്കംചെയ്തു.
 DocType: Delivery Note,Delivery To,ഡെലിവറി
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,ഗുണ മേശ നിർബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,ഡിസ്കൗണ്ട്
@@ -860,7 +866,7 @@
 DocType: Tax Rule,Shipping State,ഷിപ്പിംഗ് സ്റ്റേറ്റ്
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,ഇനം ബട്ടൺ &#39;വാങ്ങൽ വരവ് നിന്നുള്ള ഇനങ്ങൾ നേടുക&#39; ഉപയോഗിച്ച് ചേർക്കണം
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,സെയിൽസ് ചെലവുകൾ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,സ്റ്റാൻഡേർഡ് വാങ്ങൽ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,സ്റ്റാൻഡേർഡ് വാങ്ങൽ
 DocType: GL Entry,Against,എഗെൻസ്റ്റ്
 DocType: Item,Default Selling Cost Center,സ്ഥിരസ്ഥിതി അതേസമയം ചെലവ് കേന്ദ്രം
 DocType: Sales Partner,Implementation Partner,നടപ്പാക്കൽ പങ്കാളി
@@ -902,7 +908,7 @@
 DocType: Sales Partner,Distributor,വിതരണക്കാരൻ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ഷോപ്പിംഗ് കാർട്ട് ഷിപ്പിംഗ് റൂൾ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,പ്രൊഡക്ഷൻ ഓർഡർ {0} ഈ സെയിൽസ് ഓർഡർ റദ്ദാക്കുന്നതിൽ മുമ്പ് റദ്ദാക്കി വേണം
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',&#39;പ്രയോഗിക്കുക അഡീഷണൽ ഡിസ്കൌണ്ട്&#39; സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',&#39;പ്രയോഗിക്കുക അഡീഷണൽ ഡിസ്കൌണ്ട്&#39; സജ്ജീകരിക്കുക
 ,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.,സമയം ലോഗുകൾ തിരഞ്ഞെടുത്ത് ഒരു പുതിയ സെയിൽസ് ഇൻവോയിസ് സൃഷ്ടിക്കാൻ സമർപ്പിക്കുക.
@@ -970,9 +976,9 @@
 DocType: Contact,User ID,യൂസർ ഐഡി
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,കാണുക ലെഡ്ജർ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,പഴയവ
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group","ഒരു ഇനം ഗ്രൂപ്പ് ഇതേ പേരിലുള്ള നിലവിലുണ്ട്, ഐറ്റം പേര് മാറ്റാനോ ഐറ്റം ഗ്രൂപ്പ് പുനർനാമകരണം ദയവായി"
 DocType: Production Order,Manufacture against Sales Order,സെയിൽസ് ഓർഡർ നേരെ ഉല്പാദനം
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,ലോകം റെസ്റ്റ്
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,മൊത്തം വേതനം
@@ -1002,7 +1008,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","ക്ഷമിക്കണം, കമ്പനികൾ ലയിപ്പിക്കാൻ കഴിയില്ല"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","ക്ഷമിക്കണം, കമ്പനികൾ ലയിപ്പിക്കാൻ കഴിയില്ല"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,ചെറുകിട
 DocType: Employee,Employee Number,ജീവനക്കാരുടെ നമ്പർ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},നേരത്തെ ഉപയോഗത്തിലുണ്ട് കേസ് ഇല്ല (കൾ). കേസ് ഇല്ല {0} മുതൽ ശ്രമിക്കുക
@@ -1021,7 +1027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,കൃഷി
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,നിങ്ങളുടെ ഉല്പന്നങ്ങൾ അല്ലെങ്കിൽ സേവനങ്ങൾ
 DocType: Mode of Payment,Mode of Payment,അടക്കേണ്ട മോഡ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,വെബ്സൈറ്റ് ചിത്രം ഒരു പൊതു ഫയൽ അല്ലെങ്കിൽ വെബ്സൈറ്റ് URL ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,വെബ്സൈറ്റ് ചിത്രം ഒരു പൊതു ഫയൽ അല്ലെങ്കിൽ വെബ്സൈറ്റ് URL ആയിരിക്കണം
 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,വെയർഹൗസ് ബന്ധപ്പെടാനുള്ള വിവരങ്ങളും
@@ -1093,6 +1099,7 @@
 DocType: Address,Utilities,യൂട്ടിലിറ്റിക
 DocType: Purchase Invoice Item,Accounting,അക്കൗണ്ടിംഗ്
 DocType: Features Setup,Features Setup,സവിശേഷതകൾ സെറ്റപ്പ്
+DocType: Item,Is Service Item,സേവന ഇനം തന്നെയല്ലേ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,അപേക്ഷാ കാലയളവിൽ പുറത്ത് ലീവ് അലോക്കേഷൻ കാലഘട്ടം ആകാൻ പാടില്ല
 DocType: Activity Cost,Projects,പ്രോജക്റ്റുകൾ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,ധനകാര്യ വർഷം തിരഞ്ഞെടുക്കുക
@@ -1123,7 +1130,7 @@
 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 +465,cannot be greater than 100,100 വലുതായിരിക്കും കഴിയില്ല
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
 DocType: Maintenance Visit,Unscheduled,വരണേ
 DocType: Employee,Owned,ഉടമസ്ഥതയിലുള്ളത്
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,ശമ്പള പുറത്തുകടക്കാൻ ആശ്രയിച്ചിരിക്കുന്നു
@@ -1182,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,സർക്കാർ
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,ഇനം രൂപഭേദങ്ങൾ
 DocType: Company,Services,സേവനങ്ങള്
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),ആകെ ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),ആകെ ({0})
 DocType: Cost Center,Parent Cost Center,പാരന്റ് ചെലവ് കേന്ദ്രം
 DocType: Sales Invoice,Source,ഉറവിടം
 DocType: Leave Type,Is Leave Without Pay,ശമ്പള ഇല്ലാതെ തന്നെ തന്നു
@@ -1255,17 +1262,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,പേയ്മെന്റ് ഇമെയിൽ വീണ്ടും
 DocType: Dependent Task,Dependent Task,ആശ്രിത ടാസ്ക്
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},{0} ഇനി {1} അധികം ആകാൻ പാടില്ല തരത്തിലുള്ള വിടുക
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,ക്ഷയിച്ചിരിക്കുന്നു തുക
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} കാണുക
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,പണമായി നെറ്റ് മാറ്റുക
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,പണമായി നെറ്റ് മാറ്റുക
 DocType: Salary Structure Deduction,Salary Structure Deduction,ശമ്പളം ഘടന കിഴിച്ചുകൊണ്ടു
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,മെഷർ {0} യൂണിറ്റ് ഒരിക്കൽ പരിവർത്തന ഫാക്ടർ പട്ടികയിലെ അധികം നൽകി
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,മെഷർ {0} യൂണിറ്റ് ഒരിക്കൽ പരിവർത്തന ഫാക്ടർ പട്ടികയിലെ അധികം നൽകി
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},പേയ്മെന്റ് അഭ്യർത്ഥന ഇതിനകം {0} നിലവിലുണ്ട്
 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 +182,Quantity must not be more than {0},ക്വാണ്ടിറ്റി {0} അധികം പാടില്ല
@@ -1327,7 +1334,7 @@
 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: Packed Item,To Warehouse (Optional),സംഭരണശാല (ഓപ്ഷണൽ)
 DocType: Sales Invoice,Paid Amount (Company Currency),തുക (കമ്പനി കറൻസി)
 DocType: Purchase Invoice,Additional Discount,അധിക ഡിസ്ക്കൌണ്ട്
 DocType: Selling Settings,Selling Settings,സജ്ജീകരണങ്ങൾ വിൽക്കുന്ന
@@ -1336,7 +1343,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","കമ്പനി, മാസത്തെയും ധനകാര്യ വർഷം നിർബന്ധമായും"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,മാർക്കറ്റിംഗ് ചെലവുകൾ
 ,Item Shortage Report,ഇനം ദൗർലഭ്യം റിപ്പോർട്ട്
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ഭാരോദ്വഹനം പരാമർശിച്ചിരിക്കുന്നത്, \ n ദയവായി വളരെ &quot;ഭാരോദ്വഹനം UOM&quot; മറന്ന"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ഭാരോദ്വഹനം പരാമർശിച്ചിരിക്കുന്നത്, \ n ദയവായി വളരെ &quot;ഭാരോദ്വഹനം UOM&quot; മറന്ന"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ഈ ഓഹരി എൻട്രി ചെയ്യുന്നതിനുപയോഗിക്കുന്ന മെറ്റീരിയൽ അഭ്യർത്ഥന
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,ഒരു ഇനത്തിന്റെ സിംഗിൾ യൂണിറ്റ്.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',സമയം ലോഗ് ബാച്ച് {0} &#39;സമർപ്പിച്ചു&#39; വേണം
@@ -1347,6 +1354,7 @@
 DocType: Employee,Date Of Retirement,വിരമിക്കൽ തീയതി
 DocType: Upload Attendance,Get Template,ഫലകം നേടുക
 DocType: Address,Postal,പോസ്റ്റൽ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,സമ്പൂർണ്ണ ERPNext സജ്ജീകരണം!
 DocType: Item,Weightage,വെയിറ്റേജ്
 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,ഉപഭോക്താവിനെ ഗ്രൂപ്പ് സമാന പേരിൽ നിലവിലുണ്ട് കസ്റ്റമർ പേര് മാറ്റാനോ കസ്റ്റമർ ഗ്രൂപ്പ് പുനർനാമകരണം ദയവായി
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,ആദ്യം {0} തിരഞ്ഞെടുക്കുക.
@@ -1375,12 +1383,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,വളരെയധികം നിരകൾ. റിപ്പോർട്ട് കയറ്റുമതി ഒരു സ്പ്രെഡ്ഷീറ്റ് ആപ്ലിക്കേഷൻ ഉപയോഗിച്ച് അത് പ്രിന്റ്.
 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 +139,Main,പ്രധാന
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,പ്രധാന
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,മാറ്റമുള്ള
 DocType: Naming Series,Set prefix for numbering series on your transactions,നിങ്ങളുടെ ഇടപാടുകൾ പരമ്പര എണ്ണം പ്രിഫിക്സ് സജ്ജമാക്കുക
 DocType: Employee Attendance Tool,Employees HTML,എംപ്ലോയീസ് എച്ച്ടിഎംഎൽ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,നിർത്തി ഓർഡർ റദ്ദാക്കാൻ സാധിക്കില്ല. റദ്ദാക്കാൻ Unstop.
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,സ്വതേ BOM ({0}) ഈ ഇനം അല്ലെങ്കിൽ അതിന്റെ ടെംപ്ലേറ്റ് സജീവമാകും ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,വകഭേദങ്ങളും
@@ -1405,7 +1413,6 @@
 DocType: Sales Order,To Deliver and Bill,എത്തിക്കേണ്ടത് ബിൽ ചെയ്യുക
 DocType: GL Entry,Credit Amount in Account Currency,അക്കൗണ്ട് കറൻസി ക്രെഡിറ്റ് തുക
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,നിർമാണ സമയം ക്ഌപ്തപ്പെടുത്താവുന്നതാണ്.
-DocType: Item,Apply Warehouse-wise Reorder Level,വെയർഹൗസ് തിരിച്ചുള്ള പുനഃക്രമീകരിക്കുക ലെവൽ പ്രയോഗിക്കുക
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM ലേക്ക് {0} സമർപ്പിക്കേണ്ടതാണ്
 DocType: Authorization Control,Authorization Control,അംഗീകാര നിയന്ത്രണ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},വരി # {0}: നിരസിച്ചു വെയർഹൗസ് തള്ളിക്കളഞ്ഞ ഇനം {1} നേരെ നിർബന്ധമായും
@@ -1503,6 +1510,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,വരി # {0}: ഓപ്പറേഷൻ {1} പ്രൊഡക്ഷൻ ഓർഡർ # {3} ലെ പൂർത്തിയായി വസ്തുവിൽ {2} qty പൂർത്തിയായി ചെയ്തിട്ടില്ല. സമയം ലോഗുകൾ വഴി ഓപ്പറേഷൻ നില അപ്ഡേറ്റ് ചെയ്യുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,നിക്ഷേപങ്ങൾ
 DocType: Issue,Resolution Details,മിഴിവ് വിശദാംശങ്ങൾ
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,വിഹിതം
 DocType: Quality Inspection Reading,Acceptance Criteria,സ്വീകാര്യത മാനദണ്ഡം
 DocType: Item Attribute,Attribute Name,പേര് ആട്രിബ്യൂട്ട്
 DocType: Item Group,Show In Website,വെബ്സൈറ്റ് കാണിക്കുക
@@ -1553,7 +1561,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,ചിലവിടൽ ക്ലെയിം അംഗീകാരത്തിനായി ശേഷിക്കുന്നു. മാത്രം ചിലവിടൽ Approver സ്റ്റാറ്റസ് അപ്ഡേറ്റ് ചെയ്യാം.
 DocType: Purchase Invoice,Additional Discount Amount,അധിക ഡിസ്ക്കൌണ്ട് തുക
 DocType: Leave Block List Allow,Leave Block List Allow,അനുവദിക്കുക ബ്ലോക്ക് ലിസ്റ്റ് വിടുക
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr ബ്ലാങ്ക് ബഹിരാകാശ ആകാൻ പാടില്ല
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr ബ്ലാങ്ക് ബഹിരാകാശ ആകാൻ പാടില്ല
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,നോൺ-ഗ്രൂപ്പ് വരെ ഗ്രൂപ്പ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,സ്പോർട്സ്
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,യഥാർത്ഥ ആകെ
@@ -1594,7 +1602,7 @@
 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**.,** സാമ്പത്തിക വർഷത്തെ ** ഒരു സാമ്പത്തിക വർഷം പ്രതിനിധീകരിക്കുന്നത്. എല്ലാ അക്കൗണ്ടിങ് എൻട്രികൾ മറ്റ് പ്രധാന ഇടപാടുകൾ ** ** സാമ്പത്തിക വർഷത്തിൽ നേരെ അത്രകണ്ട്.
 DocType: Opportunity,Customer / Lead Address,കസ്റ്റമർ / ലീഡ് വിലാസം
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},മുന്നറിയിപ്പ്: അറ്റാച്ച്മെന്റ് {0} ന് അസാധുവായ SSL സർട്ടിഫിക്കറ്റ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},മുന്നറിയിപ്പ്: അറ്റാച്ച്മെന്റ് {0} ന് അസാധുവായ SSL സർട്ടിഫിക്കറ്റ്
 DocType: Production Order Operation,Actual Operation Time,യഥാർത്ഥ ഓപ്പറേഷൻ സമയം
 DocType: Authorization Rule,Applicable To (User),(ഉപയോക്താവ്) ബാധകമായ
 DocType: Purchase Taxes and Charges,Deduct,കുറയ്ക്കാവുന്നതാണ്
@@ -1743,7 +1751,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,കേസ് നമ്പർ 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,നിങ്ങൾ സെയിൽസ് ടീം വിൽപനയും പങ്കാളികൾ (ചാനൽ പങ്കാളികൾ) ഉണ്ടെങ്കിൽ ടാഗ് സെയിൽസ് പ്രവർത്തനങ്ങളിലും അംശദായം നിലനിർത്താൻ കഴിയും
 DocType: Item,Show a slideshow at the top of the page,പേജിന്റെ മുകളിൽ ഒരു സ്ലൈഡ്ഷോ കാണിക്കുക
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,സ്റ്റോറുകൾ
+DocType: Item,"Allow in Sales Order of type ""Service""",തരം വില്പന ക്രമത്തിൽ അനുവദിക്കുക &quot;സേവനം&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,സ്റ്റോറുകൾ
 DocType: Time Log,Projects Manager,പ്രോജക്റ്റുകൾ മാനേജർ
 DocType: Serial No,Delivery Time,വിതരണ സമയം
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,എയ്ജിങ് അടിസ്ഥാനത്തിൽ ഓൺ
@@ -1768,7 +1777,7 @@
 ,Financial Analytics,ഫിനാൻഷ്യൽ അനലിറ്റിക്സ്
 DocType: Quality Inspection,Verified By,പരിശോധിച്ചു
 DocType: Address,Subsidiary,സഹായകന്
-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.","നിലവിലുള്ള ഇടപാടുകൾ ഉള്ളതിനാൽ, കമ്പനിയുടെ സഹജമായ കറൻസി മാറ്റാൻ കഴിയില്ല. ഇടപാട് സ്വതവേയുള്ള കറൻസി മാറ്റാൻ റദ്ദാക്കി വേണം."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","നിലവിലുള്ള ഇടപാടുകൾ ഉള്ളതിനാൽ, കമ്പനിയുടെ സഹജമായ കറൻസി മാറ്റാൻ കഴിയില്ല. ഇടപാട് സ്വതവേയുള്ള കറൻസി മാറ്റാൻ റദ്ദാക്കി വേണം."
 DocType: Quality Inspection,Purchase Receipt No,വാങ്ങൽ രസീത് ഇല്ല
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,അച്ചാരം മണി
 DocType: Process Payroll,Create Salary Slip,ശമ്പളം ജി സൃഷ്ടിക്കുക
@@ -1816,7 +1825,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,അസംസ്കൃത വസ്തുക്കൾ ശൂന്യമായിരിക്കാൻ കഴിയില്ല.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","ഇൻവോയ്സ് ഡ്രോപ്പ് ഷിപ്പിംഗ് ഇനം ഉൾപ്പെടുന്നു, സ്റ്റോക്ക് അപ്ഡേറ്റുചെയ്യാനായില്ല."
 DocType: Newsletter,Test,ടെസ്റ്റ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'","നിലവിലുള്ള സ്റ്റോക്ക് ഇടപാടുകൾ ഈ ഇനത്തിന്റെ ഉണ്ട് പോലെ, \ നിങ്ങൾ &#39;സീരിയൽ നോ ഉണ്ട്&#39; മൂല്യങ്ങൾ മാറ്റാൻ കഴിയില്ല, &#39;ബാച്ച് ഇല്ല ഉണ്ട്&#39;, ഒപ്പം &#39;മൂലധനം രീതിയുടെ&#39; &#39;ഓഹരി ഇനം തന്നെയല്ലേ&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,ദ്രുത ജേർണൽ എൻട്രി
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,BOM ലേക്ക് ഏതെങ്കിലും ഇനത്തിന്റെ agianst പരാമർശിച്ചു എങ്കിൽ നിങ്ങൾ നിരക്ക് മാറ്റാൻ കഴിയില്ല
@@ -1905,7 +1914,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,ആദ്യം ഡെലിവറി നോട്ട് ദയവായി
 DocType: Purchase Invoice,Currency and Price List,കറൻസി വിലവിവരപ്പട്ടികയും
 DocType: Opportunity,Customer / Lead Name,കസ്റ്റമർ / ലീഡ് പേര്
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,ക്ലിയറൻസ് തീയതി പറഞ്ഞിട്ടില്ലാത്ത
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,ക്ലിയറൻസ് തീയതി പറഞ്ഞിട്ടില്ലാത്ത
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,പ്രൊഡക്ഷൻ
 DocType: Item,Allow Production Order,പ്രൊഡക്ഷൻ ഓർഡർ അനുവദിക്കുക
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,വരി {0}: ആരംഭ തീയതി അവസാന തീയതി മുമ്പ് ആയിരിക്കണം
@@ -1915,7 +1924,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,മൊത്തം സമ്പാദ്യം
 DocType: Purchase Receipt,Time at which materials were received,വസ്തുക്കൾ ലഭിച്ച ഏത് സമയം
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,എന്റെ വിലാസങ്ങൾ
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,എന്റെ വിലാസങ്ങൾ
 DocType: Stock Ledger Entry,Outgoing Rate,ഔട്ട്ഗോയിംഗ് റേറ്റ്
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,ഓർഗനൈസേഷൻ ബ്രാഞ്ച് മാസ്റ്റർ.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,അഥവാ
@@ -1984,7 +1993,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,കസ്റ്റമർ ഗ്രൂപ്പ് ട്രീ നിയന്ത്രിക്കുക.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,പുതിയ ചെലവ് കേന്ദ്രം പേര്
 DocType: Leave Control Panel,Leave Control Panel,നിയന്ത്രണ പാനൽ വിടുക
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,കണ്ടെത്തിയില്ല സഹജമായ വിലാസം ഫലകം. സെറ്റപ്പ്&gt; അച്ചടി ബ്രാൻഡിംഗ്&gt; വിലാസം ഫലകം നിന്ന് പുതിയതൊന്ന് സൃഷ്ടിക്കുക.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,കണ്ടെത്തിയില്ല സഹജമായ വിലാസം ഫലകം. സെറ്റപ്പ്&gt; അച്ചടി ബ്രാൻഡിംഗ്&gt; വിലാസം ഫലകം നിന്ന് പുതിയതൊന്ന് സൃഷ്ടിക്കുക.
 DocType: Appraisal,HR User,എച്ച് ഉപയോക്താവ്
 DocType: Purchase Invoice,Taxes and Charges Deducted,നികുതി ചാർജുകളും വെട്ടിക്കുറയ്ക്കും
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,പ്രശ്നങ്ങൾ
@@ -2001,7 +2010,7 @@
 ,Sales Browser,സെയിൽസ് ബ്രൗസർ
 DocType: Journal Entry,Total Credit,ആകെ ക്രെഡിറ്റ്
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},മുന്നറിയിപ്പ്: മറ്റൊരു {0} # {1} സ്റ്റോക്ക് എൻട്രി {2} നേരെ നിലവിലുണ്ട്
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,പ്രാദേശിക
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,വലുത്
@@ -2020,7 +2029,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,എല്ലാ സെയിൽസ് ഇടപാട് ഒന്നിലധികം ** സെയിൽസ് പേഴ്സൺസ് നേരെ ടാഗ് ചെയ്യാൻ കഴിയും ** നിങ്ങൾ ലക്ഷ്യങ്ങളിലൊന്നാണ് സജ്ജമാക്കാൻ നിരീക്ഷിക്കുവാനും കഴിയും.
 ,S.O. No.,ഷൂട്ട്ഔട്ട് നമ്പർ
 DocType: Production Order Operation,Make Time Log,സമയം ലോഗ് നിർമ്മിക്കുക
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,പുനഃക്രമീകരിക്കുക അളവ് സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},ലീഡ് നിന്ന് {0} കസ്റ്റമർ സൃഷ്ടിക്കാൻ ദയവായി
 DocType: Price List,Applicable for Countries,രാജ്യങ്ങൾ വേണ്ടി ബാധകമായ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,കംപ്യൂട്ടർ
@@ -2095,7 +2103,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,പ്രസക്തമായ എൻട്രികൾ നേടുക
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,ഓഹരി വേണ്ടി അക്കൗണ്ടിംഗ് എൻട്രി
 DocType: Sales Invoice,Sales Team1,സെയിൽസ് ടീം 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,ഇനം {0} നിലവിലില്ല
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,ഇനം {0} നിലവിലില്ല
 DocType: Sales Invoice,Customer Address,കസ്റ്റമർ വിലാസം
 DocType: Payment Request,Recipient and Message,സ്വീകർത്താവ് ആൻഡ് സന്ദേശം
 DocType: Purchase Invoice,Apply Additional Discount On,പ്രയോഗിക്കുക അധിക ഡിസ്കൌണ്ട്
@@ -2137,7 +2145,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,മൂലധനം റേറ്റ്
 apps/erpnext/erpnext/stock/get_item_details.py +274,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} മുകളിൽ &#39;വാങ്ങൽ വരവ്&#39; പട്ടികയിൽ നിലവിലില്ല
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,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 +155,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,രേഖ
@@ -2175,7 +2183,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,തീയതി വിടുതൽ നൽകുക.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,ശാരീരിക
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,സമർപ്പിച്ച കഴിയും &#39;അംഗീകരിച്ചു&#39; നില ആപ്ലിക്കേഷൻസ് മാത്രം വിടുക
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,വിലാസം ശീർഷകം നിർബന്ധമാണ്.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,വിലാസം ശീർഷകം നിർബന്ധമാണ്.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,അന്വേഷണത്തിന് സ്രോതസ് പ്രചാരണം എങ്കിൽ പ്രചാരണത്തിന്റെ പേര് നൽകുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,ന്യൂസ് പേപ്പർ പബ്ലിഷേഴ്സ്
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ധനകാര്യ വർഷം തിരഞ്ഞെടുക്കുക
@@ -2199,6 +2207,7 @@
 DocType: UOM,Must be Whole Number,മുഴുവനുമുള്ള നമ്പർ ആയിരിക്കണം
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(ദിവസങ്ങളിൽ) അനുവദിച്ചതായും പുതിയ ഇലകൾ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,സീരിയൽ ഇല്ല {0} നിലവിലില്ല
+DocType: Sales Invoice Item,Customer Warehouse (Optional),കസ്റ്റമർ വെയർഹൗസ് (ഓപ്ഷണൽ)
 DocType: Pricing Rule,Discount Percentage,കിഴിവും ശതമാനം
 DocType: Payment Reconciliation Invoice,Invoice Number,ഇൻവോയിസ് നമ്പർ
 apps/erpnext/erpnext/hooks.py +55,Orders,ഉത്തരവുകൾ
@@ -2308,7 +2317,7 @@
 DocType: Appraisal,Appraisal,വിലനിശ്ചയിക്കല്
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,തീയതി ആവർത്തിക്കുന്നുണ്ട്
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,അധികാരങ്ങളും നല്കുകയും
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},{0} ഒന്നാണ് ആയിരിക്കണം approver വിടുക
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,Leave approver must be one of {0},{0} ഒന്നാണ് ആയിരിക്കണം approver വിടുക
 DocType: Hub Settings,Seller Email,വില്പനക്കാരന്റെ ഇമെയിൽ
 DocType: Project,Total Purchase Cost (via Purchase Invoice),(വാങ്ങൽ ഇൻവോയിസ് വഴി) ആകെ വാങ്ങൽ ചെലവ്
 DocType: Workstation Working Hour,Start Time,ആരംഭ സമയം
@@ -2477,7 +2486,7 @@
 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 +733,Show tax break-up,കാണിക്കുക നികുതി ബ്രേക്ക്-അപ്പ്
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,കാണിക്കുക നികുതി ബ്രേക്ക്-അപ്പ്
 apps/erpnext/erpnext/accounts/party.py +283,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',നിങ്ങൾ നിർമാണ പ്രവർത്തനങ്ങളിലും ഉൾപ്പെട്ടിരിക്കുന്നത് എങ്കിൽ. ഇനം &#39;നിർമ്മിക്കപ്പെട്ടതിനുശേഷം&#39; പ്രാപ്തമാക്കുന്നു
@@ -2526,7 +2535,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,സ്ഥിരീകരിക്കാൻ കമ്പനിയുടെ പേര്-തരം റീ ദയവായി
@@ -2553,8 +2562,6 @@
 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,ചേരുന്നു തീയതി ജനന തീയതി വലുതായിരിക്കണം
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,ശമ്പളം ഘടന
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","ഒന്നിലധികം വില റൂൾ തിരയാം നിലവിലുള്ളതിനാൽ, മുൻഗണന നൽകിക്കൊണ്ട് സംഘർഷം \ പരിഹരിക്കുന്നതിന് ദയവായി. വില നിയമങ്ങൾ: {0}"
 DocType: Account,Bank,ബാങ്ക്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,എയർ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,പ്രശ്നം മെറ്റീരിയൽ
@@ -2579,7 +2586,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,സെക്യൂരിറ്റീസ് &amp; ചരക്ക് കൈമാറ്റ
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',മോഡലിന് അളവു യൂണിറ്റ് &#39;{0}&#39; ഫലകം അതേ ആയിരിക്കണം &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',മോഡലിന് അളവു യൂണിറ്റ് &#39;{0}&#39; ഫലകം അതേ ആയിരിക്കണം &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,അടിസ്ഥാനത്തിൽ ഓൺ കണക്കുകൂട്ടുക
 DocType: Delivery Note Item,From Warehouse,വെയർഹൗസിൽ നിന്ന്
 DocType: Purchase Taxes and Charges,Valuation and Total,"മൂലധനം, മൊത്ത"
@@ -2588,7 +2595,7 @@
 DocType: Account,Purchase User,വാങ്ങൽ ഉപയോക്താവ്
 DocType: Notification Control,Customize the Notification,അറിയിപ്പ് ഇഷ്ടാനുസൃതമാക്കുക
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,ഓപ്പറേഷൻസ് നിന്നുള്ള ക്യാഷ് ഫ്ളോ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,സ്ഥിരസ്ഥിതി വിലാസം ഫലകം ഇല്ലാതാക്കാൻ കഴിയില്ല
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,സ്ഥിരസ്ഥിതി വിലാസം ഫലകം ഇല്ലാതാക്കാൻ കഴിയില്ല
 DocType: Sales Invoice,Shipping Rule,ഷിപ്പിംഗ് റൂൾ
 DocType: Manufacturer,Limited to 12 characters,12 പ്രതീകങ്ങളായി ലിമിറ്റഡ്
 DocType: Journal Entry,Print Heading,പ്രിന്റ് തലക്കെട്ട്
@@ -2681,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,പ്രോജക്ട് തിരിച്ചുള്ള ഡാറ്റ ക്വട്ടേഷൻ ലഭ്യമല്ല
 DocType: Project,Expected End Date,പ്രതീക്ഷിച്ച അവസാന തീയതി
 DocType: Appraisal Template,Appraisal Template Title,അപ്രൈസൽ ഫലകം ശീർഷകം
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,ആവശ്യത്തിന്
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,ആകർഷണീയമായ സേവനങ്ങൾ
@@ -2700,7 +2707,7 @@
 DocType: Customer,Default Receivable Accounts,സ്ഥിരസ്ഥിതി സ്വീകാ അക്കൗണ്ടുകൾ
 DocType: Tax Rule,Billing State,ബില്ലിംഗ് സ്റ്റേറ്റ്
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,ട്രാൻസ്ഫർ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),(സബ്-സമ്മേളനങ്ങൾ ഉൾപ്പെടെ) പൊട്ടിത്തെറിക്കുന്ന BOM ലഭ്യമാക്കുക
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),(സബ്-സമ്മേളനങ്ങൾ ഉൾപ്പെടെ) പൊട്ടിത്തെറിക്കുന്ന BOM ലഭ്യമാക്കുക
 DocType: Authorization Rule,Applicable To (Employee),(ജീവനക്കാർ) ബാധകമായ
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,അവസാന തീയതി നിർബന്ധമാണ്
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,ഗുണ {0} 0 ആകാൻ പാടില്ല വേണ്ടി വർദ്ധന
@@ -2733,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,നെഗറ്റീവ് മൂലധനം റേറ്റ് അനുവദനീയമല്ല
 DocType: Holiday List,Weekly Off,പ്രതിവാര ഓഫാക്കുക
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ഉദാ 2012 വേണ്ടി, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),താൽക്കാലികഫാ ലാഭം / നഷ്ടം (ക്രെഡിറ്റ്)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),താൽക്കാലികഫാ ലാഭം / നഷ്ടം (ക്രെഡിറ്റ്)
 DocType: Sales Invoice,Return Against Sales Invoice,സെയിൽസ് ഇൻവോയിസ് എഗെൻസ്റ്റ് മടങ്ങുക
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,ഇനം 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},{1} കമ്പനി {0} സ്വതവേയുള്ള മൂല്യം സജ്ജീകരിക്കുക
@@ -2764,6 +2771,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,ശിശു ചേർക്കുക
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,ശീതീകരിച്ച അക്കൗണ്ടുകൾ &amp; എഡിറ്റ് ശീതീകരിച്ച എൻട്രികൾ സജ്ജമാക്കുക അനുവദിച്ചു റോൾ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,അത് കുട്ടി റോഡുകളുണ്ട് പോലെ ലെഡ്ജർ വരെ ചെലവ് കേന്ദ്രം പരിവർത്തനം ചെയ്യാൻ കഴിയുമോ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,തുറക്കുന്നു മൂല്യം
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,സീരിയൽ #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,വിൽപ്പന കമ്മീഷൻ
 DocType: Offer Letter Term,Value / Description,മൂല്യം / വിവരണം
@@ -2797,7 +2805,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,വിജയകരമായി ഈ കമ്പനിയുമായി ബന്ധപ്പെട്ട എല്ലാ ഇടപാടുകൾ ഇല്ലാതാക്കി!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,തീയതിയിൽ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,പരീക്ഷണകാലഘട്ടം
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,സ്ഥിരസ്ഥിതി വെയർഹൗസ് സ്റ്റോക്ക് ഇനം നിര്ബന്ധമാണ്.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},മാസം {0} ശമ്പളം എന്ന പേയ്മെന്റ് ഉം വർഷം {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ഓട്ടോ insert വില പട്ടിക നിരക്ക് കാണാനില്ല എങ്കിൽ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,ആകെ തുക
@@ -2833,7 +2840,7 @@
 DocType: Payment Tool,Set Matching Amounts,"സജ്ജമാക്കുക, പൊരുത്തം അളവിൽ"
 DocType: Purchase Invoice,Taxes and Charges Added,നികുതി ചാർജുകളും ചേർത്തു
 ,Sales Funnel,സെയിൽസ് നാലുവിക്കറ്റ്
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,ചുരുക്കെഴുത്ത് നിർബന്ധമാണ്
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,ചുരുക്കെഴുത്ത് നിർബന്ധമാണ്
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,നമ്മുടെ അപ്ഡേറ്റുകൾ സബ്സ്ക്രൈബ് നിങ്ങളുടെ താൽപ്പര്യത്തിന് നന്ദി
 ,Qty to Transfer,ട്രാൻസ്ഫർ ചെയ്യാൻ Qty
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,നയിക്കുന്നു അല്ലെങ്കിൽ ഉപഭോക്താക്കൾക്ക് ഉദ്ധരണികൾ.
@@ -2861,7 +2868,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ
 DocType: Quotation,In Words will be visible once you save the Quotation.,നിങ്ങൾ ക്വട്ടേഷൻ ലാഭിക്കാൻ ഒരിക്കൽ വാക്കുകളിൽ ദൃശ്യമാകും.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} നിറുത്തി
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},ബാർകോഡ് {0} ഇതിനകം ഇനം {1} ഉപയോഗിക്കുന്ന
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,വരാനിരിക്കുന്ന
@@ -2883,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,ധനകാര്യ വർഷം തിരഞ്ഞെടുക്കുക ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS ൽ എൻട്രി ഉണ്ടാക്കുവാൻ ആവശ്യമായ POS പ്രൊഫൈൽ
 DocType: Hub Settings,Name Token,ടോക്കൺ പേര്
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,സ്റ്റാൻഡേർഡ് വിൽപ്പനയുള്ളത്
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,സ്റ്റാൻഡേർഡ് വിൽപ്പനയുള്ളത്
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,കുറഞ്ഞത് ഒരു പണ്ടകശാല നിർബന്ധമാണ്
 DocType: Serial No,Out of Warranty,വാറന്റി പുറത്താണ്
 DocType: BOM Replace Tool,Replace,മാറ്റിസ്ഥാപിക്കുക
@@ -3006,7 +3013,7 @@
 DocType: Sales Invoice,Paid Amount,തുക
 ,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,യാതൊരു മറ്റ് സ്വതവേ ഇല്ല സ്വതവേ ഈ വിലാസം ഫലകം ക്രമീകരിക്കുന്നത്
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,യാതൊരു മറ്റ് സ്വതവേ ഇല്ല സ്വതവേ ഈ വിലാസം ഫലകം ക്രമീകരിക്കുന്നത്
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ഡെബിറ്റ് ഇതിനകം അക്കൗണ്ട് ബാലൻസ്, നിങ്ങൾ &#39;ക്രെഡിറ്റ്&#39; ആയി &#39;ബാലൻസ് ആയിരിക്കണം&#39; സജ്ജീകരിക്കാൻ അനുവാദമില്ലാത്ത"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,ക്വാളിറ്റി മാനേജ്മെന്റ്
 DocType: Production Planning Tool,Filter based on customer,ഉപഭോക്താവിന്റെ അടിസ്ഥാനമാക്കിയുള്ള ഫിൽറ്റർ
@@ -3107,7 +3114,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","സഹജമായിസജ്ജീകരിയ്ക്കുക സാമ്പത്തിക വർഷം സജ്ജമാക്കാൻ, &#39;സഹജമായിസജ്ജീകരിയ്ക്കുക&#39; ക്ലിക്ക് ചെയ്യുക"
 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 +19,Shortage Qty,ദൌർലഭ്യം Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,ഇനം വേരിയന്റ് {0} ഒരേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,ഇനം വേരിയന്റ് {0} ഒരേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
 DocType: Salary Slip,Salary Slip,ശമ്പളം ജി
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;തീയതി ആരംഭിക്കുന്ന&#39; ആവശ്യമാണ്
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","പ്രസവം പാക്കേജുകൾ വേണ്ടി സ്ലിപ്പിൽ പാക്കിംഗ് ജനറേറ്റുചെയ്യുക. പാക്കേജ് നമ്പർ, പാക്കേജ് ഉള്ളടക്കങ്ങളുടെ അതിന്റെ ഭാരം അറിയിക്കാൻ ഉപയോഗിച്ച."
@@ -3118,7 +3125,7 @@
 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.","ചെക്ക് ചെയ്ത ഇടപാടുകൾ ഏതെങ്കിലും &#39;സമർപ്പിച്ചു &quot;ചെയ്യുമ്പോൾ, ഒരു ഇമെയിൽ പോപ്പ്-അപ്പ് സ്വയം ഒരടുപ്പം നിലയിൽ ഇടപാട് കൂടെ ആ ഇടപാട് ബന്ധപ്പെട്ട്&quot; ബന്ധപ്പെടുക &quot;എന്ന മെയിൽ അയക്കാൻ തുറന്നു. ഉപയോക്താവിനെ അല്ലെങ്കിൽ കഴിയണമെന്നില്ല ഇമെയിൽ അയയ്ക്കാം."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,ആഗോള ക്രമീകരണങ്ങൾ
 DocType: Employee Education,Employee Education,ജീവനക്കാരുടെ വിദ്യാഭ്യാസം
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,ഇത് ഇനം വിശദാംശങ്ങൾ കൊണ്ടുവരാം ആവശ്യമാണ്.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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} ഇതിനകം ലഭിച്ചു ചെയ്തു
@@ -3144,6 +3151,7 @@
 DocType: BOM,Manufacturing User,ണം ഉപയോക്താവ്
 DocType: Purchase Order,Raw Materials Supplied,നൽകിയത് അസംസ്കൃത വസ്തുക്കൾ
 DocType: Purchase Invoice,Recurring Print Format,ആവർത്തക പ്രിന്റ് ഫോർമാറ്റ്
+DocType: C-Form,Series,സീരീസ്
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,പ്രതീക്ഷിച്ച ഡെലിവറി തീയതി വാങ്ങൽ ഓർഡർ തീയതി മുമ്പ് ആകാൻ പാടില്ല
 DocType: Appraisal,Appraisal Template,അപ്രൈസൽ ഫലകം
 DocType: Item Group,Item Classification,ഇനം തിരിക്കൽ
@@ -3219,7 +3227,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},വരി {0}: ഒരു പുനഃക്രമീകരിക്കുക എൻട്രി ഇതിനകം ഈ വെയർഹൗസ് {1} നിലവിലുണ്ട്
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.","നഷ്ടപ്പെട്ട പോലെ ക്വട്ടേഷൻ വെളിപ്പെടുത്താമോ കാരണം, വർണ്ണിക്കും ചെയ്യാൻ കഴിയില്ല."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,വാങ്ങൽ മാസ്റ്റർ മാനേജർ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,പ്രൊഡക്ഷൻ ഓർഡർ {0} സമർപ്പിക്കേണ്ടതാണ്
@@ -3227,7 +3235,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,പ്രധാന റിപ്പോർട്ടുകൾ
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ഇന്നുവരെ തീയതി മുതൽ മുമ്പ് ആകാൻ പാടില്ല
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,എഡിറ്റ് വിലകൾ / ചേർക്കുക
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,എന്റെ ഉത്തരവുകൾ
@@ -3275,7 +3283,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},വരി # {0}: ഇനത്തിന്റെ വേണ്ടി സജ്ജമാക്കുക വിതരണക്കാരൻ {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,വെബ്സൈറ്റ് ചിത്രം {0} ഇനം ഘടിപ്പിച്ചിരിക്കുന്ന {1} കണ്ടെത്താൻ കഴിയുന്നില്ല
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,വെബ്സൈറ്റ് ചിത്രം {0} ഇനം ഘടിപ്പിച്ചിരിക്കുന്ന {1} കണ്ടെത്താൻ കഴിയുന്നില്ല
 DocType: Issue,Content Type,ഉള്ളടക്ക തരം
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,കമ്പ്യൂട്ടർ
 DocType: Item,List this Item in multiple groups on the website.,വെബ്സൈറ്റിൽ ഒന്നിലധികം സംഘങ്ങളായി ഈ ഇനം കാണിയ്ക്കുക.
@@ -3289,7 +3297,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,&#39;അതെ&#39; നോൺ-ഓഹരി ഇനത്തിന്റെ വേണ്ടി ആകാൻ പാടില്ല &#39;സീരിയൽ നോ ഉണ്ട്&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,&#39;അതെ&#39; നോൺ-ഓഹരി ഇനത്തിന്റെ വേണ്ടി ആകാൻ പാടില്ല &#39;സീരിയൽ നോ ഉണ്ട്&#39;
 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,അക്കൗണ്ട് ഹെഡ്
@@ -3315,7 +3323,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,അക്കൗണ്ട് {0} അടയ്ക്കുന്നത് തരം ബാധ്യത / ഇക്വിറ്റി എന്ന ഉണ്ടായിരിക്കണം
 DocType: Authorization Rule,Based On,അടിസ്ഥാനപെടുത്തി
 DocType: Sales Order Item,Ordered Qty,ഉത്തരവിട്ടു Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,ഇനം {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,ഇനം {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
 DocType: Stock Settings,Stock Frozen Upto,ഓഹരി ശീതീകരിച്ച വരെ
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},നിന്നും കാലഘട്ടം {0} ആവർത്ത വേണ്ടി നിർബന്ധമായി തീയതി വരെയുള്ള
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,പ്രോജക്ട് പ്രവർത്തനം / ചുമതല.
@@ -3323,7 +3331,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","ബാധകമായ വേണ്ടി {0} തിരഞ്ഞെടുക്കപ്പെട്ടു എങ്കിൽ വാങ്ങൽ, ചെക്ക് ചെയ്തിരിക്കണം"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ഡിസ്കൗണ്ട് 100 താഴെ ആയിരിക്കണം
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ഓഫാക്കുക എഴുതുക തുക (കമ്പനി കറൻസി)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,വരി # {0}: സജ്ജീകരിക്കുക പുനഃക്രമീകരിക്കുക അളവ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,വരി # {0}: സജ്ജീകരിക്കുക പുനഃക്രമീകരിക്കുക അളവ്
 DocType: Landed Cost Voucher,Landed Cost Voucher,ചെലവ് വൗച്ചർ റജിസ്റ്റർ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},{0} സജ്ജീകരിക്കുക
 DocType: Purchase Invoice,Repeat on Day of Month,മാസം നാളിൽ ആവർത്തിക്കുക
@@ -3395,7 +3403,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ഇപ്പോൾ കാണുക
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,ഇൻവോയ്സ് യാന്ത്രികമായി സൃഷ്ടിച്ച് ചെയ്യുന്ന കാലഘട്ടം തിരഞ്ഞെടുക്കുക
 DocType: BOM,Raw Material Cost,അസംസ്കൃത വസ്തുക്കളുടെ വില
-DocType: Item,Re-Order Level,വീണ്ടും ഓർഡർ ലെവൽ
+DocType: Item Reorder,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 ആസൂത്രണം."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,ഭാഗിക സമയം
 DocType: Employee,Applicable Holiday List,ഉപയുക്തമായ ഹോളിഡേ പട്ടിക
@@ -3450,7 +3458,7 @@
 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 +573,Please specify Attribute Value for attribute {0},ആട്രിബ്യൂട്ട് {0} മൂല്യം ആട്രിബ്യൂട്ട് വ്യക്തമാക്കുക
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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} നേരെ നിയോഗിക്കുകയും കഴിയില്ല
@@ -3529,7 +3537,7 @@
 DocType: Address,Office,ഓഫീസ്
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,അക്കൗണ്ടിംഗ് എൻട്രികൾ.
 DocType: Delivery Note Item,Available Qty at From Warehouse,വെയർഹൗസിൽ നിന്ന് ലഭ്യമായ Qty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,എംപ്ലോയീസ് റെക്കോർഡ് ആദ്യം തിരഞ്ഞെടുക്കുക.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,എംപ്ലോയീസ് റെക്കോർഡ് ആദ്യം തിരഞ്ഞെടുക്കുക.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,ചിലവേറിയ നൽകുക
@@ -3604,7 +3612,7 @@
 DocType: Item Attribute,Numeric Values,സാംഖിക മൂല്യങ്ങൾ
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,ലോഗോ അറ്റാച്ച്
 DocType: Customer,Commission Rate,കമ്മീഷൻ നിരക്ക്
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,വേരിയന്റ് നിർമ്മിക്കുക
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,വേരിയന്റ് നിർമ്മിക്കുക
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,വകുപ്പിന്റെ ലീവ് പ്രയോഗങ്ങൾ തടയുക.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,കാർട്ട് ശൂന്യമാണ്
 DocType: Production Order,Actual Operating Cost,യഥാർത്ഥ ഓപ്പറേറ്റിംഗ് ചെലവ്
@@ -3621,15 +3629,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item","പുനഃക്രമീകരിക്കുക നില സജ്ജീകരിക്കാൻ, ഇനം ഒരു പർച്ചേസ് ഇനം അല്ലെങ്കിൽ ണം ഇനം ആയിരിക്കണം"
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),(അര ദിവസം)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(അര ദിവസം)
 DocType: Supplier,Credit Days,ക്രെഡിറ്റ് ദിനങ്ങൾ
 DocType: Leave Type,Is Carry Forward,മുന്നോട്ട് വിലക്കുണ്ടോ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,BOM ൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv
index b1a6ee2..89a4696 100644
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% बिल
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),विनिमय दर समान असणे आवश्यक आहे {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ग्राहक नाव
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},बँक खाते म्हणून नावाच्या करणे शक्य नाही {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},बँक खाते म्हणून नावाच्या करणे शक्य नाही {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),बाकी {0} असू शकत नाही कमी शून्य ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,नवी रजेचा अर्ज
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,नवी रजेचा अर्ज
 apps/erpnext/erpnext/setup/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,भरणा खाते मोड
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","कार्यक्रमांचे लॉग, बिलिंग वेळ ट्रॅक वापरले जाऊ शकते कार्ये वापरकर्त्यांना केले."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},नवी {0}: # {1}
 ,Sales Partners Commission,विक्री भागीदार आयोग
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,5 पेक्षा जास्त वर्ण असू शकत नाही संक्षेप
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,5 पेक्षा जास्त वर्ण असू शकत नाही संक्षेप
 DocType: Payment Request,Payment Request,भरणा विनंती
 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.",मूल्य {0} {1} आयटम म्हणून रूपे \ काढले जाऊ शकत नाही विशेषता या विशेषता सह अस्तित्वात.
@@ -195,6 +195,7 @@
 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 (%),दर सूची रेट सूट (%)
 DocType: Offer Letter,Select Terms and Conditions,निवडा अटी आणि नियम
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,मूल्य
 DocType: Production Planning Tool,Sales Orders,विक्री ऑर्डर
 DocType: Purchase Taxes and Charges,Valuation,मूल्यांकन
 ,Purchase Order Trends,ऑर्डर ट्रेन्ड खरेदी
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,दूरदर्शन
 DocType: Production Order Operation,Updated via 'Time Log',&#39;वेळ लॉग&#39; द्वारे अद्यतनित
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},खाते {0} कंपनी संबंधित नाही {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},आगाऊ रक्कम पेक्षा जास्त असू शकत नाही {0} {1}
 DocType: Naming Series,Series List for this Transaction,या व्यवहारासाठी मालिका यादी
 DocType: Sales Invoice,Is Opening Entry,प्रवेश उघडत आहे
 DocType: Customer Group,Mention if non-standard receivable account applicable,"उल्लेख करावा, गैर-मानक प्राप्त खाते लागू असल्यास"
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,वर उल्लेख केलेल्या निकष पगार स्लिप तयार.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,दिलेली नाही वर्णन
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,खरेदीसाठी विनंती.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,केवळ निवडलेले रजा मंजुरी या रजेचा अर्ज सादर करू शकतो
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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} सेटअप&gt; सेटिंग्ज द्वारे&gt; नामांकन मालिका मालिका नामांकन सेट करा
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},{0} कोठार कंपनी संबंधित नाही {1}
 DocType: Item Website Specification,Item Website Specification,आयटम वेबसाइट तपशील
 DocType: Payment Tool,Reference No,संदर्भ नाही
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,सोडा अवरोधित
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},आयटम {0} वर जीवनाची ओवरनंतर गाठली आहे {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,सोडा अवरोधित
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},आयटम {0} वर जीवनाची ओवरनंतर गाठली आहे {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेअर मेळ आयटम
 DocType: Stock Entry,Sales Invoice No,विक्री चलन नाही
@@ -248,7 +250,7 @@
 DocType: Pricing Rule,Supplier Type,पुरवठादार प्रकार
 DocType: Item,Publish in Hub,हब मध्ये प्रकाशित
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,{0} आयटम रद्द
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,{0} आयटम रद्द
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,साहित्य विनंती
 DocType: Bank Reconciliation,Update Clearance Date,अद्यतन लाभ तारीख
 DocType: Item,Purchase Details,खरेदी तपशील
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,डिलिव्हरी टीप
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,कर सेट अप
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,तुम्ही तो धावा केल्यानंतर भरणा प्रवेश सुधारणा करण्यात आली आहे. पुन्हा तो खेचणे करा.
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} आयटम कर दोनदा प्रवेश केला
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,महिना आणि वर्ष निवडा कृपया
@@ -327,7 +329,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,आपला ई-मेल पत्ता
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,संलग्नक पहा कृपया
 DocType: Purchase Order,% Received,% प्राप्त
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,सेटअप आधीच पूर्ण !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,सेटअप आधीच पूर्ण !!
 ,Finished Goods,तयार वस्तू
 DocType: Delivery Note,Instructions,सूचना
 DocType: Quality Inspection,Inspected By,करून पाहणी केली
@@ -352,14 +354,13 @@
 ,Purchase Register,खरेदी नोंदणी
 DocType: Landed Cost Item,Applicable Charges,लागू असलेले शुल्क
 DocType: Workstation,Consumable Cost,Consumable खर्च
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 'रजा मंजुरी' भूमिका असणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 'रजा मंजुरी' भूमिका असणे आवश्यक आहे
 DocType: Purchase Receipt,Vehicle Date,वाहन तारीख
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,वैद्यकीय
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,तोट्याचा कारण
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},वर्कस्टेशन सुट्टी यादी नुसार खालील तारखांना बंद आहे: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,संधी
 DocType: Employee,Single,सिंगल
-DocType: Issue,Attachment,संलग्नक
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,अर्थसंकल्पात गट खर्च केंद्र सेट केली जाऊ शकत नाही
 DocType: Account,Cost of Goods Sold,माल किंमत विक्री
 DocType: Purchase Invoice,Yearly,वार्षिक
@@ -388,7 +389,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,विशेषता {0} विशेषता टेबल अनेक वेळा निवड
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,विशेषता {0} विशेषता टेबल अनेक वेळा निवड
 DocType: HR Settings,Employee record is created using selected field. ,कर्मचारी रेकॉर्ड निवडले फील्ड वापरून तयार आहे.
 DocType: Sales Order,Not Applicable,लागू नाही
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,सुट्टी मास्टर.
@@ -427,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,सौंदर्यप्रसाधन
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items","विलीन करण्यासाठी, खालील गुणधर्म दोन्ही आयटम समान असणे आवश्यक आहे"
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","विलीन करण्यासाठी, खालील गुणधर्म दोन्ही आयटम समान असणे आवश्यक आहे"
 DocType: Shipping Rule,Net Weight,नेट वजन
 DocType: Employee,Emergency Phone,आणीबाणी फोन
 ,Serial No Warranty Expiry,सिरियल कोणतीही हमी कालावधी समाप्ती
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,व्यवस्थापकीय Subcontracting
 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,दर प्राईस यादी चलन येथे कंपनीच्या बेस चलनात रुपांतरीत आहे
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},{0} खाते कंपनी संबंधित नाही: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},{0} खाते कंपनी संबंधित नाही: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,संक्षेप कंपनीसाठी आधीच वापरला
 DocType: Selling Settings,Default Customer Group,मुलभूत ग्राहक गट
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","अक्षम केल्यास, &#39;गोळाबेरीज एकूण&#39; क्षेत्रात काही व्यवहार दृश्यमान होणार नाही"
 DocType: BOM,Operating Cost,ऑपरेटिंग खर्च
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,चलन टेबल आढळली नाही रेकॉर्ड
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,पहिल्या कंपनी आणि पक्षाचे प्रकार निवडा
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,आर्थिक / लेखा वर्षी.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,जमा मूल्ये
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","क्षमस्व, सिरीयल क्रमांक विलीन करणे शक्य नाही"
 DocType: Project Task,Project Task,प्रकल्प कार्य
 ,Lead Id,लीड आयडी
@@ -492,7 +495,7 @@
 DocType: Quotation,Quotation To,करण्यासाठी कोटेशन
 DocType: Lead,Middle Income,मध्यम उत्पन्न
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),उघडणे (कोटी)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"आपण आधीच दुसर्या UOM काही व्यवहार (चे) केले आहे कारण आयटम साठी उपाय, डीफॉल्ट युनिट {0} थेट बदलले जाऊ शकत नाही. आपण वेगळी डीफॉल्ट UOM वापरण्यासाठी नवीन आयटम तयार करणे आवश्यक आहे."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"आपण आधीच दुसर्या UOM काही व्यवहार (चे) केले आहे कारण आयटम साठी उपाय, डीफॉल्ट युनिट {0} थेट बदलले जाऊ शकत नाही. आपण वेगळी डीफॉल्ट UOM वापरण्यासाठी नवीन आयटम तयार करणे आवश्यक आहे."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,रक्कम नकारात्मक असू शकत नाही
 DocType: Purchase Order Item,Billed Amt,बिल रक्कम
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,स्टॉक नोंदी केले जातात जे विरोधात लॉजिकल वखार.
@@ -570,7 +573,7 @@
 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 +543,Item has variants.,आयटम रूपे आहेत.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,वृक्ष प्रकार
@@ -583,6 +586,7 @@
 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 +33,Goods received from Suppliers.,वस्तू पुरवठादार प्राप्त झाली.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,मूल्य
 DocType: Lead,Campaign Name,मोहीम नाव
 ,Reserved,राखीव
 DocType: Purchase Order,Supply Raw Materials,पुरवठा कच्चा माल
@@ -597,16 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,विद्यमान व्यवहार खाते लेजर रूपांतरीत केले जाऊ शकत नाही
 DocType: Delivery Note,Customer's Purchase Order No,ग्राहक च्या पर्चेस नाही
 DocType: Employee,Cell Number,सेल क्रमांक
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,ऑटो साहित्य विनंत्या व्युत्पन्न
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,ऑटो साहित्य विनंत्या व्युत्पन्न
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,गमावले
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,रकान्याच्या &#39;जर्नल प्रवेश विरुद्ध&#39; सध्याच्या व्हाउचर प्रविष्ट करू शकत नाही
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ऊर्जा
 DocType: Opportunity,Opportunity From,पासून संधी
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,मासिक पगार विधान.
 DocType: Item Group,Website Specifications,वेबसाइट वैशिष्ट्य
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},आपले पत्ता साचा त्रुटी आहे {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,नवीन खाते
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: पासून {0} प्रकारच्या {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,रो {0}: रूपांतरण फॅक्टर अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","अनेक किंमत नियम समान निकष अस्तित्वात नाही, प्राधान्य सोपवून संघर्षाचे निराकरण करा. किंमत नियम: {0}"
 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.,लेखा नोंदी पानांचे नोडस् विरुद्ध केले जाऊ शकते. गट विरुद्ध नोंदी परवानगी नाही.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,निष्क्रिय किंवा इतर BOMs निगडीत आहे म्हणून BOM रद्द करू शकत नाही
 DocType: Opportunity,Maintenance,देखभाल
@@ -649,7 +655,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,किंमत सूची निवडलेले नाही
 DocType: Employee,Family Background,कौटुंबिक पार्श्वभूमी
 DocType: Process Payroll,Send Email,ईमेल पाठवा
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},चेतावणी: अवैध संलग्नक {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},चेतावणी: अवैध संलग्नक {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,कोणतीही परवानगी नाही
 DocType: Company,Default Bank Account,मुलभूत बँक खाते
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","पार्टी आधारित फिल्टर कर यासाठी, पयायय पार्टी पहिल्या टाइप करा"
@@ -679,13 +685,13 @@
 DocType: Production Planning Tool,Select Items,निवडा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} बिल विरुद्ध {1} दिनांक {2}
 DocType: Maintenance Visit,Completion Status,पूर्ण स्थिती
-DocType: Sales Invoice Item,Target Warehouse,लक्ष्य कोठार
+DocType: Production Order,Target Warehouse,लक्ष्य कोठार
 DocType: Item,Allow over delivery or receipt upto this percent,या टक्के पर्यंत चेंडू किंवा पावती प्रती परवानगी द्या
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,अपेक्षित वितरण तारीख विक्री ऑर्डर तारीख आधी असू शकत नाही
 DocType: Upload Attendance,Import Attendance,आयात हजेरी
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,सर्व आयटम गट
 DocType: Process Payroll,Activity Log,क्रियाकलाप लॉग
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,निव्वळ नफा / तोटा
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,निव्वळ नफा / तोटा
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,स्वयंचलितपणे व्यवहार सादर संदेश तयार करा.
 DocType: Production Order,Item To Manufacture,आयटम निर्मिती करणे
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} स्थिती {2} आहे
@@ -693,7 +699,7 @@
 DocType: Sales Order Item,Projected Qty,अंदाज Qty
 DocType: Sales Invoice,Payment Due Date,पैसे भरण्याची शेवटची तारिख
 DocType: Newsletter,Newsletter Manager,वृत्तपत्र व्यवस्थापक
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,आयटम व्हेरियंट {0} आधीच समान गुणधर्म अस्तित्वात
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,आयटम व्हेरियंट {0} आधीच समान गुणधर्म अस्तित्वात
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;उघडणे&#39;
 DocType: Notification Control,Delivery Note Message,डिलिव्हरी टीप संदेश
 DocType: Expense Claim,Expenses,खर्च
@@ -703,7 +709,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,संशोधन आणि विकास
 ,Amount to Bill,बिल रक्कम
 DocType: Company,Registration Details,नोंदणी तपशील
-DocType: Item,Re-Order Qty,पुन्हा-क्रम Qty
+DocType: Item Reorder,Re-Order Qty,पुन्हा-क्रम Qty
 DocType: Leave Block List Date,Leave Block List Date,ब्लॉक यादी तारीख सोडा
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},पाठविण्याची अनुसूचित {0}
 DocType: Pricing Rule,Price or Discount,किंमत किंवा सवलत
@@ -746,7 +752,7 @@
 DocType: Bank Reconciliation,Total Amount,एकूण रक्कम
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,इंटरनेट प्रकाशन
 DocType: Production Planning Tool,Production Orders,उत्पादन ऑर्डर
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,शिल्लक मूल्य
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,शिल्लक मूल्य
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,विक्री किंमत सूची
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,आयटम समक्रमित करण्यासाठी प्रकाशित
 DocType: Bank Reconciliation,Account Currency,खाते चलन
@@ -755,7 +761,7 @@
 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 +538,Item Variants {0} updated,आयटम रूपे {0} अद्ययावत
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,आयटम रूपे {0} अद्ययावत
 DocType: Quality Inspection Reading,Reading 6,6 वाचन
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,चलन आगाऊ खरेदी
 DocType: Address,Shop,दुकान
@@ -832,7 +838,7 @@
 DocType: POS Profile,Cash/Bank Account,रोख / बँक खाते
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,प्रमाणात किंवा मूल्य नाही बदल काढली आयटम.
 DocType: Delivery Note,Delivery To,वितरण
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,सवलत
@@ -860,7 +866,7 @@
 DocType: Tax Rule,Shipping State,शिपिंग राज्य
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,आयटम &#39;बटण खरेदी पावत्या आयटम मिळवा&#39; वापर करून समाविष्ट करणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,विक्री खर्च
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,मानक खरेदी
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,मानक खरेदी
 DocType: GL Entry,Against,विरुद्ध
 DocType: Item,Default Selling Cost Center,मुलभूत विक्री खर्च केंद्र
 DocType: Sales Partner,Implementation Partner,अंमलबजावणी भागीदार
@@ -902,7 +908,7 @@
 DocType: Sales Partner,Distributor,वितरक
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,हे खरेदी सूचीत टाका शिपिंग नियम
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन ऑर्डर {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',सेट &#39;वर अतिरिक्त सवलत लागू करा&#39; करा
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',सेट &#39;वर अतिरिक्त सवलत लागू करा&#39; करा
 ,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.,वेळ नोंदी निवडा आणि एक नवीन विक्री चलन तयार करण्यासाठी सबमिट करा.
@@ -970,9 +976,9 @@
 DocType: Contact,User ID,वापरकर्ता आयडी
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,पहा लेजर
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,लवकरात लवकर
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group","एक आयटम गट त्याच नावाने अस्तित्वात नाही, आयटम नाव बदलू किंवा आयटम गटाचे नाव कृपया"
 DocType: Production Order,Manufacture against Sales Order,विक्री ऑर्डर विरुद्ध उत्पादन
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,उर्वरित जग
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,एकूण वेतन
@@ -1002,7 +1008,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","क्षमस्व, कंपन्या विलीन करणे शक्य नाही"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","क्षमस्व, कंपन्या विलीन करणे शक्य नाही"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,लहान
 DocType: Employee,Employee Number,कर्मचारी संख्या
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},प्रकरण नाही (चे) आधीपासून वापरात आहे. प्रकरण नाही ते पहा {0}
@@ -1021,7 +1027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,कृषी
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,आपली उत्पादने किंवा सेवा
 DocType: Mode of Payment,Mode of Payment,मोड ऑफ पेमेंट्स
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,वेबसाइट प्रतिमा सार्वजनिक फाइल किंवा वेबसाइट URL असावी
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,वेबसाइट प्रतिमा सार्वजनिक फाइल किंवा वेबसाइट URL असावी
 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,वखार संपर्क माहिती
@@ -1093,6 +1099,7 @@
 DocType: Address,Utilities,उपयुक्तता
 DocType: Purchase Invoice Item,Accounting,लेखा
 DocType: Features Setup,Features Setup,वैशिष्ट्ये सेटअप
+DocType: Item,Is Service Item,सेवा आयटम आहे
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,अर्ज काळात बाहेर रजा वाटप कालावधी असू शकत नाही
 DocType: Activity Cost,Projects,प्रकल्प
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,आर्थिक वर्ष निवडा कृपया
@@ -1123,7 +1130,7 @@
 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 +465,cannot be greater than 100,पेक्षा जास्त 100 असू शकत नाही
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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,पे न करता सोडू अवलंबून
@@ -1182,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,सरकार
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,आयटम रूपे
 DocType: Company,Services,सेवा
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),एकूण ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),एकूण ({0})
 DocType: Cost Center,Parent Cost Center,पालक खर्च केंद्र
 DocType: Sales Invoice,Source,स्रोत
 DocType: Leave Type,Is Leave Without Pay,पे न करता सोडू आहे
@@ -1255,17 +1262,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,भरणा ईमेल पुन्हा पाठवा
 DocType: Dependent Task,Dependent Task,अवलंबित कार्य
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},प्रकारच्या रजा {0} जास्त असू शकत नाही {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,नाश रक्कम
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} पहा
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,रोख निव्वळ बदला
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,रोख निव्वळ बदला
 DocType: Salary Structure Deduction,Salary Structure Deduction,वेतन संरचना कपात
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,माप {0} युनिट रुपांतर फॅक्टर टेबल एकदा पेक्षा अधिक प्रविष्ट केले गेले आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,माप {0} युनिट रुपांतर फॅक्टर टेबल एकदा पेक्षा अधिक प्रविष्ट केले गेले आहे
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},भरणा विनंती आधीपासूनच अस्तित्वात {0}
 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 +182,Quantity must not be more than {0},प्रमाण जास्त असू शकत नाही {0}
@@ -1327,7 +1334,7 @@
 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: Packed Item,To Warehouse (Optional),गुदाम (पर्यायी)
 DocType: Sales Invoice,Paid Amount (Company Currency),पेड रक्कम (कंपनी चलन)
 DocType: Purchase Invoice,Additional Discount,अतिरिक्त सवलत
 DocType: Selling Settings,Selling Settings,सेटिंग्ज विक्री
@@ -1336,7 +1343,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","कंपनी, महिना आणि आर्थिक वर्ष अनिवार्य आहे"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,विपणन खर्च
 ,Item Shortage Report,आयटम कमतरता अहवाल
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",वजन \ n कृपया खूप &quot;वजन UOM&quot; उल्लेख उल्लेख आहे
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",वजन \ n कृपया खूप &quot;वजन UOM&quot; उल्लेख उल्लेख आहे
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,साहित्य विनंती या शेअर नोंद करणे वापरले
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,एक आयटम एकच एकक.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',वेळ लॉग बॅच {0} &#39;सादर&#39; करणे आवश्यक आहे
@@ -1347,6 +1354,7 @@
 DocType: Employee,Date Of Retirement,निवृत्ती तारीख
 DocType: Upload Attendance,Get Template,साचा मिळवा
 DocType: Address,Postal,पोस्टल
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext सेटअप पूर्ण!
 DocType: Item,Weightage,वजन
 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,एक ग्राहक गट तत्सम नावाने विद्यमान ग्राहक नाव बदलू किंवा ग्राहक गट नाव बदला करा
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,{0} पहिल्या निवडा.
@@ -1375,12 +1383,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,बरेच स्तंभ. अहवाल निर्यात करा आणि एक स्प्रेडशीट अनुप्रयोग वापरून मुद्रित करा.
 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 +139,Main,मुख्य
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,मुख्य
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,जिच्यामध्ये variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,तुमचा व्यवहार वर मालिका संख्या सेट पूर्वपद
 DocType: Employee Attendance Tool,Employees HTML,कर्मचारी एचटीएमएल
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,थांबवले आदेश रद्द केले जाऊ शकत नाही. रद्द करण्यासाठी बूच.
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,मुलभूत BOM ({0}) या आयटम किंवा त्याच्या साचा सक्रिय असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,रूपे
@@ -1405,7 +1413,6 @@
 DocType: Sales Order,To Deliver and Bill,वाचव आणि बिल
 DocType: GL Entry,Credit Amount in Account Currency,खाते चलन क्रेडिट रक्कम
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,उत्पादन वेळ नोंदी.
-DocType: Item,Apply Warehouse-wise Reorder Level,कोठार कुशल पुनर्क्रमित स्तर लागू करा
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} सादर करणे आवश्यक आहे
 DocType: Authorization Control,Authorization Control,प्राधिकृत नियंत्रण
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},रो # {0}: वखार नाकारलेले नाकारले आयटम विरुद्ध अनिवार्य आहे {1}
@@ -1503,6 +1510,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,रो # {0}: ऑपरेशन {1} उत्पादन पूर्ण माल {2} qty पूर्ण नाही आहे ऑर्डर # {3}. वेळ नोंदी द्वारे ऑपरेशन स्थिती अद्यतनित करा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,गुंतवणूक
 DocType: Issue,Resolution Details,ठराव तपशील
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,वाटप
 DocType: Quality Inspection Reading,Acceptance Criteria,स्वीकृती निकष
 DocType: Item Attribute,Attribute Name,विशेषता नाव
 DocType: Item Group,Show In Website,वेबसाइट मध्ये दर्शवा
@@ -1553,7 +1561,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,खर्च दावा मंजुरीसाठी प्रलंबित आहे. फक्त खर्च माफीचा साक्षीदार स्थिती अद्यतनित करू शकता.
 DocType: Purchase Invoice,Additional Discount Amount,अतिरिक्त सवलत रक्कम
 DocType: Leave Block List Allow,Leave Block List Allow,ब्लॉक यादी परवानगी द्या सोडा
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr रिक्त किंवा जागा असू शकत नाही
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr रिक्त किंवा जागा असू शकत नाही
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,नॉन-गट गट
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,क्रीडा
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,वास्तविक एकूण
@@ -1594,7 +1602,7 @@
 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**.,** आर्थिक वर्ष ** एक आर्थिक वर्ष प्रस्तुत करते. सर्व लेखा नोंदणी व इतर प्रमुख व्यवहार ** ** आर्थिक वर्ष विरुद्ध नियंत्रीत केले जाते.
 DocType: Opportunity,Customer / Lead Address,ग्राहक / लीड पत्ता
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},चेतावणी: जोड वर अवैध SSL प्रमाणपत्र {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},चेतावणी: जोड वर अवैध SSL प्रमाणपत्र {0}
 DocType: Production Order Operation,Actual Operation Time,वास्तविक ऑपरेशन वेळ
 DocType: Authorization Rule,Applicable To (User),लागू करण्यासाठी (सदस्य)
 DocType: Purchase Taxes and Charges,Deduct,वजा
@@ -1743,7 +1751,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,प्रकरण क्रमांक 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,आपण (चॅनेल भागीदार) विक्री संघ आणि विक्री भागीदार असल्यास ते टॅग आणि विक्री क्रियाकलाप त्यांच्या योगदान राखण्यासाठी जाऊ शकते
 DocType: Item,Show a slideshow at the top of the page,पृष्ठाच्या शीर्षस्थानी स्लाईड शो दर्शवा
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,स्टोअर्स
+DocType: Item,"Allow in Sales Order of type ""Service""",प्रकार &quot;सेवा&quot; विक्री ऑर्डर परवानगी द्या
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,स्टोअर्स
 DocType: Time Log,Projects Manager,प्रकल्प व्यवस्थापक
 DocType: Serial No,Delivery Time,वितरण वेळ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,आधारित Ageing
@@ -1768,7 +1777,7 @@
 ,Financial Analytics,आर्थिक विश्लेषण
 DocType: Quality Inspection,Verified By,द्वारा सत्यापित केली
 DocType: Address,Subsidiary,उपकंपनी
-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.","विद्यमान व्यवहार आहेत कारण, कंपनीच्या मुलभूत चलन बदलू शकत नाही. व्यवहार मुलभूत चलन बदलण्यासाठी रद्द करणे आवश्यक आहे."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","विद्यमान व्यवहार आहेत कारण, कंपनीच्या मुलभूत चलन बदलू शकत नाही. व्यवहार मुलभूत चलन बदलण्यासाठी रद्द करणे आवश्यक आहे."
 DocType: Quality Inspection,Purchase Receipt No,खरेदी पावती नाही
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,बयाणा रक्कम
 DocType: Process Payroll,Create Salary Slip,पगाराच्या स्लिप्स तयार करा
@@ -1816,7 +1825,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,कच्चा माल रिक्त असू शकत नाही.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","शेअर अद्यतनित करू शकत नाही, बीजक ड्रॉप शिपिंग आयटम आहे."
 DocType: Newsletter,Test,कसोटी
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'","सध्याच्या स्टॉक व्यवहार आपण मूल्ये बदलू शकत नाही \ या आयटम, आहेत म्हणून &#39;सिरियल नाही आहे&#39; &#39;&#39; बॅच आहे नाही &#39;,&#39; शेअर आयटम आहे &#39;आणि&#39; मूल्यांकन पद्धत &#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,जलद प्रवेश जर्नल
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,BOM कोणत्याही आयटम agianst उल्लेख केला तर आपण दर बदलू शकत नाही
@@ -1905,7 +1914,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,कृपया वितरण टीप पहिल्या
 DocType: Purchase Invoice,Currency and Price List,चलन आणि किंमत यादी
 DocType: Opportunity,Customer / Lead Name,ग्राहक / लीड नाव
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,निपटारा तारीख नमूद केलेली नाही
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,निपटारा तारीख नमूद केलेली नाही
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,उत्पादन
 DocType: Item,Allow Production Order,परवानगी द्या उत्पादन ऑर्डर
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,रो {0}: प्रारंभ तारीख अंतिम तारखेपूर्वी असणे आवश्यक आहे
@@ -1915,7 +1924,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,एकूण कमाई
 DocType: Purchase Receipt,Time at which materials were received,"साहित्य प्राप्त झाले, ज्या वेळ"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,माझे पत्ते
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,माझे पत्ते
 DocType: Stock Ledger Entry,Outgoing Rate,जाणारे दर
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,संघटना शाखा मास्टर.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,किंवा
@@ -1984,7 +1993,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,ग्राहक गट वृक्ष व्यवस्थापित करा.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,नवी खर्च केंद्र नाव
 DocType: Leave Control Panel,Leave Control Panel,नियंत्रण पॅनेल सोडा
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,डीफॉल्ट पत्ता साचा आढळले. सेटअप&gt; मुद्रण आणि ब्रँडिंग&gt; पत्ता साचा एक नवीन तयार करा.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,डीफॉल्ट पत्ता साचा आढळले. सेटअप&gt; मुद्रण आणि ब्रँडिंग&gt; पत्ता साचा एक नवीन तयार करा.
 DocType: Appraisal,HR User,एचआर सदस्य
 DocType: Purchase Invoice,Taxes and Charges Deducted,कर आणि शुल्क वजा
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,मुद्दे
@@ -2001,7 +2010,7 @@
 ,Sales Browser,विक्री ब्राउझर
 DocType: Journal Entry,Total Credit,एकूण क्रेडिट
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: आणखी {0} # {1} स्टॉक प्रवेश विरुद्ध अस्तित्वात {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,स्थानिक
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,मोठे
@@ -2020,7 +2029,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,आपण सेट आणि लक्ष्य निरीक्षण करू शकता जेणेकरून सर्व विक्री व्यवहार अनेक ** विक्री व्यक्ती ** विरुद्ध टॅग केले जाऊ शकते.
 ,S.O. No.,त्यामुळे क्रमांक
 DocType: Production Order Operation,Make Time Log,वेळ लॉग करा
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,पुनर्क्रमित प्रमाण सेट करा
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},लीड ग्राहक तयार करा {0}
 DocType: Price List,Applicable for Countries,देश साठी लागू
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,संगणक
@@ -2095,7 +2103,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,संबंधित नोंदी मिळवा
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,शेअर एकट्या प्रवेश
 DocType: Sales Invoice,Sales Team1,विक्री Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,आयटम {0} अस्तित्वात नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,आयटम {0} अस्तित्वात नाही
 DocType: Sales Invoice,Customer Address,ग्राहक पत्ता
 DocType: Payment Request,Recipient and Message,प्राप्तकर्ता आणि संदेश
 DocType: Purchase Invoice,Apply Additional Discount On,अतिरिक्त सवलत लागू
@@ -2137,7 +2145,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,मूल्यांकन दर
 apps/erpnext/erpnext/stock/get_item_details.py +274,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} वरील &#39;खरेदी पावत्या&#39; टेबल मध्ये अस्तित्वात नाही खरेदी पावती
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,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 +155,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,लॉग पुनर्नामित करा
@@ -2175,7 +2183,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,तारीख relieving प्रविष्ट करा.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,रक्कम
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,फक्त स्थिती &#39;मंजूर&#39; सादर केला जाऊ शकतो अनुप्रयोग सोडा
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,पत्ता शीर्षक आवश्यक आहे.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,पत्ता शीर्षक आवश्यक आहे.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,चौकशी स्रोत मोहिम आहे तर मोहीम नाव प्रविष्ट करा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,वृत्तपत्र प्रकाशक
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,आर्थिक वर्ष निवडा
@@ -2199,6 +2207,7 @@
 DocType: UOM,Must be Whole Number,संपूर्ण क्रमांक असणे आवश्यक आहे
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(दिवस मध्ये) वाटप नवी पाने
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,सिरियल नाही {0} अस्तित्वात नाही
+DocType: Sales Invoice Item,Customer Warehouse (Optional),ग्राहक भांडार (पर्यायी)
 DocType: Pricing Rule,Discount Percentage,सवलत टक्केवारी
 DocType: Payment Reconciliation Invoice,Invoice Number,चलन क्रमांक
 apps/erpnext/erpnext/hooks.py +55,Orders,आदेश
@@ -2308,7 +2317,7 @@
 DocType: Appraisal,Appraisal,मूल्यमापन
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,तारीख पुनरावृत्ती आहे
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,अधिकृत स्वाक्षरीकर्ता
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},एक असणे आवश्यक आहे माफीचा साक्षीदार सोडा {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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,प्रारंभ वेळ
@@ -2477,7 +2486,7 @@
 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 +733,Show tax break-up,शो कर ब्रेक अप
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,शो कर ब्रेक अप
 apps/erpnext/erpnext/accounts/party.py +283,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',तुम्ही मॅन्युफॅक्चरिंग क्रियाकलाप सहभागी तर. सक्षम आयटम &#39;उत्पादित आहे&#39;
@@ -2526,7 +2535,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,पुन्हा-टाइप करा कंपनीचे नाव पुष्टी करा
@@ -2553,8 +2562,6 @@
 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,प्रवेश दिनांक जन्म तारीख पेक्षा जास्त असणे आवश्यक आहे
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,वेतन रचना
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","एकापेक्षा जास्त किंमत नियम समान निकष अस्तित्वात नाही, प्राधान्य सोपवून \ विरोधाचे निराकरण करा. किंमत नियम: {0}"
 DocType: Account,Bank,बँक
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,एयरलाईन
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,समस्या साहित्य
@@ -2579,7 +2586,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,सिक्युरिटीज अँड कमोडिटी
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"प्रकार करीता माप मुलभूत युनिट &#39;{0}&#39; साचा म्हणून समान असणे आवश्यक आहे, &#39;{1}&#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"प्रकार करीता माप मुलभूत युनिट &#39;{0}&#39; साचा म्हणून समान असणे आवश्यक आहे, &#39;{1}&#39;"
 DocType: Shipping Rule,Calculate Based On,आधारित असणे
 DocType: Delivery Note Item,From Warehouse,वखार पासून
 DocType: Purchase Taxes and Charges,Valuation and Total,मूल्यांकन आणि एकूण
@@ -2588,7 +2595,7 @@
 DocType: Account,Purchase User,खरेदी सदस्य
 DocType: Notification Control,Customize the Notification,सूचना सानुकूलित
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,ऑपरेशन्स रोख प्रवाह
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,मुलभूत पत्ता साचा हटविले जाऊ शकत नाही
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,मुलभूत पत्ता साचा हटविले जाऊ शकत नाही
 DocType: Sales Invoice,Shipping Rule,शिपिंग नियम
 DocType: Manufacturer,Limited to 12 characters,12 वर्ण मर्यादित
 DocType: Journal Entry,Print Heading,प्रिंट शीर्षक
@@ -2681,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,प्रकल्प निहाय माहिती कोटेशन उपलब्ध नाही
 DocType: Project,Expected End Date,अपेक्षित शेवटची तारीख
 DocType: Appraisal Template,Appraisal Template Title,मूल्यांकन साचा शीर्षक
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,व्यावसायिक
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,अप्रतिम सेवा
@@ -2700,7 +2707,7 @@
 DocType: Customer,Default Receivable Accounts,प्राप्तीयोग्य खाते डीफॉल्ट
 DocType: Tax Rule,Billing State,बिलिंग राज्य
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,ट्रान्सफर
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),(उप-मंडळ्यांना समावेश) स्फोट झाला BOM प्राप्त
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),(उप-मंडळ्यांना समावेश) स्फोट झाला BOM प्राप्त
 DocType: Authorization Rule,Applicable To (Employee),लागू करण्यासाठी (कर्मचारी)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,मुळे तारीख अनिवार्य आहे
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,विशेषता साठी बढती {0} 0 असू शकत नाही
@@ -2733,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,नकारात्मक मूल्यांकन दर परवानगी नाही
 DocType: Holiday List,Weekly Off,साप्ताहिक बंद
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","उदा 2012, 2012-13 साठी"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),अस्थायी नफा / तोटा (क्रेडिट)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),अस्थायी नफा / तोटा (क्रेडिट)
 DocType: Sales Invoice,Return Against Sales Invoice,विरुद्ध विक्री चलन परत
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,आयटम 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},कंपनी मध्ये डीफॉल्ट मूल्य {0} सेट करा {1}
@@ -2764,6 +2771,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,बाल जोडा
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,भूमिका फ्रोजन खाती &amp; संपादित करा फ्रोजन नोंदी सेट करण्याची परवानगी
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,ते मूल जोड आहेत म्हणून खातेवही खर्च केंद्र रूपांतरित करू शकत नाही
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,उघडत मूल्य
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,सिरियल #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,विक्री आयोगाने
 DocType: Offer Letter Term,Value / Description,मूल्य / वर्णन
@@ -2797,7 +2805,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,यशस्वीरित्या ही कंपनी संबंधित सर्व व्यवहार हटवला!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,तारखेला
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,उमेदवारीचा काळ
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,मुलभूत कोठार स्टॉक आयटम अनिवार्य आहे.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},महिन्यात पगार भरणा {0} आणि वर्ष {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ऑटो घाला दर सूची दर गहाळ असेल तर
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,एकूण देय रक्कम
@@ -2833,7 +2840,7 @@
 DocType: Payment Tool,Set Matching Amounts,सेट जुळणारे राशी
 DocType: Purchase Invoice,Taxes and Charges Added,कर आणि शुल्क जोडले
 ,Sales Funnel,विक्री धुराचा
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,संक्षेप करणे आवश्यक आहे
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,संक्षेप करणे आवश्यक आहे
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,आमच्या अद्यतने सदस्यता मध्ये रुची धन्यवाद
 ,Qty to Transfer,हस्तांतरित करण्याची Qty
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,निष्पन्न किंवा ग्राहकांना कोट्स.
@@ -2861,7 +2868,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,पुरवठादार कोटेशन
 DocType: Quotation,In Words will be visible once you save the Quotation.,तुम्ही अवतरण जतन एकदा शब्द मध्ये दृश्यमान होईल.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} बंद आहे
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},बारकोड {0} आधीच आयटम वापरले {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,पुढील कार्यक्रम
@@ -2883,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,आर्थिक वर्ष निवडा ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,पीओएस प्रोफाइल पीओएस नोंद करणे आवश्यक
 DocType: Hub Settings,Name Token,नाव टोकन
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,मानक विक्री
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,मानक विक्री
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,किमान एक कोठार अनिवार्य आहे
 DocType: Serial No,Out of Warranty,हमी पैकी
 DocType: BOM Replace Tool,Replace,बदला
@@ -3006,7 +3013,7 @@
 DocType: Sales Invoice,Paid Amount,पेड रक्कम
 ,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,नाही इतर मुलभूत आहे म्हणून हे मुलभूतरित्या पत्ता साचा सेट
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,नाही इतर मुलभूत आहे म्हणून हे मुलभूतरित्या पत्ता साचा सेट
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","आधीच डेबिट खाते शिल्लक, आपण &#39;क्रेडिट&#39; म्हणून &#39;शिल्लक असणे आवश्यक आहे&#39; सेट करण्याची परवानगी नाही"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,गुणवत्ता व्यवस्थापन
 DocType: Production Planning Tool,Filter based on customer,फिल्टर ग्राहक आधारित
@@ -3107,7 +3114,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",", डीफॉल्ट म्हणून या आर्थिक वर्षात सेट करण्यासाठी &#39;डीफॉल्ट म्हणून सेट करा&#39; वर क्लिक करा"
 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 +19,Shortage Qty,कमतरता Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,आयटम जिच्यामध्ये variant {0} समान गुणधर्म अस्तित्वात
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,आयटम जिच्यामध्ये variant {0} समान गुणधर्म अस्तित्वात
 DocType: Salary Slip,Salary Slip,पगाराच्या स्लिप्स
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'तारीख' आवश्यक आहे
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","संकुल वितरित करण्यासाठी स्लिप पॅकिंग व्युत्पन्न. पॅकेज संख्या, संकुल सामुग्री आणि त्याचे वजन सूचित करण्यासाठी वापरले जाते."
@@ -3118,7 +3125,7 @@
 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.","तपासले व्यवहार कोणत्याही &quot;सबमिट&quot; जातात तेव्हा, एक ईमेल पॉप-अप आपोआप संलग्नक म्हणून व्यवहार, की व्यवहार संबंधित &quot;संपर्क&quot; एक ईमेल पाठवू उघडले. वापरकर्ता मे किंवा ई-मेल पाठवू शकत नाही."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,ग्लोबल सेटिंग्ज
 DocType: Employee Education,Employee Education,कर्मचारी शिक्षण
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,हे आयटम तपशील प्राप्त करणे आवश्यक आहे.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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} आधीच प्राप्त झाले आहे
@@ -3144,6 +3151,7 @@
 DocType: BOM,Manufacturing User,उत्पादन सदस्य
 DocType: Purchase Order,Raw Materials Supplied,कच्चा माल प्रदान
 DocType: Purchase Invoice,Recurring Print Format,आवर्ती प्रिंट स्वरूप
+DocType: C-Form,Series,मालिका
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,अपेक्षित वितरण तारीख पर्चेस तारीख आधी असू शकत नाही
 DocType: Appraisal,Appraisal Template,मूल्यांकन साचा
 DocType: Item Group,Item Classification,आयटम वर्गीकरण
@@ -3219,7 +3227,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},रो {0}: एक पुनर्क्रमित अगोदरपासून या कोठार विद्यमान {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.","कोटेशन केले आहे कारण, म्हणून गमवलेले जाहीर करू शकत नाही."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,खरेदी मास्टर व्यवस्थापक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,ऑर्डर {0} सादर करणे आवश्यक आहे उत्पादन
@@ -3227,7 +3235,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,मुख्य अहवाल
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,तारीख करण्यासाठी तारखेपासून आधी असू शकत नाही
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,/ संपादित करा किंमती जोडा
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,माझे ऑर्डर
@@ -3275,7 +3283,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},रो # {0}: आयटम सेट करा पुरवठादार {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,आयटम {1} संलग्न वेबसाइट प्रतिमा {0} सापडू शकत नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,आयटम {1} संलग्न वेबसाइट प्रतिमा {0} सापडू शकत नाही
 DocType: Issue,Content Type,सामग्री प्रकार
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,संगणक
 DocType: Item,List this Item in multiple groups on the website.,वेबसाइट अनेक गट या आयटम यादी.
@@ -3289,7 +3297,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,&#39;होय&#39; असेल नॉन-स्टॉक आयटम शकत नाही &#39;सिरियल नाही आहे&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,&#39;होय&#39; असेल नॉन-स्टॉक आयटम शकत नाही &#39;सिरियल नाही आहे&#39;
 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,खाते प्रमुख
@@ -3315,7 +3323,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,खाते {0} बंद प्रकार दायित्व / इक्विटी असणे आवश्यक आहे
 DocType: Authorization Rule,Based On,आधारित
 DocType: Sales Order Item,Ordered Qty,आदेश दिले Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,आयटम {0} अक्षम आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,आयटम {0} अक्षम आहे
 DocType: Stock Settings,Stock Frozen Upto,शेअर फ्रोजन पर्यंत
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},पासून आणि कालावधी आवर्ती बंधनकारक तारखा करण्यासाठी कालावधी {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,प्रकल्प क्रियाकलाप / कार्य.
@@ -3323,7 +3331,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","पाञ म्हणून निवडले आहे, तर खरेदी, चेक करणे आवश्यक आहे {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,सवलत 100 पेक्षा कमी असणे आवश्यक आहे
 DocType: Purchase Invoice,Write Off Amount (Company Currency),रक्कम बंद लिहा (कंपनी चलन)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,रो # {0}: पुनर्क्रमित प्रमाणात सेट करा
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,रो # {0}: पुनर्क्रमित प्रमाणात सेट करा
 DocType: Landed Cost Voucher,Landed Cost Voucher,उतरले खर्च व्हाउचर
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},सेट करा {0}
 DocType: Purchase Invoice,Repeat on Day of Month,महिना दिवशी पुन्हा करा
@@ -3395,7 +3403,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,आता पहा
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,अशी यादी तयार करणे आपोआप तयार होईल तेव्हा कालावधी निवडा
 DocType: BOM,Raw Material Cost,कच्चा माल खर्च
-DocType: Item,Re-Order Level,पुन्हा-क्रम स्तर
+DocType: Item Reorder,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 प्रविष्ट करा.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,भाग-वेळ
 DocType: Employee,Applicable Holiday List,लागू सुट्टी यादी
@@ -3450,7 +3458,7 @@
 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 +573,Please specify Attribute Value for attribute {0},विशेषतेसाठी मूल्य विशेषता निर्दिष्ट करा {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3529,7 +3537,7 @@
 DocType: Address,Office,कार्यालय
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,लेखा जर्नल नोंदी.
 DocType: Delivery Note Item,Available Qty at From Warehouse,वखार पासून वर उपलब्ध Qty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,पहिल्या कर्मचारी नोंद निवडा.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,पहिल्या कर्मचारी नोंद निवडा.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,खर्चाचे खाते प्रविष्ट करा
@@ -3604,7 +3612,7 @@
 DocType: Item Attribute,Numeric Values,अंकीय मूल्यांना
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,लोगो संलग्न
 DocType: Customer,Commission Rate,आयोगाने दर
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,व्हेरियंट करा
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,व्हेरियंट करा
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,विभागाने ब्लॉक रजा अनुप्रयोग.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,कार्ट रिक्त आहे
 DocType: Production Order,Actual Operating Cost,वास्तविक ऑपरेटिंग खर्च
@@ -3621,15 +3629,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item","पुनर्क्रमित पातळी सेट करण्यासाठी, आयटम खरेदी आयटम किंवा उत्पादन आयटम असणे आवश्यक आहे"
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),(अर्धा दिवस)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(अर्धा दिवस)
 DocType: Supplier,Credit Days,क्रेडिट दिवस
 DocType: Leave Type,Is Carry Forward,कॅरी फॉरवर्ड आहे
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,BOM आयटम मिळवा
diff --git a/erpnext/translations/ms.csv b/erpnext/translations/ms.csv
index 6235452..072bfc3 100644
--- a/erpnext/translations/ms.csv
+++ b/erpnext/translations/ms.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% Dibilkan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Kadar pertukaran mestilah sama dengan {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nama Pelanggan
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Akaun bank tidak boleh dinamakan sebagai {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Akaun bank tidak boleh dinamakan sebagai {0}
 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 bidang yang berkaitan eksport seperti mata wang, kadar penukaran, jumlah eksport, eksport dan lain-lain jumlah besar boleh didapati dalam Nota Penghantaran, POS, Sebut Harga, Invois Jualan, Jualan Pesanan dan lain-lain"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Kepala (atau kumpulan) terhadap yang Penyertaan Perakaunan dibuat dan baki dikekalkan.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +173,Outstanding for {0} cannot be less than zero ({1}),Cemerlang untuk {0} tidak boleh kurang daripada sifar ({1})
@@ -47,7 +47,7 @@
 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,Tarikh Jangkaan Tamat tidak boleh kurang daripada yang dijangka Tarikh Mula
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Kadar mestilah sama dengan {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,New Leave Application,Cuti Permohonan Baru
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Cuti Permohonan Baru
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draf
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Untuk mengekalkan kod item berdasarkan pelanggan dan untuk membolehkan mereka dicari berdasarkan kod mereka, guna pilihan ini"
 DocType: Mode of Payment Account,Mode of Payment Account,Cara Pembayaran Akaun
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log Aktiviti yang dilakukan oleh pengguna terhadap Tugas yang boleh digunakan untuk mengesan masa, bil."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},New {0}: # {1}
 ,Sales Partners Commission,Pasangan Jualan Suruhanjaya
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Singkatan tidak boleh mempunyai lebih daripada 5 aksara
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Singkatan tidak boleh mempunyai lebih daripada 5 aksara
 DocType: Payment Request,Payment Request,Permintaan Bayaran
 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.",Atribut Nilai {0} tidak boleh dikeluarkan dari {1} sebagai Item Kelainan \ wujud dengan Atribut ini.
@@ -195,6 +195,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Tarikh pemasangan tidak boleh sebelum tarikh penghantaran untuk Perkara {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Diskaun Senarai Harga Kadar (%)
 DocType: Offer Letter,Select Terms and Conditions,Pilih Terma dan Syarat
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,Nilai keluar
 DocType: Production Planning Tool,Sales Orders,Jualan Pesanan
 DocType: Purchase Taxes and Charges,Valuation,Penilaian
 ,Purchase Order Trends,Membeli Trend Pesanan
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisyen
 DocType: Production Order Operation,Updated via 'Time Log',Dikemaskini melalui &#39;Time Log&#39;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Akaun {0} bukan milik Syarikat {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},jumlah pendahuluan tidak boleh lebih besar daripada {0} {1}
 DocType: Naming Series,Series List for this Transaction,Senarai Siri bagi Urusniaga ini
 DocType: Sales Invoice,Is Opening Entry,Apakah Membuka Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Sebut jika akaun belum terima tidak standard yang diguna pakai
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Mencipta slip gaji untuk kriteria yang dinyatakan di atas.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Keterangan tidak diberikan
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Meminta untuk pembelian.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Hanya Pelulus Cuti yang dipilih boleh mengemukakan Permohonan Cuti ini
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,Only the selected Leave Approver can submit this Leave Application,Hanya Pelulus Cuti yang dipilih boleh mengemukakan Permohonan Cuti ini
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Tarikh melegakan mesti lebih besar daripada Tarikh Menyertai
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Meninggalkan setiap Tahun
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Sila tetapkan Penamaan Siri untuk {0} melalui Persediaan&gt; Tetapan&gt; Menamakan Siri
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Gudang {0} bukan milik syarikat {1}
 DocType: Item Website Specification,Item Website Specification,Spesifikasi Item Laman Web
 DocType: Payment Tool,Reference No,Rujukan
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Tinggalkan Disekat
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},Perkara {0} telah mencapai penghujungnya kehidupan di {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,Tinggalkan Disekat
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Perkara {0} telah mencapai penghujungnya kehidupan di {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Tahunan
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Saham Penyesuaian Perkara
 DocType: Stock Entry,Sales Invoice No,Jualan Invois No
@@ -248,7 +250,7 @@
 DocType: Pricing Rule,Supplier Type,Jenis Pembekal
 DocType: Item,Publish in Hub,Menyiarkan dalam Hab
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,Perkara {0} dibatalkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Perkara {0} dibatalkan
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Permintaan bahan
 DocType: Bank Reconciliation,Update Clearance Date,Update Clearance Tarikh
 DocType: Item,Purchase Details,Butiran Pembelian
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Penghantaran Nota
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Menubuhkan Cukai
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Entry pembayaran telah diubah suai selepas anda ditarik. Sila tarik lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} dimasukkan dua kali dalam Cukai Perkara
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} dimasukkan dua kali dalam Cukai Perkara
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Ringkasan untuk minggu ini dan aktiviti-aktiviti yang belum selesai
 DocType: Workstation,Rent Cost,Kos sewa
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Sila pilih bulan dan tahun
@@ -327,7 +329,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Alamat e-mel anda
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,Sila lihat lampiran
 DocType: Purchase Order,% Received,% Diterima
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Persediaan Sudah Lengkap !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Persediaan Sudah Lengkap !!
 ,Finished Goods,Barangan selesai
 DocType: Delivery Note,Instructions,Arahan
 DocType: Quality Inspection,Inspected By,Diperiksa oleh
@@ -352,14 +354,13 @@
 ,Purchase Register,Pembelian Daftar
 DocType: Landed Cost Item,Applicable Charges,Caj yang dikenakan
 DocType: Workstation,Consumable Cost,Kos guna habis
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mesti mempunyai peranan 'Pelulus Cuti'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mesti mempunyai peranan 'Pelulus Cuti'
 DocType: Purchase Receipt,Vehicle Date,Kenderaan Tarikh
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Perubatan
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Sebab bagi kehilangan
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation ditutup pada tarikh-tarikh berikut seperti Senarai Holiday: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Peluang
 DocType: Employee,Single,Single
-DocType: Issue,Attachment,Lampiran
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Bajet tidak boleh ditetapkan untuk PTJ Kumpulan
 DocType: Account,Cost of Goods Sold,Kos Barang Dijual
 DocType: Purchase Invoice,Yearly,Setiap tahun
@@ -388,7 +389,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Tetapan global untuk semua proses pembuatan.
 DocType: Accounts Settings,Accounts Frozen Upto,Akaun-akaun Dibekukan Sehingga
 DocType: SMS Log,Sent On,Dihantar Pada
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Attribute {0} selected multiple times in Attributes Table,Sifat {0} dipilih beberapa kali dalam Atribut Jadual
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Sifat {0} dipilih beberapa kali dalam Atribut Jadual
 DocType: HR Settings,Employee record is created using selected field. ,Rekod pekerja dicipta menggunakan bidang dipilih.
 DocType: Sales Order,Not Applicable,Tidak Berkenaan
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Master bercuti.
@@ -427,7 +428,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Sila masukkan Gudang yang mana Bahan Permintaan akan dibangkitkan
 DocType: Production Order,Additional Operating Cost,Tambahan Kos Operasi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut mestilah sama bagi kedua-dua perkara"
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut mestilah sama bagi kedua-dua perkara"
 DocType: Shipping Rule,Net Weight,Berat Bersih
 DocType: Employee,Emergency Phone,Telefon Kecemasan
 ,Serial No Warranty Expiry,Serial Tiada Jaminan tamat
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Urusan subkontrak
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Perabot dan Perlawanan
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Kadar di mana Senarai harga mata wang ditukar kepada mata wang asas syarikat
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Akaun {0} bukan milik syarikat: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Akaun {0} bukan milik syarikat: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Singkatan sudah digunakan untuk syarikat lain
 DocType: Selling Settings,Default Customer Group,Default Pelanggan Kumpulan
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Jika kurang upaya, bidang &#39;Bulat Jumlah&#39; tidak akan dapat dilihat dalam mana-mana transaksi"
 DocType: BOM,Operating Cost,Kos operasi
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Tiada rekod yang terdapat dalam jadual Invois yang
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Sila pilih Syarikat dan Parti Jenis pertama
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Tahun kewangan / perakaunan.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Nilai terkumpul
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Maaf, Serial No tidak boleh digabungkan"
 DocType: Project Task,Project Task,Projek Petugas
 ,Lead Id,Lead Id
@@ -492,7 +495,7 @@
 DocType: Quotation,Quotation To,Sebutharga Untuk
 DocType: Lead,Middle Income,Pendapatan Tengah
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Pembukaan (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unit keingkaran Langkah untuk Perkara {0} tidak boleh diubah langsung kerana anda telah membuat beberapa transaksi (s) dengan UOM lain. Anda akan perlu untuk membuat item baru untuk menggunakan UOM Lalai yang berbeza.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unit keingkaran Langkah untuk Perkara {0} tidak boleh diubah langsung kerana anda telah membuat beberapa transaksi (s) dengan UOM lain. Anda akan perlu untuk membuat item baru untuk menggunakan UOM Lalai yang berbeza.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Jumlah yang diperuntukkan tidak boleh negatif
 DocType: Purchase Order Item,Billed Amt,Billed AMT
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Satu Gudang maya di mana kemasukkan stok dibuat.
@@ -570,7 +573,7 @@
 DocType: Hub Settings,Seller City,Penjual City
 DocType: Email Digest,Next email will be sent on:,E-mel seterusnya akan dihantar pada:
 DocType: Offer Letter Term,Offer Letter Term,Menawarkan Surat Jangka
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item has variants.,Perkara mempunyai varian.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item has variants.,Perkara mempunyai varian.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Perkara {0} tidak dijumpai
 DocType: Bin,Stock Value,Nilai saham
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Jenis
@@ -583,6 +586,7 @@
 DocType: Journal Entry,Credit Card Entry,Entry Kad Kredit
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Petugas Subjek
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Barangan yang diterima daripada Pembekal.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,dalam Nilai
 DocType: Lead,Campaign Name,Nama Kempen
 ,Reserved,Cipta Terpelihara
 DocType: Purchase Order,Supply Raw Materials,Bekalan Bahan Mentah
@@ -597,16 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Akaun dengan urus niaga yang sedia ada tidak boleh ditukar ke lejar
 DocType: Delivery Note,Customer's Purchase Order No,Pelanggan Pesanan Pembelian No
 DocType: Employee,Cell Number,Bilangan sel
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Permintaan bahan Auto Generated
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Permintaan bahan Auto Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Hilang
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Anda tidak boleh memasuki baucar semasa dalam &#39;Terhadap Journal Entry&#39; ruangan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Tenaga
 DocType: Opportunity,Opportunity From,Peluang Daripada
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Kenyataan gaji bulanan.
 DocType: Item Group,Website Specifications,Laman Web Spesifikasi
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Terdapat ralat dalam Template Alamat anda {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Akaun Baru
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Dari {0} dari jenis {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor penukaran adalah wajib
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Peraturan Harga pelbagai wujud dengan kriteria yang sama, sila menyelesaikan konflik dengan memberikan keutamaan. Peraturan Harga: {0}"
 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.,Catatan perakaunan boleh dibuat terhadap nod daun. Catatan terhadap Kumpulan adalah tidak dibenarkan.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,Tidak boleh menyahaktifkan atau membatalkan BOM kerana ia dikaitkan dengan BOMs lain
 DocType: Opportunity,Maintenance,Penyelenggaraan
@@ -649,7 +655,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,Senarai Harga tidak dipilih
 DocType: Employee,Family Background,Latar Belakang Keluarga
 DocType: Process Payroll,Send Email,Hantar E-mel
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Amaran: Lampiran sah {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Amaran: Lampiran sah {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Tiada Kebenaran
 DocType: Company,Default Bank Account,Akaun Bank Default
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Untuk menapis berdasarkan Parti, pilih Parti Taipkan pertama"
@@ -679,13 +685,13 @@
 DocType: Production Planning Tool,Select Items,Pilih Item
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} terhadap Bil {1} bertarikh {2}
 DocType: Maintenance Visit,Completion Status,Siap Status
-DocType: Sales Invoice Item,Target Warehouse,Sasaran Gudang
+DocType: Production Order,Target Warehouse,Sasaran Gudang
 DocType: Item,Allow over delivery or receipt upto this percent,Membolehkan lebih penghantaran atau penerimaan hamper peratus ini
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,Jangkaan Tarikh Penghantaran tidak boleh sebelum Jualan Pesanan Tarikh
 DocType: Upload Attendance,Import Attendance,Import Kehadiran
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Semua Kumpulan Perkara
 DocType: Process Payroll,Activity Log,Log Aktiviti
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Keuntungan bersih / Rugi
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Keuntungan bersih / Rugi
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Mengarang mesej secara automatik pada penyerahan transaksi.
 DocType: Production Order,Item To Manufacture,Perkara Untuk Pembuatan
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status adalah {2}
@@ -693,7 +699,7 @@
 DocType: Sales Order Item,Projected Qty,Unjuran Qty
 DocType: Sales Invoice,Payment Due Date,Tarikh Pembayaran
 DocType: Newsletter,Newsletter Manager,Newsletter Pengurus
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Perkara Variant {0} telah wujud dengan sifat-sifat yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Perkara Variant {0} telah wujud dengan sifat-sifat yang sama
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Pembukaan&#39;
 DocType: Notification Control,Delivery Note Message,Penghantaran Nota Mesej
 DocType: Expense Claim,Expenses,Perbelanjaan
@@ -703,7 +709,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Penyelidikan &amp; Pembangunan
 ,Amount to Bill,Jumlah untuk Rang Undang-undang
 DocType: Company,Registration Details,Butiran Pendaftaran
-DocType: Item,Re-Order Qty,Re-Order Qty
+DocType: Item Reorder,Re-Order Qty,Re-Order Qty
 DocType: Leave Block List Date,Leave Block List Date,Tinggalkan Sekat Senarai Tarikh
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Dijadual menghantar kepada {0}
 DocType: Pricing Rule,Price or Discount,Harga atau diskaun
@@ -746,7 +752,7 @@
 DocType: Bank Reconciliation,Total Amount,Jumlah
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Penerbitan Internet
 DocType: Production Planning Tool,Production Orders,Pesanan Pengeluaran
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Nilai Baki
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Nilai Baki
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Senarai Harga Jualan
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publish untuk menyegerakkan item
 DocType: Bank Reconciliation,Account Currency,Mata Wang Akaun
@@ -755,7 +761,7 @@
 DocType: Supplier,Default Payable Accounts,Default Akaun Belum Bayar
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Pekerja {0} tidak aktif atau tidak wujud
 DocType: Features Setup,Item Barcode,Item Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,Item Variants {0} updated,Perkara Kelainan {0} dikemaskini
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,Perkara Kelainan {0} dikemaskini
 DocType: Quality Inspection Reading,Reading 6,Membaca 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Membeli Advance Invois
 DocType: Address,Shop,Kedai
@@ -832,7 +838,7 @@
 DocType: POS Profile,Cash/Bank Account,Akaun Tunai / Bank
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Barangan dikeluarkan dengan tiada perubahan dalam kuantiti atau nilai.
 DocType: Delivery Note,Delivery To,Penghantaran Untuk
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,Jadual atribut adalah wajib
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,Attribute table is mandatory,Jadual atribut adalah wajib
 DocType: Production Planning Tool,Get Sales Orders,Dapatkan Perintah Jualan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} tidak boleh negatif
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Diskaun
@@ -860,7 +866,7 @@
 DocType: Tax Rule,Shipping State,Negeri Penghantaran
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Item mesti ditambah menggunakan &#39;Dapatkan Item daripada Pembelian Resit&#39; butang
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Perbelanjaan jualan
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Membeli Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Membeli Standard
 DocType: GL Entry,Against,Terhadap
 DocType: Item,Default Selling Cost Center,Default Jualan Kos Pusat
 DocType: Sales Partner,Implementation Partner,Rakan Pelaksanaan
@@ -902,7 +908,7 @@
 DocType: Sales Partner,Distributor,Pengedar
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Membeli-belah Troli Penghantaran Peraturan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,Pengeluaran Pesanan {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Sila menetapkan &#39;Guna Diskaun tambahan On&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Sila menetapkan &#39;Guna Diskaun tambahan On&#39;
 ,Ordered Items To Be Billed,Item Diperintah dibilkan
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Dari Range mempunyai kurang daripada Untuk Julat
 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 Masa balak dan Hantar untuk mewujudkan Invois Jualan baru.
@@ -970,9 +976,9 @@
 DocType: Contact,User ID,ID Pengguna
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Lihat Lejar
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Terawal
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"An Item Group exists with same name, please change the item name or rename the item group","Satu Kumpulan Item wujud dengan nama yang sama, sila tukar nama item atau menamakan semula kumpulan item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Satu Kumpulan Item wujud dengan nama yang sama, sila tukar nama item atau menamakan semula kumpulan item"
 DocType: Production Order,Manufacture against Sales Order,Pengilangan terhadap Jualan Pesanan
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Rest Of The World
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,The Perkara {0} tidak boleh mempunyai Batch
 ,Budget Variance Report,Belanjawan Laporan Varian
 DocType: Salary Slip,Gross Pay,Gaji kasar
@@ -1002,7 +1008,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,Not authorized to edit frozen Account {0},Tiada kebenaran untuk mengedit Akaun beku {0}
 DocType: Journal Entry,Get Outstanding Invoices,Dapatkan Invois Cemerlang
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Pesanan Jualan {0} tidak sah
-apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Maaf, syarikat tidak boleh digabungkan"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Maaf, syarikat tidak boleh digabungkan"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Kecil
 DocType: Employee,Employee Number,Bilangan pekerja
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Kes Tidak (s) telah digunakan. Cuba dari Case No {0}
@@ -1021,7 +1027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Pertanian
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Produk atau Perkhidmatan anda
 DocType: Mode of Payment,Mode of Payment,Cara Pembayaran
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Laman web Image perlu fail awam atau URL laman web
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Laman web Image perlu fail awam atau URL laman web
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ini adalah kumpulan item akar dan tidak boleh diedit.
 DocType: Journal Entry Account,Purchase Order,Pesanan Pembelian
 DocType: Warehouse,Warehouse Contact Info,Gudang info
@@ -1093,6 +1099,7 @@
 DocType: Address,Utilities,Utiliti
 DocType: Purchase Invoice Item,Accounting,Perakaunan
 DocType: Features Setup,Features Setup,Ciri-ciri Persediaan
+DocType: Item,Is Service Item,Adalah Perkhidmatan Perkara
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Tempoh permohonan tidak boleh cuti di luar tempoh peruntukan
 DocType: Activity Cost,Projects,Projek
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Sila pilih Tahun Anggaran
@@ -1123,7 +1130,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Carta Akaun
 DocType: Material Request,Terms and Conditions Content,Terma dan Syarat Kandungan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +465,cannot be greater than 100,tidak boleh lebih besar daripada 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Perkara {0} bukan Item saham
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Perkara {0} bukan Item saham
 DocType: Maintenance Visit,Unscheduled,Tidak Berjadual
 DocType: Employee,Owned,Milik
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Bergantung kepada Cuti Tanpa Gaji
@@ -1182,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Kerajaan
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Kelainan Perkara
 DocType: Company,Services,Perkhidmatan
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Jumlah ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Jumlah ({0})
 DocType: Cost Center,Parent Cost Center,Kos Pusat Ibu Bapa
 DocType: Sales Invoice,Source,Sumber
 DocType: Leave Type,Is Leave Without Pay,Apakah Tinggalkan Tanpa Gaji
@@ -1255,17 +1262,17 @@
 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 menjejaki item menggunakan kod bar. Anda akan dapat untuk memasuki perkara dalam Nota Penghantaran dan Jualan Invois dengan mengimbas kod bar barangan.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Hantar semula Pembayaran E-mel
 DocType: Dependent Task,Dependent Task,Petugas bergantung
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor penukaran Unit keingkaran Langkah mesti 1 berturut-turut {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Leave of type {0} cannot be longer than {1},Cuti jenis {0} tidak boleh lebih panjang daripada {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor penukaran Unit keingkaran Langkah mesti 1 berturut-turut {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Leave of type {0} cannot be longer than {1},Cuti jenis {0} tidak boleh lebih panjang daripada {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Cuba merancang operasi untuk hari X terlebih dahulu.
 DocType: HR Settings,Stop Birthday Reminders,Stop Hari Lahir Peringatan
 DocType: SMS Center,Receiver List,Penerima Senarai
 DocType: Payment Tool Detail,Payment Amount,Jumlah Bayaran
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Jumlah dimakan
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Lihat
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Perubahan Bersih dalam Tunai
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Perubahan Bersih dalam Tunai
 DocType: Salary Structure Deduction,Salary Structure Deduction,Struktur Potongan Gaji
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unit Langkah {0} telah memasuki lebih daripada sekali dalam Factor Penukaran Jadual
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unit Langkah {0} telah memasuki lebih daripada sekali dalam Factor Penukaran Jadual
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Permintaan Bayaran sudah wujud {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kos Item Dikeluarkan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Quantity must not be more than {0},Kuantiti mestilah tidak lebih daripada {0}
@@ -1327,7 +1334,7 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Sila pilih kod item
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Mengurangkan Potongan bagi Cuti Tanpa Gaji (LWP)
 DocType: Territory,Territory Manager,Pengurus Wilayah
-DocType: Delivery Note Item,To Warehouse (Optional),Untuk Gudang (pilihan)
+DocType: Packed Item,To Warehouse (Optional),Untuk Gudang (pilihan)
 DocType: Sales Invoice,Paid Amount (Company Currency),Jumlah yang dibayar (Syarikat Mata Wang)
 DocType: Purchase Invoice,Additional Discount,Diskaun tambahan
 DocType: Selling Settings,Selling Settings,Menjual Tetapan
@@ -1336,7 +1343,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Syarikat, Bulan dan Tahun Anggaran adalah wajib"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Perbelanjaan pemasaran
 ,Item Shortage Report,Perkara Kekurangan Laporan
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \ nSila menyebut &quot;Berat UOM&quot; terlalu"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \ nSila menyebut &quot;Berat UOM&quot; terlalu"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Permintaan bahan yang digunakan untuk membuat ini Entry Saham
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Unit tunggal Item satu.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Masa Log batch {0} mesti &#39;Dihantar&#39;
@@ -1347,6 +1354,7 @@
 DocType: Employee,Date Of Retirement,Tarikh Persaraan
 DocType: Upload Attendance,Get Template,Dapatkan Template
 DocType: Address,Postal,Pos
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext Persediaan Selesai!
 DocType: Item,Weightage,Wajaran
 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,"Satu Kumpulan Pelanggan sudah wujud dengan nama yang sama, sila tukar nama Pelanggan atau menamakan semula Kumpulan Pelanggan"
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Sila pilih {0} pertama.
@@ -1375,12 +1383,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Terlalu banyak tiang. Mengeksport laporan dan mencetak penggunaan aplikasi spreadsheet.
 DocType: Sales Invoice Item,Batch No,Batch No
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Membenarkan pelbagai Pesanan Jualan terhadap Perintah Pembelian yang Pelanggan
-apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Utama
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Utama
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Varian
 DocType: Naming Series,Set prefix for numbering series on your transactions,Terletak awalan untuk penomboran siri transaksi anda
 DocType: Employee Attendance Tool,Employees HTML,pekerja HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,Perintah berhenti tidak boleh dibatalkan. Unstop untuk membatalkan.
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,BOM lalai ({0}) mesti aktif untuk item ini atau template yang
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,BOM lalai ({0}) mesti aktif untuk item ini atau template yang
 DocType: Employee,Leave Encashed?,Cuti ditunaikan?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Peluang Daripada bidang adalah wajib
 DocType: Item,Variants,Kelainan
@@ -1405,7 +1413,6 @@
 DocType: Sales Order,To Deliver and Bill,Untuk Menghantar dan Rang Undang-undang
 DocType: GL Entry,Credit Amount in Account Currency,Jumlah Kredit dalam Mata Wang Akaun
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Masa balak untuk pengeluaran.
-DocType: Item,Apply Warehouse-wise Reorder Level,Memohon Gudang-bijak Reorder Level
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} hendaklah dikemukakan
 DocType: Authorization Control,Authorization Control,Kawalan Kuasa
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Warehouse Telah adalah wajib terhadap Perkara ditolak {1}
@@ -1503,6 +1510,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,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}: Operasi {1} tidak siap untuk {2} qty barangan siap dalam Pengeluaran Pesanan # {3}. Sila kemas kini status operasi melalui Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Pelaburan
 DocType: Issue,Resolution Details,Resolusi Butiran
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,peruntukan
 DocType: Quality Inspection Reading,Acceptance Criteria,Kriteria Penerimaan
 DocType: Item Attribute,Attribute Name,Atribut Nama
 DocType: Item Group,Show In Website,Show Dalam Laman Web
@@ -1553,7 +1561,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,Perbelanjaan Tuntutan sedang menunggu kelulusan. Hanya Pelulus Perbelanjaan yang boleh mengemas kini status.
 DocType: Purchase Invoice,Additional Discount Amount,Jumlah Diskaun tambahan
 DocType: Leave Block List Allow,Leave Block List Allow,Tinggalkan Sekat Senarai Benarkan
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr tidak boleh kosong atau senggang
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr tidak boleh kosong atau senggang
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Kumpulan kepada Bukan Kumpulan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sukan
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Jumlah Sebenar
@@ -1594,7 +1602,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Perkara {0} telah kembali
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Tahun Fiskal ** mewakili Tahun Kewangan. Semua kemasukan perakaunan dan transaksi utama yang lain dijejak terhadap Tahun Fiskal ** **.
 DocType: Opportunity,Customer / Lead Address,Pelanggan / Lead Alamat
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Amaran: Sijil SSL tidak sah pada lampiran {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Amaran: Sijil SSL tidak sah pada lampiran {0}
 DocType: Production Order Operation,Actual Operation Time,Masa Sebenar Operasi
 DocType: Authorization Rule,Applicable To (User),Terpakai Untuk (pengguna)
 DocType: Purchase Taxes and Charges,Deduct,Memotong
@@ -1743,7 +1751,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Perkara No. tidak boleh 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,Jika anda mempunyai Pasukan Jualan dan Jualan Partners (Channel Partners) mereka boleh ditandakan dan mengekalkan sumbangan mereka dalam aktiviti jualan
 DocType: Item,Show a slideshow at the top of the page,Menunjukkan tayangan slaid di bahagian atas halaman
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Kedai
+DocType: Item,"Allow in Sales Order of type ""Service""",Benarkan dalam Sales Order dari jenis &quot;Perkhidmatan&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Kedai
 DocType: Time Log,Projects Manager,Projek Pengurus
 DocType: Serial No,Delivery Time,Masa penghantaran
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Penuaan Berasaskan
@@ -1768,7 +1777,7 @@
 ,Financial Analytics,Analisis Kewangan
 DocType: Quality Inspection,Verified By,Disahkan oleh
 DocType: Address,Subsidiary,Anak Syarikat
-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.","Tidak boleh menukar mata wang lalai syarikat itu, kerana terdapat urus niaga yang sedia ada. Transaksi mesti dibatalkan untuk menukar mata wang lalai."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Tidak boleh menukar mata wang lalai syarikat itu, kerana terdapat urus niaga yang sedia ada. Transaksi mesti dibatalkan untuk menukar mata wang lalai."
 DocType: Quality Inspection,Purchase Receipt No,Resit Pembelian No
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Wang Earnest
 DocType: Process Payroll,Create Salary Slip,Membuat Slip Gaji
@@ -1816,7 +1825,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Bahan mentah tidak boleh kosong.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Tidak dapat kemas kini saham, invois mengandungi drop item penghantaran."
 DocType: Newsletter,Test,Ujian
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'","Oleh kerana terdapat transaksi saham sedia ada untuk item ini, \ anda tidak boleh menukar nilai-nilai &#39;Belum Bersiri&#39;, &#39;Mempunyai batch Tidak&#39;, &#39;Apakah Saham Perkara&#39; dan &#39;Kaedah Penilaian&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Pantas Journal Kemasukan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Anda tidak boleh mengubah kadar jika BOM disebut agianst sebarang perkara
@@ -1905,7 +1914,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Sila Penghantaran Nota pertama
 DocType: Purchase Invoice,Currency and Price List,Mata wang dan Senarai Harga
 DocType: Opportunity,Customer / Lead Name,Pelanggan / Nama Lead
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Clearance Tarikh tidak dinyatakan
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Clearance Tarikh tidak dinyatakan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Pengeluaran
 DocType: Item,Allow Production Order,Membenarkan Perintah Pengeluaran
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Tarikh Mula mestilah sebelum Tarikh Akhir
@@ -1915,7 +1924,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,Jumlah Pendapatan
 DocType: Purchase Receipt,Time at which materials were received,Masa di mana bahan-bahan yang telah diterima
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,Alamat saya
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Alamat saya
 DocType: Stock Ledger Entry,Outgoing Rate,Kadar keluar
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Master cawangan organisasi.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,atau
@@ -1984,7 +1993,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Menguruskan Tree Kumpulan Pelanggan.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,New Nama PTJ
 DocType: Leave Control Panel,Leave Control Panel,Tinggalkan Panel Kawalan
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Tiada Templat Alamat lalai dijumpai. Sila buat yang baru dari Setup&gt; Percetakan dan Penjenamaan&gt; Templat Alamat.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Tiada Templat Alamat lalai dijumpai. Sila buat yang baru dari Setup&gt; Percetakan dan Penjenamaan&gt; Templat Alamat.
 DocType: Appraisal,HR User,HR pengguna
 DocType: Purchase Invoice,Taxes and Charges Deducted,Cukai dan Caj Dipotong
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Isu-isu
@@ -2001,7 +2010,7 @@
 ,Sales Browser,Jualan Pelayar
 DocType: Journal Entry,Total Credit,Jumlah Kredit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Amaran: Satu lagi {0} # {1} wujud terhadap kemasukan saham {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Tempatan
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,Local,Tempatan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Pinjaman dan Pendahuluan (Aset)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Penghutang
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Besar
@@ -2020,7 +2029,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Semua Transaksi Jualan boleh tagged terhadap pelbagai ** Jualan Orang ** supaya anda boleh menetapkan dan memantau sasaran.
 ,S.O. No.,PP No.
 DocType: Production Order Operation,Make Time Log,Buat Masa Log
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Sila menetapkan kuantiti pesanan semula
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Sila buat Pelanggan dari Lead {0}
 DocType: Price List,Applicable for Countries,Digunakan untuk Negara
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Komputer
@@ -2095,7 +2103,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Dapatkan Entri Berkaitan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Catatan Perakaunan untuk Stok
 DocType: Sales Invoice,Sales Team1,Team1 Jualan
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Perkara {0} tidak wujud
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Perkara {0} tidak wujud
 DocType: Sales Invoice,Customer Address,Alamat Pelanggan
 DocType: Payment Request,Recipient and Message,Penerima dan Mesej
 DocType: Purchase Invoice,Apply Additional Discount On,Memohon Diskaun tambahan On
@@ -2137,7 +2145,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Kadar penilaian
 apps/erpnext/erpnext/stock/get_item_details.py +274,Price List Currency not selected,Senarai harga mata wang 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,Perkara Row {0}: Resit Pembelian {1} tidak wujud dalam jadual &#39;Pembelian Resit&#39; di atas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Employee {0} has already applied for {1} between {2} and {3},Pekerja {0} telah memohon untuk {1} antara {2} dan {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Employee {0} has already applied for {1} between {2} and {3},Pekerja {0} telah memohon untuk {1} antara {2} dan {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projek Tarikh Mula
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Sehingga
 DocType: Rename Tool,Rename Log,Log menamakan semula
@@ -2175,7 +2183,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Sila masukkan tarikh melegakan.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Hanya Tinggalkan Permohonan dengan status &#39;diluluskan&#39; boleh dikemukakan
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Alamat Tajuk adalah wajib.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Alamat Tajuk adalah wajib.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Masukkan nama kempen jika sumber siasatan adalah kempen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Akhbar Penerbit
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Pilih Tahun Anggaran
@@ -2199,6 +2207,7 @@
 DocType: UOM,Must be Whole Number,Mesti Nombor Seluruh
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Daun baru Diperuntukkan (Dalam Hari)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,No siri {0} tidak wujud
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Warehouse pelanggan (Pilihan)
 DocType: Pricing Rule,Discount Percentage,Peratus diskaun
 DocType: Payment Reconciliation Invoice,Invoice Number,Nombor invois
 apps/erpnext/erpnext/hooks.py +55,Orders,Pesanan
@@ -2308,7 +2317,7 @@
 DocType: Appraisal,Appraisal,Penilaian
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Tarikh diulang
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Penandatangan yang diberi kuasa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},Tinggalkan Pelulus mestilah salah seorang daripada {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,Leave approver must be one of {0},Tinggalkan Pelulus mestilah salah seorang daripada {0}
 DocType: Hub Settings,Seller Email,Penjual E-mel
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Jumlah Kos Pembelian (melalui Invois Belian)
 DocType: Workstation Working Hour,Start Time,Waktu Mula
@@ -2477,7 +2486,7 @@
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Ganti Alat
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Negara lalai bijak Templat Alamat
 DocType: Sales Order Item,Supplier delivers to Customer,Pembekal menyampaikan kepada Pelanggan
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Show cukai Perpecahan
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Show cukai Perpecahan
 apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Oleh kerana / Rujukan Tarikh dan boleh dikenakan {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Import dan Eksport
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Jika anda terlibat dalam aktiviti pembuatan. Membolehkan Perkara &#39;dihasilkan&#39;
@@ -2526,7 +2535,7 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Sebelum perdamaian
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Untuk {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Cukai dan Caj Ditambah (Syarikat mata wang)
-apps/erpnext/erpnext/stock/doctype/item/item.py +384,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Perkara Cukai {0} mesti mempunyai akaun Cukai jenis atau Pendapatan atau Perbelanjaan atau bercukai
+apps/erpnext/erpnext/stock/doctype/item/item.py +378,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Perkara Cukai {0} mesti mempunyai akaun Cukai jenis atau Pendapatan atau Perbelanjaan atau bercukai
 DocType: Sales Order,Partly Billed,Sebahagiannya Membilkan
 DocType: Item,Default BOM,BOM Default
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Sila taip semula nama syarikat untuk mengesahkan
@@ -2553,8 +2562,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Rujukan adalah wajib jika anda masukkan Tarikh Rujukan
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Tarikh Menyertai mesti lebih besar daripada Tarikh Lahir
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Struktur gaji
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Peraturan Harga Multiple wujud dengan kriteria yang sama, sila menyelesaikan \ konflik dengan memberikan keutamaan. Peraturan Harga: {0}"
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Syarikat Penerbangan
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Isu Bahan
@@ -2579,7 +2586,7 @@
 DocType: Issue,Opening Time,Masa Pembukaan
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Dari dan kepada tarikh yang dikehendaki
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Sekuriti &amp; Bursa Komoditi
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unit keingkaran Langkah untuk Variant &#39;{0}&#39; hendaklah sama seperti dalam Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unit keingkaran Langkah untuk Variant &#39;{0}&#39; hendaklah sama seperti dalam Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Kira Based On
 DocType: Delivery Note Item,From Warehouse,Dari Gudang
 DocType: Purchase Taxes and Charges,Valuation and Total,Penilaian dan Jumlah
@@ -2588,7 +2595,7 @@
 DocType: Account,Purchase User,Pembelian Pengguna
 DocType: Notification Control,Customize the Notification,Menyesuaikan Pemberitahuan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Aliran Tunai daripada Operasi
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Templat Alamat lalai tidak boleh dipadam
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Templat Alamat lalai tidak boleh dipadam
 DocType: Sales Invoice,Shipping Rule,Peraturan Penghantaran
 DocType: Manufacturer,Limited to 12 characters,Terhad kepada 12 aksara
 DocType: Journal Entry,Print Heading,Cetak Kepala
@@ -2681,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,Data projek-bijak tidak tersedia untuk Sebutharga
 DocType: Project,Expected End Date,Tarikh Jangkaan Tamat
 DocType: Appraisal Template,Appraisal Template Title,Penilaian Templat Tajuk
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,Perdagangan
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,Commercial,Perdagangan
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Ibu Bapa Perkara {0} tidak perlu menjadi item Saham
 DocType: Cost Center,Distribution Id,Id pengedaran
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Perkhidmatan Awesome
@@ -2700,7 +2707,7 @@
 DocType: Customer,Default Receivable Accounts,Default Akaun Belum Terima
 DocType: Tax Rule,Billing State,Negeri Bil
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Pemindahan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Kutip BOM meletup (termasuk sub-pemasangan)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),Kutip BOM meletup (termasuk sub-pemasangan)
 DocType: Authorization Rule,Applicable To (Employee),Terpakai Untuk (Pekerja)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,Tarikh Akhir adalah wajib
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Kenaikan untuk Atribut {0} tidak boleh 0
@@ -2733,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Kadar Penilaian negatif tidak dibenarkan
 DocType: Holiday List,Weekly Off,Mingguan Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Untuk contoh: 2012, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Sementara Untung / Rugi (Kredit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Sementara Untung / Rugi (Kredit)
 DocType: Sales Invoice,Return Against Sales Invoice,Kembali Terhadap Jualan Invois
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Perkara 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Sila menetapkan nilai lalai {0} dalam Syarikat {1}
@@ -2764,6 +2771,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Tambah Anak
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Peranan Dibenarkan untuk Set Akaun Frozen &amp; Frozen Edit Entri
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Tidak boleh menukar PTJ ke lejar kerana ia mempunyai nod anak
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Nilai pembukaan
 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,Suruhanjaya Jualan
 DocType: Offer Letter Term,Value / Description,Nilai / Penerangan
@@ -2797,7 +2805,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Berjaya memadam semua transaksi yang berkaitan dengan syarikat ini!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Seperti pada Tarikh
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Percubaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Gudang lalai adalah wajib bagi saham Perkara.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pembayaran gaji untuk bulan {0} dan tahun {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Masukkan Auto Kadar Senarai Harga jika hilang
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Jumlah Amaun Dibayar
@@ -2833,7 +2840,7 @@
 DocType: Payment Tool,Set Matching Amounts,Tetapkan Jumlah Matching
 DocType: Purchase Invoice,Taxes and Charges Added,Cukai dan Caj Tambahan
 ,Sales Funnel,Saluran Jualan
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Singkatan adalah wajib
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Singkatan adalah wajib
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Terima kasih kerana berminat dengan melanggan kemas kini kami
 ,Qty to Transfer,Qty untuk Pemindahan
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Petikan untuk Leads atau Pelanggan.
@@ -2861,7 +2868,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,Sebutharga Pembekal
 DocType: Quotation,In Words will be visible once you save the Quotation.,Dalam Perkataan akan dapat dilihat selepas anda menyimpan Sebut Harga tersebut.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} telah dihentikan
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Barcode {0} telah digunakan dalam Perkara {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Barcode {0} telah digunakan dalam Perkara {1}
 DocType: Lead,Add to calendar on this date,Tambah ke kalendar pada tarikh ini
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Peraturan untuk menambah kos penghantaran.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Acara akan datang
@@ -2883,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Pilih Tahun Anggaran ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS Profil dikehendaki membuat POS Entry
 DocType: Hub Settings,Name Token,Nama Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Jualan Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Jualan Standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Atleast satu gudang adalah wajib
 DocType: Serial No,Out of Warranty,Daripada Waranti
 DocType: BOM Replace Tool,Replace,Ganti
@@ -3006,7 +3013,7 @@
 DocType: Sales Invoice,Paid Amount,Jumlah yang dibayar
 ,Available Stock for Packing Items,Saham tersedia untuk Item Pembungkusan
 DocType: Item Variant,Item Variant,Perkara Varian
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Menetapkan Templat Alamat ini sebagai lalai kerana tidak ada default lain
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,Menetapkan Templat Alamat ini sebagai lalai kerana tidak ada default lain
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Baki akaun sudah dalam Debit, anda tidak dibenarkan untuk menetapkan 'Baki Mestilah' sebagai 'Kredit'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Pengurusan Kualiti
 DocType: Production Planning Tool,Filter based on customer,Filter berdasarkan pelanggan
@@ -3107,7 +3114,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Untuk menetapkan Tahun Fiskal ini sebagai lalai, klik pada &#39;Tetapkan sebagai lalai&#39;"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Persediaan pelayan masuk untuk id e-mel sokongan. (Contohnya support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Kekurangan Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Varian item {0} wujud dengan ciri yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Varian item {0} wujud dengan ciri yang sama
 DocType: Salary Slip,Salary Slip,Slip Gaji
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Tarikh Hingga' diperlukan
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Menjana slip pembungkusan untuk pakej yang akan dihantar. Digunakan untuk memberitahu jumlah pakej, kandungan pakej dan berat."
@@ -3118,7 +3125,7 @@
 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.","Apabila mana-mana urus niaga yang diperiksa adalah &quot;Dihantar&quot;, e-mel pop-up secara automatik dibuka untuk menghantar e-mel kepada yang berkaitan &quot;Hubungi&quot; dalam transaksi itu, dengan transaksi itu sebagai lampiran. Pengguna mungkin atau tidak menghantar e-mel."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Tetapan Global
 DocType: Employee Education,Employee Education,Pendidikan Pekerja
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,Ia diperlukan untuk mengambil Butiran Item.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,It is needed to fetch Item Details.,Ia diperlukan untuk mengambil Butiran Item.
 DocType: Salary Slip,Net Pay,Gaji bersih
 DocType: Account,Account,Akaun
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,No siri {0} telah diterima
@@ -3144,6 +3151,7 @@
 DocType: BOM,Manufacturing User,Pembuatan pengguna
 DocType: Purchase Order,Raw Materials Supplied,Bahan mentah yang dibekalkan
 DocType: Purchase Invoice,Recurring Print Format,Format Cetak berulang
+DocType: C-Form,Series,Siri
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,Jangkaan Tarikh Penghantaran tidak boleh sebelum Pesanan Belian Tarikh
 DocType: Appraisal,Appraisal Template,Templat Penilaian
 DocType: Item Group,Item Classification,Item Klasifikasi
@@ -3219,7 +3227,7 @@
 DocType: Workstation,Operating Costs,Kos operasi
 DocType: Employee Leave Approver,Employee Leave Approver,Pekerja Cuti Pelulus
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} telah berjaya ditambah ke senarai surat berita kami.
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Suatu catatan Reorder telah wujud untuk gudang ini {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Suatu catatan Reorder telah wujud untuk gudang ini {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Tidak boleh mengaku sebagai hilang, kerana Sebutharga telah dibuat."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Pembelian Master Pengurus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Pengeluaran Pesanan {0} hendaklah dikemukakan
@@ -3227,7 +3235,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Laporan Utama
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Setakat ini tidak boleh sebelum dari tarikh
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Tambah / Edit Harga
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,Tambah / Edit Harga
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Carta Pusat Kos
 ,Requested Items To Be Ordered,Item yang diminta Akan Mengarahkan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +315,My Orders,Pesanan
@@ -3275,7 +3283,7 @@
 DocType: Employee,Date of Issue,Tarikh Keluaran
 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 +150,Row #{0}: Set Supplier for item {1},Row # {0}: Tetapkan Pembekal untuk item {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Laman web Image {0} melekat Perkara {1} tidak boleh didapati
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Laman web Image {0} melekat Perkara {1} tidak boleh didapati
 DocType: Issue,Content Type,Jenis kandungan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,Senarai Item ini dalam pelbagai kumpulan di laman web.
@@ -3289,7 +3297,7 @@
 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},Akaun {0} telah memasuki lebih daripada sekali untuk tahun fiskal {1}
 ,Average Commission Rate,Purata Kadar Suruhanjaya
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,'Has Serial No' can not be 'Yes' for non-stock item,'Punyai Nombor Siri' tidak boleh 'Ya' untuk  benda bukan stok
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,'Punyai Nombor Siri' tidak boleh 'Ya' untuk  benda bukan stok
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Kehadiran tidak boleh ditandakan untuk masa hadapan
 DocType: Pricing Rule,Pricing Rule Help,Peraturan Harga Bantuan
 DocType: Purchase Taxes and Charges,Account Head,Kepala Akaun
@@ -3315,7 +3323,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Penutupan Akaun {0} mestilah jenis Liabiliti / Ekuiti
 DocType: Authorization Rule,Based On,Berdasarkan
 DocType: Sales Order Item,Ordered Qty,Mengarahkan Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Perkara {0} dilumpuhkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Perkara {0} dilumpuhkan
 DocType: Stock Settings,Stock Frozen Upto,Saham beku Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},Tempoh Dari dan Musim Ke tarikh wajib untuk berulang {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Aktiviti projek / tugasan.
@@ -3323,7 +3331,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Membeli hendaklah disemak, jika Terpakai Untuk dipilih sebagai {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Diskaun mesti kurang daripada 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Tulis Off Jumlah (Syarikat Mata Wang)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Row # {0}: Sila menetapkan kuantiti pesanan semula
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Row # {0}: Sila menetapkan kuantiti pesanan semula
 DocType: Landed Cost Voucher,Landed Cost Voucher,Baucer Kos mendarat
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Sila set {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ulangi pada hari Bulan
@@ -3395,7 +3403,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Lihat Sekarang
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Pilih tempoh apabila invois akan dijana secara automatik
 DocType: BOM,Raw Material Cost,Kos bahan mentah
-DocType: Item,Re-Order Level,Re-Order Level
+DocType: Item Reorder,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.,Masukkan item dan qty dirancang yang mana anda mahu untuk meningkatkan pesanan pengeluaran atau memuat turun bahan-bahan mentah untuk analisis.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Sambilan
 DocType: Employee,Applicable Holiday List,Senarai Holiday berkenaan
@@ -3450,7 +3458,7 @@
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Kuantiti item diperolehi selepas pembuatan / pembungkusan semula daripada kuantiti diberi bahan mentah
 DocType: Payment Reconciliation,Receivable / Payable Account,Belum Terima / Akaun Belum Bayar
 DocType: Delivery Note Item,Against Sales Order Item,Terhadap Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +573,Please specify Attribute Value for attribute {0},Sila nyatakan Atribut Nilai untuk atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Please specify Attribute Value for attribute {0},Sila nyatakan Atribut Nilai untuk atribut {0}
 DocType: Item,Default Warehouse,Gudang Default
 DocType: Task,Actual End Date (via Time Logs),Tarikh Tamat Sebenar (melalui Log Masa)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Bajet tidak boleh diberikan terhadap Akaun Kumpulan {0}
@@ -3529,7 +3537,7 @@
 DocType: Address,Office,Pejabat
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Catatan jurnal perakaunan.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Kuantiti Boleh didapati di Dari Gudang
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Sila pilih Rakam Pekerja pertama.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,Sila pilih Rakam Pekerja pertama.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Majlis / Akaun tidak sepadan dengan {1} / {2} dalam {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Untuk membuat Akaun Cukai
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Sila masukkan Akaun Perbelanjaan
@@ -3604,7 +3612,7 @@
 DocType: Item Attribute,Numeric Values,Nilai-nilai berangka
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Lampirkan Logo
 DocType: Customer,Commission Rate,Kadar komisen
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Membuat Varian
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Membuat Varian
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Permohonan cuti blok oleh jabatan.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Troli kosong
 DocType: Production Order,Actual Operating Cost,Kos Sebenar Operasi
@@ -3621,15 +3629,14 @@
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Terma dan Syarat Template
 DocType: Serial No,Delivery Details,Penghantaran Details
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},PTJ diperlukan berturut-turut {0} dalam Cukai meja untuk jenis {1}
-DocType: Item,Automatically create Material Request if quantity falls below this level,Mewujudkan Bahan Permintaan secara automatik jika kuantiti jatuh di bawah paras ini
 ,Item-wise Purchase Register,Perkara-bijak Pembelian Daftar
 DocType: Batch,Expiry Date,Tarikh Luput
-apps/erpnext/erpnext/stock/doctype/item/item.py +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Untuk menetapkan tahap pesanan semula, item perlu menjadi Perkara Pembelian atau Manufacturing Perkara"
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Untuk menetapkan tahap pesanan semula, item perlu menjadi Perkara Pembelian atau Manufacturing Perkara"
 ,Supplier Addresses and Contacts,Alamat Pembekal dan Kenalan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Sila pilih Kategori pertama
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Induk projek.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Tidak menunjukkan apa-apa simbol seperti $ dsb sebelah mata wang.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Separuh Hari)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(Separuh Hari)
 DocType: Supplier,Credit Days,Hari Kredit
 DocType: Leave Type,Is Carry Forward,Apakah Carry Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Dapatkan Item dari BOM
diff --git a/erpnext/translations/my.csv b/erpnext/translations/my.csv
index 659315a..e75401b 100644
--- a/erpnext/translations/my.csv
+++ b/erpnext/translations/my.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% Bill
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),ချိန်း Rate {1} {0} အဖြစ်အတူတူဖြစ်ရမည် ({2})
 DocType: Sales Invoice,Customer Name,ဖောက်သည်အမည်
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},ဘဏ်အကောင့် {0} အဖြစ်အမည်ရှိသောမရနိုင်ပါ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},ဘဏ်အကောင့် {0} အဖြစ်အမည်ရှိသောမရနိုင်ပါ
 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 +173,Outstanding for {0} cannot be less than zero ({1}),ထူးချွန် {0} သုည ({1}) ထက်နည်းမဖြစ်နိုင်
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,နယူးထွက်ခွာလျှောက်လွှာ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,နယူးထွက်ခွာလျှောက်လွှာ
 apps/erpnext/erpnext/setup/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 ကို
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","ခြေရာခံချိန်, ငွေတောင်းခံရာတွင်အသုံးပြုနိုင် Tasks ကိုဆန့်ကျင်အသုံးပြုသူများဖျော်ဖြေလှုပ်ရှားမှုများ၏အထဲ။"
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},နယူး {0}: # {1}
 ,Sales Partners Commission,အရောင်း Partners ကော်မရှင်
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,အတိုကောက်ကျော်ကို 5 ဇာတ်ကောင်ရှိသည်မဟုတ်နိုင်
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,အတိုကောက်ကျော်ကို 5 ဇာတ်ကောင်ရှိသည်မဟုတ်နိုင်
 DocType: Payment Request,Payment Request,ငွေပေးချေမှုရမည့်တောင်းခံခြင်း
 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.",Value ကို {0} Item မူကွဲ \ အဖြစ် {1} ကနေဖယ်ရှားပစ်လို့မရနိုငျ Attribute ကိုဤ Attribute နှင့်အတူတည်ရှိ။
@@ -195,6 +195,7 @@
 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 (%) အပေါ်လျှော့စျေး
 DocType: Offer Letter,Select Terms and Conditions,စည်းကမ်းသတ်မှတ်ချက်များကိုရွေးပါ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,Value တစ်ခုအထဲက
 DocType: Production Planning Tool,Sales Orders,အရောင်းအမိန့်
 DocType: Purchase Taxes and Charges,Valuation,အဘိုးထားခြင်း
 ,Purchase Order Trends,အမိန့်ခေတ်ရေစီးကြောင်းဝယ်ယူ
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,ရုပ်မြင်သံကြား
 DocType: Production Order Operation,Updated via 'Time Log',&#39;&#39; အချိန်အထဲ &#39;&#39; ကနေတဆင့် Updated
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},အကောင့်ကို {0} ကုမ္ပဏီ {1} ပိုင်ပါဘူး
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},ကြိုတင်မဲငွေပမာဏ {0} {1} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Naming Series,Series List for this Transaction,ဒီ Transaction သည်စီးရီးများစာရင်း
 DocType: Sales Invoice,Is Opening Entry,Entry &#39;ဖွင့်လှစ်တာဖြစ်ပါတယ်
 DocType: Customer Group,Mention if non-standard receivable account applicable,Non-စံကိုရရန်အကောင့်ကိုသက်ဆိုင်လျှင်ဖော်ပြထားခြင်း
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,အထက်တွင်ဖော်ပြခဲ့သောစံသတ်မှတ်ချက်များသည်လစာစလစ်ဖန်တီးပေးပါတယ်။
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,ဖော်ပြချက်ပေးအပ်မရှိပါ
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ဝယ်ယူတောင်းဆိုခြင်း။
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,ကိုသာရွေးချယ်ထားထွက်ခွာခွင့်ပြုချက်ဒီထွက်ခွာလျှောက်လွှာတင်သွင်းနိုင်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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 ကို&gt; Settings&gt; အမည်စီးရီးကနေတဆင့် {0} သည်စီးရီးအမည်သတ်မှတ် ကျေးဇူးပြု.
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},ဂိုဒေါင် {0} ကုမ္ပဏီမှ {1} ပိုင်ပါဘူး
 DocType: Item Website Specification,Item Website Specification,item ဝက်ဘ်ဆိုက် Specification
 DocType: Payment Tool,Reference No,ကိုးကားစရာမရှိပါ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Leave Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,Leave Blocked
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,နှစ်ပတ်လည်
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေး Item
 DocType: Stock Entry,Sales Invoice No,အရောင်းပြေစာမရှိ
@@ -248,7 +250,7 @@
 DocType: Pricing Rule,Supplier Type,ပေးသွင်း Type
 DocType: Item,Publish in Hub,Hub အတွက်ထုတ်ဝေ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,material တောင်းဆိုခြင်း
 DocType: Bank Reconciliation,Update Clearance Date,Update ကိုရှင်းလင်းရေးနေ့စွဲ
 DocType: Item,Purchase Details,အသေးစိတ်ဝယ်ယူ
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Delivery မှတ်ချက်
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,အခွန်ကိုတည်ဆောက်ခြင်း
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,သင်ကထွက်ခွာသွားပြီးနောက်ငွေပေးချေမှုရမည့် Entry modified သိရသည်။ တဖန်ဆွဲပေးပါ။
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} Item ခွန်အတွက်နှစ်ကြိမ်သို့ဝင်
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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 ကျေးဇူးပြု.
@@ -327,7 +329,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,သင့်အီးမေးလ်လိပ်စာ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,ပူးတွဲဖိုင်ကြည့်ပေးပါ
 DocType: Purchase Order,% Received,% ရရှိထားသည့်
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,ယခုပင်လျှင် Complete Setup ကို !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,ယခုပင်လျှင် Complete Setup ကို !!
 ,Finished Goods,လက်စသတ်ကုန်စည်
 DocType: Delivery Note,Instructions,ညွှန်ကြားချက်များ
 DocType: Quality Inspection,Inspected By,အားဖြင့်ကြည့်ရှုစစ်ဆေးသည်
@@ -352,14 +354,13 @@
 ,Purchase Register,မှတ်ပုံတင်မည်ဝယ်ယူ
 DocType: Landed Cost Item,Applicable Charges,သက်ဆိုင်စွပ်စွဲချက်
 DocType: Workstation,Consumable Cost,စားသုံးသူများကုန်ကျစရိတ်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) အခန်းကဏ္ဍ &#39;&#39; ထွက်ခွာခွင့်ပြုချက် &#39;&#39; ရှိရမယ်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) အခန်းကဏ္ဍ &#39;&#39; ထွက်ခွာခွင့်ပြုချက် &#39;&#39; ရှိရမယ်
 DocType: Purchase Receipt,Vehicle Date,မော်တော်ယာဉ်နေ့စွဲ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,ဆေးဘက်ဆိုင်ရာ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,ဆုံးရှုံးရသည့်အကြောင်းရင်း
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation နှင့်အားလပ်ရက်များစာရင်းနှုန်းအဖြစ်အောက်ပါရက်စွဲများအပေါ်ပိတ်ထားသည်: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,အခွင့်အလမ်းများ
 DocType: Employee,Single,တခုတည်းသော
-DocType: Issue,Attachment,attachment
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,ဘဏ္ဍာငွေအရအသုံး Group ကကုန်ကျစရိတ် Center ကမဘို့ရာခန့်မရနိုင်ပါ
 DocType: Account,Cost of Goods Sold,ရောင်းချကုန်စည်၏ကုန်ကျစရိတ်
 DocType: Purchase Invoice,Yearly,နှစ်အလိုက်
@@ -388,7 +389,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,attribute {0} Attribute တွေကစားပွဲတင်အတွက်အကြိမ်ပေါင်းများစွာကိုရှေးခယျြ
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,attribute {0} Attribute တွေကစားပွဲတင်အတွက်အကြိမ်ပေါင်းများစွာကိုရှေးခယျြ
 DocType: HR Settings,Employee record is created using selected field. ,ဝန်ထမ်းစံချိန်ရွေးချယ်ထားသောလယ်ကို အသုံးပြု. နေသူများကဖန်တီး။
 DocType: Sales Order,Not Applicable,မသက်ဆိုင်ပါ
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,အားလပ်ရက်မာစတာ။
@@ -427,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,အလှကုန်
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items","ပေါင်းစည်းဖို့, အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးပစ္စည်းများသည်အတူတူပင်ဖြစ်ရပါမည်"
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","ပေါင်းစည်းဖို့, အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးပစ္စည်းများသည်အတူတူပင်ဖြစ်ရပါမည်"
 DocType: Shipping Rule,Net Weight,အသားတင်အလေးချိန်
 DocType: Employee,Emergency Phone,အရေးပေါ်ဖုန်း
 ,Serial No Warranty Expiry,serial မရှိပါအာမခံသက်တမ်းကုန်ဆုံး
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,စီမံခန့်ခွဲ Subcontracting
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},အကောင့်ကို {0} ကုမ္ပဏီပိုင်ပါဘူး: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},အကောင့်ကို {0} ကုမ္ပဏီပိုင်ပါဘူး: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,ပြီးသားအခြားကုမ္ပဏီအတွက်အသုံးပြုအတိုကောက်
 DocType: Selling Settings,Default Customer Group,default ဖောက်သည်အုပ်စု
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Disable လုပ်ထားမယ်ဆိုရင်, &#39;&#39; Rounded စုစုပေါင်း &#39;&#39; လယ်ပြင်၌မည်သည့်အရောင်းအဝယ်အတွက်မြင်နိုင်လိမ့်မည်မဟုတ်ပေ"
 DocType: BOM,Operating Cost,operating ကုန်ကျစရိတ်
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,ထိုပြေစာ table ထဲမှာတွေ့ရှိမရှိပါမှတ်တမ်းများ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,ပထမဦးဆုံးကုမ္ပဏီနှင့်ပါတီ Type ကိုရွေးပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,ဘဏ္ဍာရေး / စာရင်းကိုင်တစ်နှစ်။
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,စုဆောင်းတန်ဖိုးများ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ဝမ်းနည်းပါတယ်, Serial အမှတ်ပေါင်းစည်းမရနိုင်ပါ"
 DocType: Project Task,Project Task,စီမံကိန်းရဲ့ Task
 ,Lead Id,ခဲ Id
@@ -492,7 +495,7 @@
 DocType: Quotation,Quotation To,စျေးနှုန်းရန်
 DocType: Lead,Middle Income,အလယျပိုငျးဝင်ငွေခွန်
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),ဖွင့်ပွဲ (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,သင်ပြီးသားကိုအခြား UOM နှင့်အတူအချို့သောအရောင်းအဝယ် (s) ကိုရာ၌ခန့်ထားပြီဖြစ်သောကြောင့်ပစ္စည်းအဘို့အတိုင်း၏ default အနေနဲ့ယူနစ် {0} ကိုတိုက်ရိုက်ပြောင်းလဲသွားမရနိုင်ပါ။ သင်တစ်ဦးကွဲပြားခြားနားသောပုံမှန် UOM သုံးစွဲဖို့အသစ်တစ်ခုပစ္စည်းကိုဖန်တီးရန်လိုအပ်ပါလိမ့်မည်။
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,သင်ပြီးသားကိုအခြား UOM နှင့်အတူအချို့သောအရောင်းအဝယ် (s) ကိုရာ၌ခန့်ထားပြီဖြစ်သောကြောင့်ပစ္စည်းအဘို့အတိုင်း၏ default အနေနဲ့ယူနစ် {0} ကိုတိုက်ရိုက်ပြောင်းလဲသွားမရနိုင်ပါ။ သင်တစ်ဦးကွဲပြားခြားနားသောပုံမှန် UOM သုံးစွဲဖို့အသစ်တစ်ခုပစ္စည်းကိုဖန်တီးရန်လိုအပ်ပါလိမ့်မည်။
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,ခွဲဝေငွေပမာဏအနုတ်လက္ခဏာမဖြစ်နိုင်
 DocType: Purchase Order Item,Billed Amt,Bill Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,စတော့ရှယ်ယာ entries တွေကိုဖန်ဆင်းထားတဲ့ဆန့်ကျင်နေတဲ့ယုတ္တိဂိုဒေါင်။
@@ -570,7 +573,7 @@
 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 +543,Item has variants.,item မျိုးကွဲရှိပါတယ်။
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -583,6 +586,7 @@
 DocType: Journal Entry,Credit Card Entry,Credit Card ကို Entry &#39;
 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 +33,Goods received from Suppliers.,ကုန်ပစ္စည်းများပေးသွင်းထံမှလက်ခံရရှိခဲ့သည်။
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,Value တစ်ခုအတွက်
 DocType: Lead,Campaign Name,ကင်ပိန်းအမည်
 ,Reserved,Reserved
 DocType: Purchase Order,Supply Raw Materials,supply ကုန်ကြမ်း
@@ -597,16 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,လက်ရှိငွေပေးငွေယူနှင့်အတူအကောင့်ကိုလယ်ဂျာမှပြောင်းလဲမပြနိုင်
 DocType: Delivery Note,Customer's Purchase Order No,customer ရဲ့ဝယ်ယူခြင်းအမိန့်မရှိပါ
 DocType: Employee,Cell Number,cell အရေအတွက်
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,generated auto ပစ္စည်းတောင်းဆိုမှုများ
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,generated auto ပစ္စည်းတောင်းဆိုမှုများ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ဆုံးရှုံး
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,သင်ကကော်လံ &#39;&#39; ဂျာနယ် Entry &#39;ဆန့်ကျင်&#39; &#39;အတွက်လက်ရှိဘောက်ချာမဝင်နိုင်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,စွမ်းအင်ဝန်ကြီးဌာန
 DocType: Opportunity,Opportunity From,မှစ. အခွင့်အလမ်း
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,လစဉ်လစာကြေငြာချက်။
 DocType: Item Group,Website Specifications,website သတ်မှတ်ချက်များ
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},သင့်ရဲ့လိပ်စာ Template {0} မှာအမှားရှိပါတယ်
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,နယူးအကောင့်
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: {1} အမျိုးအစား {0} မှစ.
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,row {0}: ကူးပြောင်းခြင်း Factor မသင်မနေရ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","အကွိမျမြားစှာစျေးစည်းကမ်းများတူညီတဲ့စံနှင့်အတူတည်ရှိ, ဦးစားပေးတာဝန်ပေးဖို့ခြင်းဖြင့်ပဋိပက္ခဖြေရှင်းရန်ပါ။ စျေးစည်းကမ်းများ: {0}"
 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.,စာရင်းကိုင် Entries အရွက်ဆုံမှတ်များဆန့်ကျင်စေနိုင်ပါတယ်။ အဖွဲ့တွေဆန့်ကျင် entries ခွင့်ပြုမထားပေ။
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,ဒါကြောင့်အခြား BOMs နှင့်အတူဆက်စပ်အဖြစ် BOM ရပ်ဆိုင်းနိုင်သို့မဟုတ်ပယ်ဖျက်ခြင်းနိုင်ဘူး
 DocType: Opportunity,Maintenance,ပြုပြင်ထိန်းသိမ်းမှု
@@ -649,7 +655,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,စျေးနှုန်း List ကိုမရွေးချယ်
 DocType: Employee,Family Background,မိသားစုနောက်ခံသမိုင်း
 DocType: Process Payroll,Send Email,အီးမေးလ်ပို့ပါ
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},သတိပေးချက်: မမှန်ကန်ခြင်းနှောင်ကြိုး {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},သတိပေးချက်: မမှန်ကန်ခြင်းနှောင်ကြိုး {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,အဘယ်သူမျှမခွင့်ပြုချက်
 DocType: Company,Default Bank Account,default ဘဏ်မှအကောင့်
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",ပါတီအပေါ်အခြေခံပြီး filter မှပထမဦးဆုံးပါတီ Type ကိုရွေးပါ
@@ -679,13 +685,13 @@
 DocType: Production Planning Tool,Select Items,ပစ္စည်းများကိုရွေးပါ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} ဘီလ် {1} ဆန့်ကျင် {2} ရက်စွဲပါ
 DocType: Maintenance Visit,Completion Status,ပြီးစီးနဲ့ Status
-DocType: Sales Invoice Item,Target Warehouse,Target ကဂိုဒေါင်
+DocType: Production Order,Target Warehouse,Target ကဂိုဒေါင်
 DocType: Item,Allow over delivery or receipt upto this percent,ဒီရာခိုင်နှုန်းအထိပေးပို့သို့မဟုတ်လက်ခံရရှိကျော် Allow
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,မျှော်လင့်ထားသည့် Delivery Date ကိုအရောင်းအမိန့်နေ့စွဲခင်မဖွစျနိုငျ
 DocType: Upload Attendance,Import Attendance,သွင်းကုန်တက်ရောက်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,All item အဖွဲ့များ
 DocType: Process Payroll,Activity Log,လုပ်ဆောင်ချက်အထဲ
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Net ကအမြတ်ခွန် / ပျောက်ဆုံးခြင်း
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Net ကအမြတ်ခွန် / ပျောက်ဆုံးခြင်း
 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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} {2} အဆင့်အတန်းဖြစ်ပါသည်
@@ -693,7 +699,7 @@
 DocType: Sales Order Item,Projected Qty,စီမံကိန်း Qty
 DocType: Sales Invoice,Payment Due Date,ငွေပေးချေမှုရမည့်ကြောင့်နေ့စွဲ
 DocType: Newsletter,Newsletter Manager,သတင်းလွှာ Manager က
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,item Variant {0} ပြီးသားအတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,item Variant {0} ပြီးသားအတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;&#39; ဖွင့်ပွဲ &#39;&#39;
 DocType: Notification Control,Delivery Note Message,Delivery Note ကို Message
 DocType: Expense Claim,Expenses,ကုန်ကျစရိတ်
@@ -703,7 +709,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,သုတေသနနှင့်ဖွံ့ဖြိုးရေး
 ,Amount to Bill,ဘီလ်မှငွေပမာဏကို
 DocType: Company,Registration Details,မှတ်ပုံတင်ခြင်းအသေးစိတ်ကို
-DocType: Item,Re-Order Qty,Re-Order Qty
+DocType: Item Reorder,Re-Order Qty,Re-Order Qty
 DocType: Leave Block List Date,Leave Block List Date,Block List ကိုနေ့စွဲ Leave
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},{0} မှပို့ပေးရန်စီစဉ်ထား
 DocType: Pricing Rule,Price or Discount,စျေးနှုန်းသို့မဟုတ်လျှော့
@@ -746,7 +752,7 @@
 DocType: Bank Reconciliation,Total Amount,စုစုပေါင်းတန်ဘိုး
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,အင်တာနက်ထုတ်ဝေရေး
 DocType: Production Planning Tool,Production Orders,ထုတ်လုပ်မှုအမိန့်
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,ချိန်ခွင် Value တစ်ခု
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,ချိန်ခွင် Value တစ်ခု
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,အရောင်းစျေးနှုန်းများစာရင်း
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,ပစ္စည်းများကိုတစ်ပြိုင်တည်းချိန်ကိုက်ရန် Publish
 DocType: Bank Reconciliation,Account Currency,အကောင့်ကိုငွေကြေးစနစ်
@@ -755,7 +761,7 @@
 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 +538,Item Variants {0} updated,item Variant {0} updated
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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,ကုန်ဆိုင်
@@ -832,7 +838,7 @@
 DocType: POS Profile,Cash/Bank Account,ငွေသား / ဘဏ်မှအကောင့်
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,အရေအတွက်သို့မဟုတ်တန်ဖိုးမျှပြောင်းလဲမှုနှင့်အတူပစ္စည်းများကိုဖယ်ရှားခဲ့သည်။
 DocType: Delivery Note,Delivery To,ရန် Delivery
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,attribute စားပွဲပေါ်မှာမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,လြှော့ခွငျး
@@ -860,7 +866,7 @@
 DocType: Tax Rule,Shipping State,သဘောင်္တင်ခပြည်နယ်
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,item button ကို &#39;&#39; ဝယ်ယူလက်ခံရရှိသည့်ရက်မှပစ္စည်းများ Get &#39;&#39; ကို အသုံးပြု. ထည့်သွင်းပြောကြားခဲ့သည်ရမည်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,အရောင်းအသုံးစရိတ်များ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,စံဝယ်ယူ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,စံဝယ်ယူ
 DocType: GL Entry,Against,ဆန့်ကျင်
 DocType: Item,Default Selling Cost Center,default ရောင်းချသည့်ကုန်ကျစရိတ် Center က
 DocType: Sales Partner,Implementation Partner,အကောင်အထည်ဖော်ရေး Partner
@@ -902,7 +908,7 @@
 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 +210,Production Order {0} must be cancelled before cancelling this Sales Order,ထုတ်လုပ်မှုအမိန့် {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',&#39;&#39; Apply ဖြည့်စွက်လျှော့တွင် &#39;&#39; set ကျေးဇူးပြု.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',&#39;&#39; Apply ဖြည့်စွက်လျှော့တွင် &#39;&#39; set ကျေးဇူးပြု.
 ,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 ။
@@ -970,9 +976,9 @@
 DocType: Contact,User ID,သုံးစွဲသူအိုင်ဒီ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,view လယ်ဂျာ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,အစောဆုံး
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group","တစ်ဦး Item Group မှအမည်တူနှင့်အတူရှိနေတယ်, ပစ္စည်းအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းအုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ"
 DocType: Production Order,Manufacture against Sales Order,အရောင်းအမိန့်ဆန့်ကျင်ထုတ်လုပ်
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,ကမ္ဘာ့အရာကြွင်းလေ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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 ကို
@@ -1002,7 +1008,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","စိတ်မကောင်းပါဘူး, ကုမ္ပဏီများပေါင်းစည်းမရနိုင်ပါ"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","စိတ်မကောင်းပါဘူး, ကုမ္ပဏီများပေါင်းစည်းမရနိုင်ပါ"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,သေးငယ်သော
 DocType: Employee,Employee Number,ဝန်ထမ်းအရေအတွက်
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},ပြီးသားအသုံးပြုမှုအတွက်အမှုအမှတ် (s) ။ Case မရှိပါ {0} ကနေကြိုးစား
@@ -1021,7 +1027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,လယ်ယာစိုက်ပျိုးရေး
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,သင့်ရဲ့ထုတ်ကုန်များသို့မဟုတ်န်ဆောင်မှုများ
 DocType: Mode of Payment,Mode of Payment,ငွေပေးချေမှုရမည့်၏ Mode ကို
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,website က Image ကိုအများသုံးတဲ့ဖိုင်သို့မဟုတ် website ကို URL ကိုဖြစ်သင့်
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,website က Image ကိုအများသုံးတဲ့ဖိုင်သို့မဟုတ် website ကို URL ကိုဖြစ်သင့်
 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
@@ -1093,6 +1099,7 @@
 DocType: Address,Utilities,အသုံးအဆောင်များ
 DocType: Purchase Invoice Item,Accounting,စာရင်းကိုင်
 DocType: Features Setup,Features Setup,အင်္ဂါရပ်များကို Setup
+DocType: Item,Is Service Item,ဝန်ဆောင်မှု Item ဖြစ်ပါတယ်
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,ပလီကေးရှင်းကာလအတွင်းပြင်ပမှာခွင့်ခွဲဝေကာလအတွင်းမဖွစျနိုငျ
 DocType: Activity Cost,Projects,စီမံကိန်းများ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကို select ကျေးဇူးပြု.
@@ -1123,7 +1130,7 @@
 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 +465,cannot be greater than 100,100 ကိုထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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 ကိုမရှိရင်ထွက်ခွာအပေါ်မူတည်
@@ -1182,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,အစိုးရ
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,item Variant
 DocType: Company,Services,န်ဆောင်မှုများ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),စုစုပေါင်း ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),စုစုပေါင်း ({0})
 DocType: Cost Center,Parent Cost Center,မိဘကုန်ကျစရိတ် Center က
 DocType: Sales Invoice,Source,အရင်းအမြစ်
 DocType: Leave Type,Is Leave Without Pay,Pay ကိုမရှိရင် Leave ဖြစ်ပါတယ်
@@ -1255,17 +1262,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ငွေပေးချေမှုရမည့်အီးမေးလ် Resend
 DocType: Dependent Task,Dependent Task,မှီခို Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},{0} တော့ဘူး {1} ထက်မဖွစျနိုငျအမျိုးအစား Leave
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,စားသုံးသည့်ပမာဏ
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} ကြည့်ရန်
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,ငွေအတွက်ပိုက်ကွန်ကိုပြောင်းရန်
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,ငွေအတွက်ပိုက်ကွန်ကိုပြောင်းရန်
 DocType: Salary Structure Deduction,Salary Structure Deduction,လစာဖွဲ့စည်းပုံထုတ်ယူ
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,တိုင်း {0} ၏ယူနစ်တခါကူးပြောင်းခြင်း Factor ဇယားအတွက်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,တိုင်း {0} ၏ယူနစ်တခါကူးပြောင်းခြင်း Factor ဇယားအတွက်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},ငွေပေးချေမှုရမည့်တောင်းခံခြင်းပြီးသား {0} ရှိတယ်ဆိုတဲ့
 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 +182,Quantity must not be more than {0},အရေအတွက် {0} ထက်ပိုပြီးမဖြစ်ရပါမည်
@@ -1327,7 +1334,7 @@
 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: Packed 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 ကိုရောင်းချနေ
@@ -1336,7 +1343,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","ကုမ္ပဏီ, လနှင့်ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာမသင်မနေရ"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,marketing အသုံးစရိတ်များ
 ,Item Shortage Report,item ပြတ်လပ်အစီရင်ခံစာ
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","အလေးချိန်ဖော်ပြခဲ့သောဖြစ်ပါတယ်, \ nPlease လွန်း &quot;အလေးချိန် UOM&quot; ဖော်ပြထားခြင်း"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","အလေးချိန်ဖော်ပြခဲ့သောဖြစ်ပါတယ်, \ nPlease လွန်း &quot;အလေးချိန် UOM&quot; ဖော်ပြထားခြင်း"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ဒီစတော့အိတ် Entry &#39;ပါစေရန်အသုံးပြုပစ္စည်းတောင်းဆိုခြင်း
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,တစ်ဦး Item ၏လူပျိုယူနစ်။
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',အချိန်အထဲ Batch {0} &#39;&#39; Submitted &#39;&#39; ရမည်
@@ -1347,6 +1354,7 @@
 DocType: Employee,Date Of Retirement,အငြိမ်းစားအမျိုးမျိုးနေ့စွဲ
 DocType: Upload Attendance,Get Template,Template: Get
 DocType: Address,Postal,စာတိုက်
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,အပြီးအစီး ERPNext Setup ကို!
 DocType: Item,Weightage,Weightage
 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,တစ်ဖောက်သည်အုပ်စုနာမည်တူနှင့်အတူတည်ရှိသုံးစွဲသူအမည်ကိုပြောင်းလဲဒါမှမဟုတ်ဖောက်သည်အုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,ပထမဦးဆုံး {0} ကို select ပေးပါ။
@@ -1375,12 +1383,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,အများကြီးစစ်ကြောင်းများ။ အစီရင်ခံစာတင်ပို့ပြီး spreadsheet ပလီကေးရှင်းကိုအသုံးပြုခြင်းက print ထုတ်။
 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 +139,Main,အဓိက
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,အဓိက
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,မူကွဲ
 DocType: Naming Series,Set prefix for numbering series on your transactions,သင့်ရဲ့ငွေကြေးလွှဲပြောင်းအပေါ်စီးရီးဦးရေသည်ရှေ့ဆက် Set
 DocType: Employee Attendance Tool,Employees HTML,ဝန်ထမ်းများ HTML ကို
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,ရပ်တန့်နိုင်ရန်ဖျက်သိမ်းမရနိုင်ပါ။ ဖျက်သိမ်းဖို့လှတျ။
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,default BOM ({0}) ဒီအချက်ကိုသို့မဟုတ်ယင်း၏ template ကိုသည်တက်ကြွသောဖြစ်ရမည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,မျိုးကွဲ
@@ -1405,7 +1413,6 @@
 DocType: Sales Order,To Deliver and Bill,လှတျတျောမူနှင့်ဘီလ်မှ
 DocType: GL Entry,Credit Amount in Account Currency,အကောင့်ကိုငွေကြေးစနစ်အတွက်အကြွေးပမာဏ
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,ကုန်ထုတ်လုပ်မှုသည်အချိန် Logs ။
-DocType: Item,Apply Warehouse-wise Reorder Level,ဂိုဒေါင်ပညာ Reorder အဆင့် Apply
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} တင်သွင်းရမည်
 DocType: Authorization Control,Authorization Control,authorization ထိန်းချုပ်ရေး
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},row # {0}: ငြင်းပယ်ဂိုဒေါင်ပယ်ချခဲ့ Item {1} ဆန့်ကျင်မဖြစ်မနေဖြစ်ပါသည်
@@ -1503,6 +1510,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,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}: စစ်ဆင်ရေး {1} ထုတ်လုပ်မှုအမိန့် # {3} အတွက်ချောကုန်စည် {2} qty သည်ပြီးစီးသည်မဟုတ်။ အချိန် Logs ကနေတဆင့်စစ်ဆင်ရေးအဆင့်အတန်းကို update ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,ရင်းနှီးမြှုပ်နှံမှုများ
 DocType: Issue,Resolution Details,resolution အသေးစိတ်ကို
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,နေရာချထားခြင်း
 DocType: Quality Inspection Reading,Acceptance Criteria,လက်ခံမှုကိုလိုအပ်ချက်
 DocType: Item Attribute,Attribute Name,အမည် Attribute
 DocType: Item Group,Show In Website,ဝက်ဘ်ဆိုက်များတွင် show
@@ -1553,7 +1561,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,စရိတ်တောင်းဆိုမှုများအတည်ပြုချက်ဆိုင်းငံ့ထားတာဖြစ်ပါတယ်။ ကိုသာသုံးစွဲမှုအတည်ပြုချက် status ကို update ပြုလုပ်နိုင်ပါသည်။
 DocType: Purchase Invoice,Additional Discount Amount,အပိုဆောင်းလျှော့ငွေပမာဏ
 DocType: Leave Block List Allow,Leave Block List Allow,Allow Block List ကို Leave
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr အလွတ်သို့မဟုတ်အာကာသမဖွစျနိုငျ
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr အလွတ်သို့မဟုတ်အာကာသမဖွစျနိုငျ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,က Non-Group ကိုမှ Group က
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,အားကစား
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,အမှန်တကယ်စုစုပေါင်း
@@ -1594,7 +1602,7 @@
 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 များနှင့်အခြားသောအဓိကကျသည့်ကိစ္စများကို ** ** ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာဆန့်ကျင်ခြေရာခံထောက်လှမ်းနေကြပါတယ်။
 DocType: Opportunity,Customer / Lead Address,customer / ခဲလိပ်စာ
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},သတိပေးချက်: attachment ကို {0} အပေါ်မမှန်ကန်ခြင်း SSL ကိုလက်မှတ်ကို
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},သတိပေးချက်: attachment ကို {0} အပေါ်မမှန်ကန်ခြင်း SSL ကိုလက်မှတ်ကို
 DocType: Production Order Operation,Actual Operation Time,အမှန်တကယ်စစ်ဆင်ရေးအချိန်
 DocType: Authorization Rule,Applicable To (User),(အသုံးပြုသူ) ရန်သက်ဆိုင်သော
 DocType: Purchase Taxes and Charges,Deduct,နှုတ်ယူ
@@ -1743,7 +1751,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,အမှုနံပါတ် 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,သင်အရောင်းရေးအဖွဲ့နှင့်ရောင်းမည်မိတ်ဖက် (Channel ကိုမိတ်ဖက်) ရှိပါကသူတို့ tagged နှင့်အရောင်းလုပ်ဆောင်မှုအတွက်သူတို့ရဲ့ပံ့ပိုးထိန်းသိမ်းရန်နိုင်ပါတယ်
 DocType: Item,Show a slideshow at the top of the page,စာမျက်နှာ၏ထိပ်မှာတစ်ဆလိုက်ရှိုးပြရန်
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,စတိုးဆိုင်များ
+DocType: Item,"Allow in Sales Order of type ""Service""",အမျိုးအစားအရောင်းအမိန့်အတွက် Allow &quot;ဝန်ဆောင်မှု&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,စတိုးဆိုင်များ
 DocType: Time Log,Projects Manager,စီမံကိန်းများ Manager က
 DocType: Serial No,Delivery Time,ပို့ဆောင်ချိန်
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing အခြေပြုတွင်
@@ -1768,7 +1777,7 @@
 ,Financial Analytics,ဘဏ္ဍာရေး Analytics
 DocType: Quality Inspection,Verified By,By Verified
 DocType: Address,Subsidiary,ထောက်ခံသောကုမ္ပဏီ
-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.","လက်ရှိအရောင်းအရှိပါသည်ကြောင့်, ကုမ္ပဏီ၏ default ငွေကြေးမပြောင်းနိုင်ပါတယ်။ အရောင်းအကို default ငွေကြေးပြောင်းလဲဖို့ဖျက်သိမ်းရပါမည်။"
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","လက်ရှိအရောင်းအရှိပါသည်ကြောင့်, ကုမ္ပဏီ၏ default ငွေကြေးမပြောင်းနိုင်ပါတယ်။ အရောင်းအကို default ငွေကြေးပြောင်းလဲဖို့ဖျက်သိမ်းရပါမည်။"
 DocType: Quality Inspection,Purchase Receipt No,ဝယ်ယူခြင်းပြေစာမရှိ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,စားရန်ဖြစ်တော်မူ၏ငွေ
 DocType: Process Payroll,Create Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံ Create
@@ -1816,7 +1825,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,ကုန်ကြမ်းပစ္စည်းများအလွတ်မဖြစ်နိုင်။
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","ငွေတောင်းခံလွှာတစ်စက်ရေကြောင်းကို item များပါရှိသည်, စတော့ရှယ်ယာကို update မရနိုင်ပါ။"
 DocType: Newsletter,Test,စမ်းသပ်
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'","လက်ရှိစတော့ရှယ်ယာအရောင်းအဒီအချက်ကိုသည်ရှိပါတယ်အမျှ \ သင် &#39;&#39; Serial No ရှိခြင်း &#39;&#39; ၏စံတန်ဖိုးများကိုပြောင်းလဲလို့မရဘူး, &#39;&#39; Batch မရှိပါဖူး &#39;&#39; နှင့် &#39;&#39; အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နည်းနိဿယ &#39;&#39; စတော့အိတ် Item Is &#39;&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,လျင်မြန်စွာ Journal မှ Entry &#39;
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,BOM ဆိုတဲ့ item agianst ဖော်ပြခဲ့သောဆိုရင်နှုန်းကိုမပြောင်းနိုင်ပါ
@@ -1905,7 +1914,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,ပထမဦးဆုံး Delivery Note ကိုနှစ်သက်သော
 DocType: Purchase Invoice,Currency and Price List,ငွေကြေးနှင့်စျေးနှုန်းကိုစာရင်း
 DocType: Opportunity,Customer / Lead Name,customer / ခဲအမည်
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,ရှင်းလင်းရေးနေ့စွဲဖော်ပြခဲ့သောမဟုတ်
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,ရှင်းလင်းရေးနေ့စွဲဖော်ပြခဲ့သောမဟုတ်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,ထုတ်လုပ်မှု
 DocType: Item,Allow Production Order,ထုတ်လုပ်မှုအမိန့် Allow
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,row {0}: Start ကိုနေ့စွဲ End Date ကိုခင်ဖြစ်ရမည်
@@ -1915,7 +1924,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,စုစုပေါင်းဝင်ငွေ
 DocType: Purchase Receipt,Time at which materials were received,ပစ္စည်းများလက်ခံရရှိခဲ့ကြသည်မှာအချိန်
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,အကြှနျုပျ၏လိပ်စာ
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,အကြှနျုပျ၏လိပ်စာ
 DocType: Stock Ledger Entry,Outgoing Rate,outgoing Rate
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,"အစည်းအရုံး, အခက်အလက်မာစတာ။"
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,သို့မဟုတ်
@@ -1984,7 +1993,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,ဖောက်သည်အုပ်စု Tree Manage ။
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,နယူးကုန်ကျစရိတ် Center ကအမည်
 DocType: Leave Control Panel,Leave Control Panel,Control Panel ကို Leave
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,မျှမတွေ့ပါက default လိပ်စာ Template ။ Setup ကို&gt; ပုံနှိပ်နှင့် Branding&gt; လိပ်စာ Template ကနေအသစ်တစ်လုံးဖန်တီးပေးပါ။
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,မျှမတွေ့ပါက default လိပ်စာ Template ။ Setup ကို&gt; ပုံနှိပ်နှင့် Branding&gt; လိပ်စာ Template ကနေအသစ်တစ်လုံးဖန်တီးပေးပါ။
 DocType: Appraisal,HR User,HR အသုံးပြုသူတို့၏
 DocType: Purchase Invoice,Taxes and Charges Deducted,အခွန်နှင့်စွပ်စွဲချက်နုတ်ယူ
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,အရေးကိစ္စများ
@@ -2001,7 +2010,7 @@
 ,Sales Browser,အရောင်း Browser ကို
 DocType: Journal Entry,Total Credit,စုစုပေါင်းချေးငွေ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},သတိပေးချက်: နောက်ထပ် {0} # {1} စတော့ရှယ်ယာ entry ကို {2} ဆန့်ကျင်ရှိတယျဆိုတာကို
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,ဒေသဆိုင်ရာ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,အကြီးစား
@@ -2020,7 +2029,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,အားလုံးသည်အရောင်းငွေကြေးကိစ္စရှင်းလင်းမှုမျိုးစုံ ** အရောင်း Persons ဆန့်ကျင် tagged နိုင်ပါတယ် ** သင်ပစ်မှတ် ထား. စောင့်ကြည့်နိုင်အောင်။
 ,S.O. No.,SO အမှတ်
 DocType: Production Order Operation,Make Time Log,အချိန်အထဲလုပ်ပါ
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,reorder အအရေအတွက်သတ်မှတ် ကျေးဇူးပြု.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},ခဲထံမှ {0} ဖောက်သည်ဖန်တီး ကျေးဇူးပြု.
 DocType: Price List,Applicable for Countries,နိုင်ငံများအဘို့သက်ဆိုင်သော
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,ကွန်ပျူတာများ
@@ -2095,7 +2103,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,သက်ဆိုင်ရာလုပ်ငန်း Entries Get
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,စတော့အိတ်သည်စာရင်းကိုင် Entry &#39;
 DocType: Sales Invoice,Sales Team1,အရောင်း Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,item {0} မတည်ရှိပါဘူး
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,item {0} မတည်ရှိပါဘူး
 DocType: Sales Invoice,Customer Address,customer လိပ်စာ
 DocType: Payment Request,Recipient and Message,လက်ခံမဲ့သူကိုနဲ့ Message
 DocType: Purchase Invoice,Apply Additional Discount On,Apply နောက်ထပ်လျှော့တွင်
@@ -2137,7 +2145,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,အဘိုးပြတ် Rate
 apps/erpnext/erpnext/stock/get_item_details.py +274,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} အထက် &#39;&#39; ဝယ်ယူလက်ခံ &#39;&#39; table ထဲမှာမတည်ရှိပါဘူး
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,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 +155,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
@@ -2175,7 +2183,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,နေ့စွဲ relieving ရိုက်ထည့်ပေးပါ။
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,တင်သွင်းနိုင်ပါတယ် &#39;&#39; Approved &#39;&#39; အဆင့်အတန်းနှင့်အတူ Applications ကိုသာ Leave
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,လိပ်စာခေါင်းစဉ်မဖြစ်မနေဖြစ်ပါတယ်။
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,လိပ်စာခေါင်းစဉ်မဖြစ်မနေဖြစ်ပါတယ်။
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,စုံစမ်းရေးအရင်းအမြစ်မဲဆွယ်စည်းရုံးရေးလျှင်ကင်ပိန်းအမည်ကိုထည့်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,သတင်းစာထုတ်ဝေသူများ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကိုရွေးပါ
@@ -2199,6 +2207,7 @@
 DocType: UOM,Must be Whole Number,လုံးနံပါတ်ဖြစ်ရမည်
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(Days ခုနှစ်တွင်) ခွဲဝေနယူးရွက်
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,serial No {0} မတည်ရှိပါဘူး
+DocType: Sales Invoice Item,Customer Warehouse (Optional),ဖောက်သည်ဂိုဒေါင် (Optional)
 DocType: Pricing Rule,Discount Percentage,လျော့စျေးရာခိုင်နှုန်း
 DocType: Payment Reconciliation Invoice,Invoice Number,ကုန်ပို့လွှာနံပါတ်
 apps/erpnext/erpnext/hooks.py +55,Orders,အမိန့်
@@ -2308,7 +2317,7 @@
 DocType: Appraisal,Appraisal,တန်ဖိုးခြင်း
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,နေ့စွဲထပ်ခါတလဲလဲဖြစ်ပါတယ်
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Authorized လက်မှတ်ရေးထိုးထားသော
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},{0} တယောက်ဖြစ်ရပါမည်အတည်ပြုချက် Leave
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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 ကိုအချိန်
@@ -2477,7 +2486,7 @@
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Tool ကိုအစားထိုးပါ
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,တိုင်းပြည်ပညာရှိသောသူကို default လိပ်စာ Templates
 DocType: Sales Order Item,Supplier delivers to Customer,ပေးသွင်းဖောက်သည်မှကယ်တင်
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Show ကိုအခွန်ချိုး-up က
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Show ကိုအခွန်ချိုး-up က
 apps/erpnext/erpnext/accounts/party.py +283,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 &#39;&#39; ကုန်ပစ္စည်းထုတ်လုပ်သည် &#39;&#39; နိုင်ပါတယ်
@@ -2526,7 +2535,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,အတည်ပြုရန်ကုမ္ပဏီ၏နာမ-type ကိုပြန်လည် ကျေးဇူးပြု.
@@ -2553,8 +2562,6 @@
 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,အတူနေ့စွဲမွေးဖွားခြင်း၏နေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,လစာဖွဲ့စည်းပုံ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"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/setup_wizard/industry_type.py +9,Airline,လကွောငျး
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,ပြဿနာပစ္စည်း
@@ -2579,7 +2586,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities မှ &amp; ကုန်စည်ဒိုင်
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant များအတွက်တိုင်း၏ default အနေနဲ့ Unit မှ &#39;&#39; {0} &#39;&#39; Template: ထဲမှာရှိသကဲ့သို့တူညီသူဖြစ်ရမည် &#39;&#39; {1} &#39;&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant များအတွက်တိုင်း၏ default အနေနဲ့ Unit မှ &#39;&#39; {0} &#39;&#39; Template: ထဲမှာရှိသကဲ့သို့တူညီသူဖြစ်ရမည် &#39;&#39; {1} &#39;&#39;
 DocType: Shipping Rule,Calculate Based On,အခြေတွင်တွက်ချက်
 DocType: Delivery Note Item,From Warehouse,ဂိုဒေါင်ထဲကနေ
 DocType: Purchase Taxes and Charges,Valuation and Total,အဘိုးပြတ်နှင့်စုစုပေါင်း
@@ -2588,7 +2595,7 @@
 DocType: Account,Purchase User,ဝယ်ယူအသုံးပြုသူ
 DocType: Notification Control,Customize the Notification,ထိုအမိန့်ကြော်ငြာစာ Customize
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,စစ်ဆင်ရေးအနေဖြင့်ငွေသားဖြင့် Flow
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,default လိပ်စာ Template ဖျက်ပြီးမရနိုင်ပါ
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,default လိပ်စာ Template ဖျက်ပြီးမရနိုင်ပါ
 DocType: Sales Invoice,Shipping Rule,သဘောင်္တင်ခ Rule
 DocType: Manufacturer,Limited to 12 characters,12 ဇာတ်ကောင်များကန့်သတ်
 DocType: Journal Entry,Print Heading,ပုံနှိပ် HEAD
@@ -2681,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,ကုန်သွယ်လုပ်ငန်းခွန်
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome ကိုန်ဆောင်မှုများ
@@ -2700,7 +2707,7 @@
 DocType: Customer,Default Receivable Accounts,default receiver Accounts ကို
 DocType: Tax Rule,Billing State,ငွေတောင်းခံပြည်နယ်
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,လွှဲပြောင်း
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),(Sub-အသင်းတော်များအပါအဝင်) ပေါက်ကွဲခဲ့ BOM Fetch
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),(Sub-အသင်းတော်များအပါအဝင်) ပေါက်ကွဲခဲ့ BOM Fetch
 DocType: Authorization Rule,Applicable To (Employee),(န်ထမ်း) ရန်သက်ဆိုင်သော
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,ကြောင့်နေ့စွဲမသင်မနေရ
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Attribute {0} ပါ 0 င်မဖွစျနိုငျဘို့ increment
@@ -2733,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),ယာယီအမြတ်ခွန် / ပျောက်ဆုံးခြင်းစဉ် (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),ယာယီအမြတ်ခွန် / ပျောက်ဆုံးခြင်းစဉ် (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,အရောင်းပြေစာဆန့်ကျင်သို့ပြန်သွားသည်
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,item 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},{1} ကုမ္ပဏီအတွက် {0} default တန်ဖိုးထားပေးပါ
@@ -2764,6 +2771,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,ကလေး Add
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Frozen Accounts ကို &amp; Edit ကိုအေးခဲ Entries Set မှ Allowed အခန်းကဏ္ဍ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,ဒါကြောင့်ကလေးဆုံမှတ်များရှိပါတယ်အဖြစ်လယ်ဂျာမှကုန်ကျစရိတ် Center က convert နိုင်ဘူး
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,ဖွင့်လှစ် Value တစ်ခု
 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,အရောင်းအပေါ်ကော်မရှင်
 DocType: Offer Letter Term,Value / Description,Value တစ်ခု / ဖော်ပြချက်များ
@@ -2797,7 +2805,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,အောင်မြင်စွာဒီကုမ္ပဏီနှင့်ဆက်စပ်သောအားလုံးအရောင်းအဖျက်ပြီး!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,နေ့စွဲအပေါ်အဖြစ်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,အစမ်းထား
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,default ဂိုဒေါင်စတော့ရှယ်ယာ Item တွေအတွက်မဖြစ်မနေဖြစ်ပါတယ်။
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},လ {0} သည်လစာ၏ငွေပေးချေမှုရမည့်နှင့်တစ်နှစ် {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,auto INSERT စျေးနှုန်းကိုစာရင်းနှုန်းကပျောက်ဆုံးနေဆဲလျှင်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,စုစုပေါင်း Paid ငွေပမာဏ
@@ -2833,7 +2840,7 @@
 DocType: Payment Tool,Set Matching Amounts,Set စျေးကွက်ငွေပမာဏ
 DocType: Purchase Invoice,Taxes and Charges Added,အခွန်နှင့်စွပ်စွဲချက် Added
 ,Sales Funnel,အရောင်းကတော့
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,အတိုကောက်မဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,အတိုကောက်မဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,ကျွန်တော်တို့ရဲ့ updates ကိုယူခြင်းအတွက်သင့်ရဲ့အကျိုးစီးပွားအတွက်ကျေးဇူးတင်ပါသည်
 ,Qty to Transfer,သို့လွှဲပြောင်းရန် Qty
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,ခဲသို့မဟုတ် Customer များ quotes ။
@@ -2861,7 +2868,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,ပေးသွင်းစျေးနှုန်း
 DocType: Quotation,In Words will be visible once you save the Quotation.,သင်စျေးနှုန်းကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} ရပ်တန့်နေသည်
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Barcode {0} ပြီးသား Item {1} များတွင်အသုံးပြု
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,လာမည့်အဖြစ်အပျက်များ
@@ -2883,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကိုရွေးပါ ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS Entry &#39;ပါစေရန်လိုအပ်သည် POS ကိုယ်ရေးအချက်အလက်များ profile
 DocType: Hub Settings,Name Token,Token အမည်
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,စံရောင်းချသည့်
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,စံရောင်းချသည့်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Atleast တယောက်ဂိုဒေါင်မသင်မနေရ
 DocType: Serial No,Out of Warranty,အာမခံထဲက
 DocType: BOM Replace Tool,Replace,အစားထိုးဖို့
@@ -3006,7 +3013,7 @@
 DocType: Sales Invoice,Paid Amount,Paid ငွေပမာဏ
 ,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 ပြင်ဆင်ခြင်း
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,ငါမှတပါးအခြားသော default အရှိအဖြစ်ကို default အတိုင်းဤလိပ်စာ Template ပြင်ဆင်ခြင်း
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Debit ထဲမှာရှိပြီးသားအကောင့်ကိုချိန်ခွင်ကိုသင် &#39;&#39; Credit &#39;အဖြစ်&#39; &#39;Balance ဖြစ်ရမည်&#39; &#39;တင်ထားရန်ခွင့်ပြုမနေကြ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,အရည်အသွေးအစီမံခန့်ခွဲမှု
 DocType: Production Planning Tool,Filter based on customer,ဖောက်သည်အပေါ်အခြေခံပြီး filter
@@ -3107,7 +3114,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Default အဖြစ်ဒီဘဏ္ဍာရေးနှစ်တစ်နှစ်တာတင်ထားရန်, &#39;&#39; Default အဖြစ်သတ်မှတ်ပါ &#39;&#39; ကို 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 +19,Shortage Qty,ပြတ်လပ်မှု Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
 DocType: Salary Slip,Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;&#39; နေ့စွဲရန် &#39;&#39; လိုအပ်သည်
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","ကယ်နှုတ်တော်မူ၏ခံရဖို့အစုအထုပ်ကိုတနိုင်ငံအညွန့ထုပ်ပိုး Generate ။ package ကိုနံပါတ်, package ကို contents တွေကိုနှင့်၎င်း၏အလေးချိန်အကြောင်းကြားရန်အသုံးပြုခဲ့ကြသည်။"
@@ -3118,7 +3125,7 @@
 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 ကိစ္စများကိုမဆို &quot;Submitted&quot; အခါ, အီးမေးလ် pop-up တခုအလိုအလျှောက်ပူးတွဲမှုအဖြစ်အရောင်းအဝယ်နှင့်အတူကြောင့်အရောင်းအဝယ်အတွက်ဆက်စပ် &quot;ဆက်သွယ်ရန်&quot; ရန်အီးမေးလ်ပေးပို့ဖို့ဖွင့်လှစ်ခဲ့။ အသုံးပြုသူသို့မဟုတ်မပြုစေခြင်းငှါအီးမေးလ်ပို့ပါလိမ့်မည်။"
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,ကမ္ဘာလုံးဆိုင်ရာချိန်ညှိချက်များကို
 DocType: Employee Education,Employee Education,ဝန်ထမ်းပညာရေး
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,ဒါဟာပစ္စည်း Details ကိုဆွဲယူဖို့လိုသည်။
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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} ပြီးသားကိုလက်ခံရရှိခဲ့ပြီး
@@ -3144,6 +3151,7 @@
 DocType: BOM,Manufacturing User,ကုန်ထုတ်လုပ်မှုအသုံးပြုသူတို့၏
 DocType: Purchase Order,Raw Materials Supplied,ပေးထားသည့်ကုန်ကြမ်းပစ္စည်းများ
 DocType: Purchase Invoice,Recurring Print Format,ထပ်တလဲလဲပုံနှိပ်စီစဉ်ဖွဲ့စည်းမှုပုံစံ
+DocType: C-Form,Series,စီးရီး
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,မျှော်လင့်ထားသည့် Delivery Date ကိုဝယ်ယူခြင်းအမိန့်နေ့စွဲခင်မဖွစျနိုငျ
 DocType: Appraisal,Appraisal Template,စိစစ်ရေး Template:
 DocType: Item Group,Item Classification,item ခွဲခြား
@@ -3219,7 +3227,7 @@
 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 +434,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 +420,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.","ဆုံးရှုံးအဖြစ်စျေးနှုန်းကိုဖန်ဆင်းခဲ့ပြီးကြောင့်, ကြေညာလို့မရပါဘူး။"
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ဝယ်ယူမဟာ Manager က
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,ထုတ်လုပ်မှုအမိန့် {0} တင်သွင်းရမည်
@@ -3227,7 +3235,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,အဓိကအစီရင်ခံစာများ
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ယနေ့အထိသည့်နေ့ရက်မှခင်မဖွစျနိုငျ
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Edit ကိုဈေးနှုန်းများ Add /
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,ငါ့အမိန့်
@@ -3275,7 +3283,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},row # {0}: ကို item များအတွက် Set ပေးသွင်း {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,website က Image ကို {0} ပစ္စည်းမှပူးတွဲပါ {1} မတွေ့ရှိနိုင်
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,website က Image ကို {0} ပစ္စည်းမှပူးတွဲပါ {1} မတွေ့ရှိနိုင်
 DocType: Issue,Content Type,content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ကွန်ပျူတာ
 DocType: Item,List this Item in multiple groups on the website.,Website တွင်အများအပြားအုပ်စုများ၌ဤ Item စာရင်း။
@@ -3289,7 +3297,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,&#39;&#39; ဟုတ်ကဲ့ &#39;&#39; Non-စတော့ရှယ်ယာကို item သည်မဖွစျနိုငျ &#39;&#39; Serial No ရှိခြင်း &#39;&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,&#39;&#39; ဟုတ်ကဲ့ &#39;&#39; Non-စတော့ရှယ်ယာကို item သည်မဖွစျနိုငျ &#39;&#39; Serial No ရှိခြင်း &#39;&#39;
 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,အကောင့်ဖွင့်ဦးခေါင်း
@@ -3315,7 +3323,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,အကောင့်ကို {0} ပိတ်ပြီး type ကိုတာဝန်ဝတ္တရား / Equity ၏ဖြစ်ရပါမည်
 DocType: Authorization Rule,Based On,ပေါ်အခြေခံကာ
 DocType: Sales Order Item,Ordered Qty,အမိန့် Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,item {0} ပိတ်ထားတယ်
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,item {0} ပိတ်ထားတယ်
 DocType: Stock Settings,Stock Frozen Upto,စတော့အိတ် Frozen အထိ
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},မှစ. နှင့်ကာလ {0} ထပ်တလဲလဲများအတွက်မဖြစ်မနေရက်စွဲများရန် period
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,စီမံကိန်းလှုပ်ရှားမှု / အလုပ်တစ်ခုကို။
@@ -3323,7 +3331,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","application များအတွက် {0} အဖြစ်ရွေးချယ်မယ်ဆိုရင်ဝယ်, checked ရမည်"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,လျော့စျေးက 100 ထက်လျော့နည်းဖြစ်ရမည်
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ဟာ Off ရေးဖို့ပမာဏ (Company မှငွေကြေးစနစ်)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,row # {0}: set ကျေးဇူးပြု. reorder အအရေအတွက်
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,row # {0}: set ကျေးဇူးပြု. reorder အအရေအတွက်
 DocType: Landed Cost Voucher,Landed Cost Voucher,ကုန်ကျစရိတ်ဘောက်ချာဆင်းသက်
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},{0} set ကျေးဇူးပြု.
 DocType: Purchase Invoice,Repeat on Day of Month,Month ရဲ့နေ့တွင် Repeat
@@ -3395,7 +3403,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,အခုတော့ကြည့်ရန်
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,ထိုကုန်ပို့လွှာကိုအလိုအလျောက် generated လိမ့်မည်သည့်အခါကာလကိုရွေးချယ်ပါ
 DocType: BOM,Raw Material Cost,ကုန်ကြမ်းပစ္စည်းကုန်ကျစရိတ်
-DocType: Item,Re-Order Level,Re-Order အဆင့်
+DocType: Item Reorder,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 စီစဉ်ခဲ့ပါတယ်။
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,အချိန်ပိုင်း
 DocType: Employee,Applicable Holiday List,သက်ဆိုင်အားလပ်ရက်များစာရင်း
@@ -3450,7 +3458,7 @@
 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 +573,Please specify Attribute Value for attribute {0},attribute က {0} များအတွက် Value ကို Attribute ကိုသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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} ဆန့်ကျင်တာဝန်ပေးမရနိုင်ပါ
@@ -3529,7 +3537,7 @@
 DocType: Address,Office,ရုံး
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,စာရင်းကိုင်ဂျာနယ် entries တွေကို။
 DocType: Delivery Note Item,Available Qty at From Warehouse,ဂိုဒေါင် မှစ. မှာရရှိနိုင်တဲ့ Qty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,န်ထမ်းမှတ်တမ်းပထမဦးဆုံးရွေးချယ်ပါ။
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,န်ထမ်းမှတ်တမ်းပထမဦးဆုံးရွေးချယ်ပါ။
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,အသုံးအကောင့်ကိုရိုက်ထည့်ပေးပါ
@@ -3604,7 +3612,7 @@
 DocType: Item Attribute,Numeric Values,numeric တန်ဖိုးများ
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Logo ကို Attach
 DocType: Customer,Commission Rate,ကော်မရှင် Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Variant Make
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Variant Make
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,ဦးစီးဌာနကခွင့် applications များပိတ်ဆို့။
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,လှည်း Empty ဖြစ်ပါသည်
 DocType: Production Order,Actual Operating Cost,အမှန်တကယ် Operating ကုန်ကျစရိတ်
@@ -3621,15 +3629,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item","reorder အ level ကိုတင်ထားရန်, ကို item တစ်ခုဝယ်ယူပစ္စည်းသို့မဟုတ်ထုတ်လုပ်ခြင်းပစ္စည်းဖြစ်ရပါမည်"
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),(တစ်ဝက်နေ့)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(တစ်ဝက်နေ့)
 DocType: Supplier,Credit Days,ခရက်ဒစ် Days
 DocType: Leave Type,Is Carry Forward,Forward ယူသွားတာဖြစ်ပါတယ်
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,BOM ထံမှပစ္စည်းများ Get
diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index 910b9e2..27458cd 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% Gefactureerd
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Wisselkoers moet hetzelfde zijn als zijn {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Klantnaam
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Bankrekening kan niet worden genoemd als {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Bankrekening kan niet worden genoemd als {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Openstaand bedrag voor {0} mag niet kleiner zijn dan nul ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Nieuwe Verlofaanvraag
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Nieuwe Verlofaanvraag
 apps/erpnext/erpnext/setup/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
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",Log van activiteiten van gebruikers tegen taken die kunnen worden gebruikt voor het bijhouden van tijd facturering.
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Nieuwe {0}: # {1}
 ,Sales Partners Commission,Verkoop Partners Commissie
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Afkorting kan niet meer dan 5 tekens lang zijn
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Afkorting kan niet meer dan 5 tekens lang zijn
 DocType: Payment Request,Payment Request,Betaal verzoek
 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.",Attribuut Waarde {0} niet uit {1} als Item Varianten \ kan worden verwijderd bestaan met dit attribuut.
@@ -195,6 +195,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,Select Voorwaarden
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,out Value
 DocType: Production Planning Tool,Sales Orders,Verkooporders
 DocType: Purchase Taxes and Charges,Valuation,Waardering
 ,Purchase Order Trends,Inkooporder Trends
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,televisie
 DocType: Production Order Operation,Updated via 'Time Log',Bijgewerkt via 'Time Log'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Rekening {0} behoort niet tot Bedrijf {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Advance bedrag kan niet groter zijn dan {0} {1}
 DocType: Naming Series,Series List for this Transaction,Reeks voor deze transactie
 DocType: Sales Invoice,Is Opening Entry,Wordt Opening Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Vermeld als niet-standaard te ontvangen houdend met de toepasselijke
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Maakt salarisstrook voor de bovengenoemde criteria.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Geen beschrijving gegeven
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Inkoopaanvraag
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/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&gt; Instellingen&gt; Naamgeving Series
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Magazijn {0} behoort niet tot bedrijf {1}
 DocType: Item Website Specification,Item Website Specification,Artikel Website Specificatie
 DocType: Payment Tool,Reference No,Referentienummer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Verlof Geblokkeerd
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Verlof Geblokkeerd
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,Annual,jaar-
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voorraad Afletteren Artikel
 DocType: Stock Entry,Sales Invoice No,Verkoopfactuur nr.
@@ -248,7 +250,7 @@
 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 +606,Item {0} is cancelled,Artikel {0} is geannuleerd
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Artikel {0} is geannuleerd
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Materiaal Aanvraag
 DocType: Bank Reconciliation,Update Clearance Date,Werk Clearance Datum
 DocType: Item,Purchase Details,Inkoop Details
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Vrachtbrief
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Het opzetten van Belastingen
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} twee keer opgenomen in Artikel BTW
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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
@@ -328,7 +330,7 @@
 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 +215,Please see attachment,Zie bijlage
 DocType: Purchase Order,% Received,% Ontvangen
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Installatie al voltooid !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Installatie al voltooid !
 ,Finished Goods,Gereed Product
 DocType: Delivery Note,Instructions,Instructies
 DocType: Quality Inspection,Inspected By,Geïnspecteerd door
@@ -353,14 +355,13 @@
 ,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 +169,{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 +189,{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/setup_wizard/install_fixtures.py +39,Medical,medisch
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Reden voor het verliezen
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Werkstation is gesloten op de volgende data als per Holiday Lijst: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Kansen
 DocType: Employee,Single,Enkele
-DocType: Issue,Attachment,Gehechtheid
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budget kan niet worden ingesteld voor groep kostenplaats
 DocType: Account,Cost of Goods Sold,Kostprijs verkopen
 DocType: Purchase Invoice,Yearly,Jaarlijks
@@ -389,7 +390,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel
 DocType: HR Settings,Employee record is created using selected field. ,Werknemer regel wordt gemaakt met behulp van geselecteerd veld.
 DocType: Sales Order,Not Applicable,Niet van toepassing
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Vakantie meester .
@@ -428,7 +429,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Cosmetica
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"To merge, following properties must be same for both items","Om samen te voegen, moeten de volgende eigenschappen hetzelfde zijn voor beide artikelen"
 DocType: Shipping Rule,Net Weight,Netto Gewicht
 DocType: Employee,Emergency Phone,Noodgeval Telefoonnummer
 ,Serial No Warranty Expiry,Serienummer Garantie Afloop
@@ -439,7 +440,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Managing Subcontracting
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Rekening {0} behoort niet tot bedrijf: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Rekening {0} behoort niet tot bedrijf: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Afkorting al gebruikt voor een ander bedrijf
 DocType: Selling Settings,Default Customer Group,Standaard Klant Groep
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Indien uitgevinkt, zal het 'Afgerond Totaal' veld niet zichtbaar zijn in een transactie"
 DocType: BOM,Operating Cost,Operationele kosten
@@ -473,6 +475,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Geen records gevonden in de factuur tabel
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Selecteer Company en Party Type eerste
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Financiële / boekjaar .
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,verzameld Waarden
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sorry , serienummers kunnen niet worden samengevoegd"
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Lead Id
@@ -494,7 +497,7 @@
 DocType: Quotation,Quotation To,Offerte Voor
 DocType: Lead,Middle Income,Modaal Inkomen
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Opening ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Standaard maateenheid voor post {0} kan niet direct worden gewijzigd, omdat je al enkele transactie (s) met een andere UOM hebben gemaakt. U moet een nieuwe post naar een andere Standaard UOM gebruik maken."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Standaard maateenheid voor post {0} kan niet direct worden gewijzigd, omdat je al enkele transactie (s) met een andere UOM hebben gemaakt. U moet een nieuwe post naar een andere Standaard UOM gebruik maken."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Toegekende bedrag kan niet negatief zijn
 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.
@@ -572,7 +575,7 @@
 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 +543,Item has variants.,Item heeft varianten.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -585,6 +588,7 @@
 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 +33,Goods received from Suppliers.,Goederen ontvangen van leveranciers.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,in Value
 DocType: Lead,Campaign Name,Campagnenaam
 ,Reserved,gereserveerd
 DocType: Purchase Order,Supply Raw Materials,Supply Grondstoffen
@@ -599,16 +603,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Rekening met bestaande transactie kan niet worden geconverteerd naar grootboek
 DocType: Delivery Note,Customer's Purchase Order No,Inkoopordernummer van Klant
 DocType: Employee,Cell Number,Mobiele nummer
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Materiaal Verzoeken Vernieuwd
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Auto Materiaal Verzoeken Vernieuwd
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Verloren
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,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/setup_wizard/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Opportunity Van
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Maandsalaris overzicht.
 DocType: Item Group,Website Specifications,Website Specificaties
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Er is een fout in uw Address Template {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Nieuwe Rekening
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Van {0} van type {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rij {0}: Conversie Factor is verplicht
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Meerdere Prijs Regels bestaat met dezelfde criteria, dan kunt u conflicten op te lossen door het toekennen van prioriteit. Prijs Regels: {0}"
 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.,Boekingen kunnen worden gemaakt tegen leaf nodes. Inzendingen tegen groepen zijn niet toegestaan.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan stuklijst niet deactiveren of annuleren aangezien het is gelinkt met andere stuklijsten.
 DocType: Opportunity,Maintenance,Onderhoud
@@ -670,7 +676,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,Prijslijst niet geselecteerd
 DocType: Employee,Family Background,Familie Achtergrond
 DocType: Process Payroll,Send Email,E-mail verzenden
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Waarschuwing: Invalid Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Waarschuwing: Invalid Attachment {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Geen toestemming
 DocType: Company,Default Bank Account,Standaard bankrekening
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Om te filteren op basis van Party, selecteer Party Typ eerst"
@@ -700,13 +706,13 @@
 DocType: Production Planning Tool,Select Items,Selecteer Artikelen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} tegen Factuur {1} gedateerd {2}
 DocType: Maintenance Visit,Completion Status,Voltooiingsstatus
-DocType: Sales Invoice Item,Target Warehouse,Doel Magazijn
+DocType: Production Order,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 +50,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/setup_wizard/install_fixtures.py +17,All Item Groups,Alle Artikel Groepen
 DocType: Process Payroll,Activity Log,Activiteitenlogboek
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Netto winst / verlies
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Netto winst / verlies
 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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status {2}
@@ -714,7 +720,7 @@
 DocType: Sales Order Item,Projected Qty,Verwachte Aantal
 DocType: Sales Invoice,Payment Due Date,Betaling Vervaldatum
 DocType: Newsletter,Newsletter Manager,Nieuwsbrief Manager
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Item Variant {0} bestaat al met dezelfde kenmerken
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Item Variant {0} bestaat al met dezelfde kenmerken
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Opening&#39;
 DocType: Notification Control,Delivery Note Message,Vrachtbrief Bericht
 DocType: Expense Claim,Expenses,Uitgaven
@@ -724,7 +730,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Research & Development
 ,Amount to Bill,Neerkomen op Bill
 DocType: Company,Registration Details,Registratie Details
-DocType: Item,Re-Order Qty,Re-order Aantal
+DocType: Item Reorder,Re-Order Qty,Re-order Aantal
 DocType: Leave Block List Date,Leave Block List Date,Laat Block List Datum
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Gepland om te sturen naar {0}
 DocType: Pricing Rule,Price or Discount,Prijs of korting
@@ -767,7 +773,7 @@
 DocType: Bank Reconciliation,Total Amount,Totaal bedrag
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,internet Publishing
 DocType: Production Planning Tool,Production Orders,Productieorders
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balans Waarde
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Balans Waarde
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Sales Prijslijst
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publiceren naar onderdelen wilt synchroniseren
 DocType: Bank Reconciliation,Account Currency,Account Valuta
@@ -776,7 +782,7 @@
 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 +538,Item Variants {0} updated,Item Varianten {0} bijgewerkt
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -853,7 +859,7 @@
 DocType: POS Profile,Cash/Bank Account,Kas/Bankrekening
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Attributentabel is verplicht
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Korting
@@ -881,7 +887,7 @@
 DocType: Tax Rule,Shipping State,Scheepvaart State
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Het punt moet worden toegevoegd met behulp van 'Get Items uit Aankoopfacturen' knop
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Verkoopkosten
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Standard kopen
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Standard kopen
 DocType: GL Entry,Against,Tegen
 DocType: Item,Default Selling Cost Center,Standaard Verkoop kostenplaats
 DocType: Sales Partner,Implementation Partner,Implementatie Partner
@@ -923,7 +929,7 @@
 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 +210,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/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Stel &#39;Solliciteer Extra Korting op&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Stel &#39;Solliciteer Extra Korting op&#39;
 ,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.
@@ -991,9 +997,9 @@
 DocType: Contact,User ID,Gebruikers-ID
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Bekijk Grootboek
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Vroegst
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Produceren tegen Verkooporder
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Rest van de Wereld
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1023,7 +1029,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Klein
 DocType: Employee,Employee Number,Werknemer Nummer
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Zaak nr. ( s ) al in gebruik. Probeer uit Zaak nr. {0}
@@ -1042,7 +1048,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,landbouw
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Uw producten of diensten
 DocType: Mode of Payment,Mode of Payment,Wijze van betaling
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Website Afbeelding moet een publiek bestand of website URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Website Afbeelding moet een publiek bestand of website URL
 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
@@ -1114,6 +1120,7 @@
 DocType: Address,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,Boekhouding
 DocType: Features Setup,Features Setup,Features Setup
+DocType: Item,Is Service Item,Is service-artikel
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Aanvraagperiode kan buiten verlof toewijzingsperiode niet
 DocType: Activity Cost,Projects,Projecten
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Selecteer boekjaar
@@ -1144,7 +1151,7 @@
 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 +465,cannot be greater than 100,mag niet groter zijn dan 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Artikel {0} is geen voorraadartikel
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1204,7 +1211,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Overheid
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Item Varianten
 DocType: Company,Services,Services
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Totaal ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Totaal ({0})
 DocType: Cost Center,Parent Cost Center,Bovenliggende kostenplaats
 DocType: Sales Invoice,Source,Bron
 DocType: Leave Type,Is Leave Without Pay,Is onbetaald verlof
@@ -1277,17 +1284,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,E-mail opnieuw te verzenden Betaling
 DocType: Dependent Task,Dependent Task,Afhankelijke Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} View
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Netto wijziging in cash
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Netto wijziging in cash
 DocType: Salary Structure Deduction,Salary Structure Deduction,Salaris Structuur Aftrek
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Betalingsverzoek bestaat al {0}
 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 +182,Quantity must not be more than {0},Hoeveelheid mag niet meer zijn dan {0}
@@ -1349,7 +1356,7 @@
 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: Packed 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
@@ -1358,7 +1365,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Bedrijf , maand en het fiscale jaar is verplicht"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Marketingkosten
 ,Item Shortage Report,Artikel Tekort Rapport
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Het gewicht wordt vermeld, \n Vermeld ""Gewicht UOM"" te"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Het gewicht wordt vermeld, \n Vermeld ""Gewicht UOM"" te"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiaal Aanvraag is gebruikt om deze Voorraad  Entry te maken
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enkel stuks van een artikel.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Tijd Log Batch {0} moet worden 'Ingediend'
@@ -1369,6 +1376,7 @@
 DocType: Employee,Date Of Retirement,Pensioneringsdatum
 DocType: Upload Attendance,Get Template,Get Sjabloon
 DocType: Address,Postal,Post-
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext Setup is voltooid!
 DocType: Item,Weightage,Weging
 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
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Selecteer eerst {0}.
@@ -1397,12 +1405,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Teveel kolommen. Exporteer het rapport en druk het af via een Spreadsheet programma.
 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 +139,Main,Hoofd
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Hoofd
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Instellen voorvoegsel voor nummerreeksen voor uw transacties
 DocType: Employee Attendance Tool,Employees HTML,medewerkers HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,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 +367,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/stock/doctype/item/item.py +361,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
@@ -1427,7 +1435,6 @@
 DocType: Sales Order,To Deliver and Bill,Te leveren en Bill
 DocType: GL Entry,Credit Amount in Account Currency,Credit Bedrag in account Valuta
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Time Logs voor de productie.
-DocType: Item,Apply Warehouse-wise Reorder Level,Solliciteer Warehouse-wise Reorder Niveau
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,Stuklijst {0} moet worden ingediend
 DocType: Authorization Control,Authorization Control,Autorisatie controle
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rij # {0}: Afgekeurd Warehouse is verplicht tegen verworpen Item {1}
@@ -1526,6 +1533,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Rij # {0}: Operation {1} is niet voltooid voor {2} aantal van afgewerkte goederen in productieorders # {3}. Gelieve operatie status bijwerken via Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investeringen
 DocType: Issue,Resolution Details,Oplossing Details
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Toekenningen
 DocType: Quality Inspection Reading,Acceptance Criteria,Acceptatiecriteria
 DocType: Item Attribute,Attribute Name,Attribuutnaam
 DocType: Item Group,Show In Website,Toon in Website
@@ -1576,7 +1584,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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
 DocType: Leave Block List Allow,Leave Block List Allow,Laat Block List Laat
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr kan niet leeg of ruimte
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr kan niet leeg of ruimte
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Groep om Non-groep
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Totaal Werkelijke
@@ -1617,7 +1625,7 @@
 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**.
 DocType: Opportunity,Customer / Lead Address,Klant / Lead Adres
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Waarschuwing: Ongeldig SSL certificaat op attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Waarschuwing: Ongeldig SSL certificaat op attachment {0}
 DocType: Production Order Operation,Actual Operation Time,Werkelijke Operatie Duur
 DocType: Authorization Rule,Applicable To (User),Van toepassing zijn op (Gebruiker)
 DocType: Purchase Taxes and Charges,Deduct,Aftrekken
@@ -1766,7 +1774,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Zaak nr. mag geen 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,Als je Sales Team en Verkoop Partners (Channel Partners) ze kunnen worden gelabeld en onderhouden van hun bijdrage in de commerciële activiteit
 DocType: Item,Show a slideshow at the top of the page,Laat een diavoorstelling zien aan de bovenkant van de pagina
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Winkels
+DocType: Item,"Allow in Sales Order of type ""Service""",Laat in Sales Order van het type &quot;Service&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Winkels
 DocType: Time Log,Projects Manager,Projecten Manager
 DocType: Serial No,Delivery Time,Levertijd
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Vergrijzing Based On
@@ -1791,7 +1800,7 @@
 ,Financial Analytics,Financiële Analyse
 DocType: Quality Inspection,Verified By,Geverifieerd door
 DocType: Address,Subsidiary,Dochteronderneming
-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 bedrijf standaard valuta niet veranderen , want er zijn bestaande transacties . Transacties moeten worden geannuleerd om de standaard valuta te wijzigen ."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Kan bedrijf standaard valuta niet veranderen , want er zijn bestaande transacties . Transacties moeten worden geannuleerd om de standaard valuta te wijzigen ."
 DocType: Quality Inspection,Purchase Receipt No,Ontvangstbevestiging nummer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Onderpand
 DocType: Process Payroll,Create Salary Slip,Maak loonstrook
@@ -1839,7 +1848,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Grondstoffen kan niet leeg zijn.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Kon niet bijwerken voorraad, factuur bevat daling van de scheepvaart punt."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 &#39;Heeft Serial No&#39;, &#39;Heeft Batch Nee&#39;, &#39;Is Stock Item&#39; en &#39;Valuation Method&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,U kunt het tarief niet veranderen als een artikel Stuklijst-gerelateerd is.
@@ -1948,7 +1957,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Gelieve Afleveringsbon eerste
 DocType: Purchase Invoice,Currency and Price List,Valuta en Prijslijst
 DocType: Opportunity,Customer / Lead Name,Klant / Lead Naam
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Ontruiming Datum niet vermeld
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Ontruiming Datum niet vermeld
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,productie
 DocType: Item,Allow Production Order,Laat Productieorder
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Rij {0} : Start Datum moet voor Einddatum zijn
@@ -1958,7 +1967,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 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 +118,My Addresses,Mijn Adressen
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Mijn Adressen
 DocType: Stock Ledger Entry,Outgoing Rate,Uitgaande Rate
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Organisatie tak meester .
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,of
@@ -2027,7 +2036,7 @@
 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 +302,New Cost Center Name,Nieuwe Kostenplaats Naam
 DocType: Leave Control Panel,Leave Control Panel,Verlof Configuratiescherm
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,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.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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
 DocType: Purchase Invoice,Taxes and Charges Deducted,Belastingen en Toeslagen Afgetrokken
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Kwesties
@@ -2044,7 +2053,7 @@
 ,Sales Browser,Verkoop verkenner
 DocType: Journal Entry,Total Credit,Totaal Krediet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Waarschuwing: Een andere {0} # {1} bestaat tegen voorraad binnenkomst {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Lokaal
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Groot
@@ -2063,7 +2072,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alle Verkoop Transacties kunnen worden gelabeld tegen meerdere ** Sales Personen **, zodat u kunt instellen en controleren doelen."
 ,S.O. No.,VO nr
 DocType: Production Order Operation,Make Time Log,Maak Time Inloggen
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Stel reorder hoeveelheid
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Maak Klant van Lead {0}
 DocType: Price List,Applicable for Countries,Toepasselijk voor Landen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computers
@@ -2150,7 +2158,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Haal relevante gegevens op
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Boekingen voor Voorraad
 DocType: Sales Invoice,Sales Team1,Verkoop Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Artikel {0} bestaat niet
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Artikel {0} bestaat niet
 DocType: Sales Invoice,Customer Address,Klant Adres
 DocType: Payment Request,Recipient and Message,Ontvanger en bericht
 DocType: Purchase Invoice,Apply Additional Discount On,Breng Extra Korting op
@@ -2192,7 +2200,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Waardering Tarief
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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
@@ -2230,7 +2238,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Vul het verlichten datum .
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Alleen Verlofaanvragen met de status 'Goedgekeurd' kunnen worden ingediend
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Adres titel is verplicht.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Adres titel is verplicht.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Voer de naam van de campagne in als bron van onderzoek Campagne is
 apps/erpnext/erpnext/setup/setup_wizard/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
@@ -2254,6 +2262,7 @@
 DocType: UOM,Must be Whole Number,Moet heel getal zijn
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nieuwe Verloven Toegewezen (in dagen)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serienummer {0} bestaat niet
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Customer Warehouse (optioneel)
 DocType: Pricing Rule,Discount Percentage,Kortingspercentage
 DocType: Payment Reconciliation Invoice,Invoice Number,Factuurnummer
 apps/erpnext/erpnext/hooks.py +55,Orders,Bestellingen
@@ -2363,7 +2372,7 @@
 DocType: Appraisal,Appraisal,Beoordeling
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum wordt herhaald
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Geautoriseerd ondertekenaar
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},Verlof goedkeurder moet een zijn van {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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
@@ -2532,7 +2541,7 @@
 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
 DocType: Sales Order Item,Supplier delivers to Customer,Leverancier levert aan de Klant
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Toon tax break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Toon tax break-up
 apps/erpnext/erpnext/accounts/party.py +283,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 '
@@ -2582,7 +2591,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,Gelieve re-type bedrijfsnaam te bevestigen
@@ -2609,8 +2618,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Salarisstructuur
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"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/setup_wizard/industry_type.py +9,Airline,vliegmaatschappij
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Kwestie Materiaal
@@ -2635,7 +2642,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standaard maateenheid voor Variant &#39;{0}&#39; moet hetzelfde zijn als in zijn Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standaard maateenheid voor Variant &#39;{0}&#39; moet hetzelfde zijn als in zijn Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Berekenen gebaseerd op
 DocType: Delivery Note Item,From Warehouse,Van Warehouse
 DocType: Purchase Taxes and Charges,Valuation and Total,Waardering en Totaal
@@ -2644,7 +2651,7 @@
 DocType: Account,Purchase User,Aankoop Gebruiker
 DocType: Notification Control,Customize the Notification,Aanpassen Kennisgeving
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Kasstroom uit bedrijfsoperaties
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standaard Adres Sjabloon kan niet worden verwijderd
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Standaard Adres Sjabloon kan niet worden verwijderd
 DocType: Sales Invoice,Shipping Rule,Verzendregel
 DocType: Manufacturer,Limited to 12 characters,Beperkt tot 12 tekens
 DocType: Journal Entry,Print Heading,Print Kop
@@ -2738,7 +2745,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,commercieel
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
@@ -2757,7 +2764,7 @@
 DocType: Customer,Default Receivable Accounts,Default Debiteuren
 DocType: Tax Rule,Billing State,Billing State
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Verplaatsen
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Haal uitgeklapte Stuklijst op (inclusief onderdelen)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,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 +95,Due Date is mandatory,Due Date is verplicht
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Toename voor Attribute {0} kan niet worden 0
@@ -2790,7 +2797,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Voorlopige winst / verlies (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Voorlopige winst / verlies (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Terug Tegen Sales Invoice
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Punt 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Stel standaard waarde {0} in Company {1}
@@ -2821,6 +2828,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Onderliggende toevoegen
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rol toegestaan om Stel Frozen Accounts & bewerken Frozen Entries
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Kan kostenplaats niet omzetten naar grootboek vanwege onderliggende nodes
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,opening Value
 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,Commissie op de verkoop
 DocType: Offer Letter Term,Value / Description,/ Beschrijving
@@ -2854,7 +2862,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Succesvol verwijderd alle transacties met betrekking tot dit bedrijf!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Op Date
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,proeftijd
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Standaard Magazijn is verplicht voor voorraadartikel .
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Betaling van salaris voor de maand {0} en jaar {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert Prijslijst tarief als vermist
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Totale betaalde bedrag
@@ -2890,7 +2897,7 @@
 DocType: Payment Tool,Set Matching Amounts,Stel Matching Bedragen
 DocType: Purchase Invoice,Taxes and Charges Added,Belastingen en Toeslagen toegevoegd
 ,Sales Funnel,Verkoop Trechter
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Afkorting is verplicht
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Afkorting is verplicht
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Dank u voor uw interesse in een abonnement op onze updates
 ,Qty to Transfer,Aantal te verplaatsen
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Offertes naar leads of klanten.
@@ -2918,7 +2925,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} is gestopt
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Barcode {0} is al in gebruik in post {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,aankomende evenementen
@@ -2941,7 +2948,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Selecteer boekjaar ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS profiel nodig om POS Entry maken
 DocType: Hub Settings,Name Token,Naam Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Standaard Verkoop
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Standaard Verkoop
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -3064,7 +3071,7 @@
 DocType: Sales Invoice,Paid Amount,Betaald Bedrag
 ,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
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,Dit adres Template instellen als standaard als er geen andere standaard
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo reeds in Debit, is het niet toegestaan om 'evenwicht moet worden' als 'Credit'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
 DocType: Production Planning Tool,Filter based on customer,Filteren op basis van klant
@@ -3165,7 +3172,7 @@
 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 +19,Shortage Qty,Tekort Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Item variant {0} bestaat met dezelfde kenmerken
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Item variant {0} bestaat met dezelfde kenmerken
 DocType: Salary Slip,Salary Slip,Salarisstrook
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Tot Datum' is vereist
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Genereren van pakbonnen voor pakketten te leveren. Gebruikt voor pakket nummer, inhoud van de verpakking en het gewicht te melden."
@@ -3176,7 +3183,7 @@
 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 +749,It is needed to fetch Item Details.,Het is nodig om Item Details halen.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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
@@ -3202,6 +3209,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: C-Form,Series,Reeksen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,Verwachte leverdatum kan niet voor de Inkooporder Datum
 DocType: Appraisal,Appraisal Template,Beoordeling Sjabloon
 DocType: Item Group,Item Classification,Item Classificatie
@@ -3288,7 +3296,7 @@
 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 +434,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 +420,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."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Aankoop Master Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Productie Order {0} moet worden ingediend
@@ -3296,7 +3304,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Hoofdrapporten
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Tot Datum kan niet eerder zijn dan Van Datum
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Toevoegen / bewerken Prijzen
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Mijn Bestellingen
@@ -3344,7 +3352,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Rij # {0}: Stel Leverancier voor punt {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Website Afbeelding {0} verbonden aan Item {1} kan niet worden gevonden
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Website Afbeelding {0} verbonden aan Item {1} kan niet worden gevonden
 DocType: Issue,Content Type,Content Type
 apps/erpnext/erpnext/setup/setup_wizard/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.
@@ -3358,7 +3366,7 @@
 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 +357,'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 +351,'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
@@ -3384,7 +3392,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Sluiten account {0} moet van het type aansprakelijkheid / Equity zijn
 DocType: Authorization Rule,Based On,Gebaseerd op
 DocType: Sales Order Item,Ordered Qty,Besteld Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Punt {0} is uitgeschakeld
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Punt {0} is uitgeschakeld
 DocType: Stock Settings,Stock Frozen Upto,Voorraad Bevroren Tot
 apps/erpnext/erpnext/controllers/recurring_document.py +168,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.
@@ -3392,7 +3400,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Aankopen moeten worden gecontroleerd, indien ""VAN TOEPASSING VOOR"" is geselecteerd als {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Korting moet minder dan 100 zijn
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Schrijf Off Bedrag (Company Munt)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Rij # {0}: Stel nabestelling hoeveelheid
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Rij # {0}: Stel nabestelling hoeveelheid
 DocType: Landed Cost Voucher,Landed Cost Voucher,Vrachtkosten Voucher
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Stel {0} in
 DocType: Purchase Invoice,Repeat on Day of Month,Herhaal dit op dag van de maand
@@ -3464,7 +3472,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Bekijk nu
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Selecteer de periode waarin de factuur  automatisch wordt gegenereerd
 DocType: BOM,Raw Material Cost,Grondstofprijzen
-DocType: Item,Re-Order Level,Re-order Niveau
+DocType: Item Reorder,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."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Deeltijds
 DocType: Employee,Applicable Holiday List,Toepasselijk Holiday Lijst
@@ -3519,7 +3527,7 @@
 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 +573,Please specify Attribute Value for attribute {0},Geef aub attribuut Waarde voor kenmerk {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3598,7 +3606,7 @@
 DocType: Address,Office,Kantoor
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Journaalposten.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Aantal beschikbaar bij Van Warehouse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Selecteer eerst Werknemer Record.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,Selecteer eerst Werknemer Record.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,Vul Kostenrekening in
@@ -3673,7 +3681,7 @@
 DocType: Item Attribute,Numeric Values,Numerieke waarden
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Bevestig Logo
 DocType: Customer,Commission Rate,Commissie Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Maak Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Maak Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Blok verlaten toepassingen per afdeling.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Winkelwagen is leeg
 DocType: Production Order,Actual Operating Cost,Werkelijke operationele kosten
@@ -3690,15 +3698,14 @@
 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 +380,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 +419,"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 +408,"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 +380, (Half Day),(Halve Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Artikelen ophalen van Stuklijst
diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv
index 7ccd15a..a40a533 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% Fakturert
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Exchange Rate må være samme som {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Kundenavn
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Bankkonto kan ikke bli navngitt som {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Bankkonto kan ikke bli navngitt som {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre enn null ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,New La Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,New La Application
 apps/erpnext/erpnext/setup/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
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Logg av aktiviteter som utføres av brukere mot Oppgaver som kan brukes for å spore tid, fakturering."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},New {0} # {1}
 ,Sales Partners Commission,Sales Partners Commission
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Forkortelse kan ikke ha mer enn fem tegn
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Forkortelse kan ikke ha mer enn fem tegn
 DocType: Payment Request,Payment Request,Betaling Request
 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.",Tilskriver Verdi {0} kan ikke fjernes fra {1} som Element Varianter \ eksistere med dette attributtet.
@@ -195,6 +195,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,Velg Vilkår
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,ut Verdi
 DocType: Production Planning Tool,Sales Orders,Salgsordrer
 DocType: Purchase Taxes and Charges,Valuation,Verdivurdering
 ,Purchase Order Trends,Innkjøpsordre Trender
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,TV
 DocType: Production Order Operation,Updated via 'Time Log',Oppdatert via &#39;Time Logg&#39;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konto {0} tilhører ikke selskapet {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Advance beløpet kan ikke være større enn {0} {1}
 DocType: Naming Series,Series List for this Transaction,Serien Liste for denne transaksjonen
 DocType: Sales Invoice,Is Opening Entry,Åpner Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Nevn hvis ikke-standard fordring konto aktuelt
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Oppretter lønn slip for ovennevnte kriterier.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Ingen beskrivelse gitt
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Be for kjøp.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/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&gt; Innstillinger&gt; Naming Series
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Warehouse {0} ikke tilhører selskapet {1}
 DocType: Item Website Specification,Item Website Specification,Sak Nettsted Spesifikasjon
 DocType: Payment Tool,Reference No,Referansenummer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,La Blokkert
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,La Blokkert
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,Annual,Årlig
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Avstemming Element
 DocType: Stock Entry,Sales Invoice No,Salg Faktura Nei
@@ -248,7 +250,7 @@
 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 +606,Item {0} is cancelled,Element {0} er kansellert
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Element {0} er kansellert
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Materialet Request
 DocType: Bank Reconciliation,Update Clearance Date,Oppdater Lagersalg Dato
 DocType: Item,Purchase Details,Kjøps Detaljer
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Levering Note
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Sette opp skatter
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} registrert to ganger i pkt Skatte
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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
@@ -327,7 +329,7 @@
 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 +215,Please see attachment,Vennligst se vedlegg
 DocType: Purchase Order,% Received,% Mottatt
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Oppsett Allerede Komplett !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Oppsett Allerede Komplett !!
 ,Finished Goods,Ferdigvarer
 DocType: Delivery Note,Instructions,Bruksanvisning
 DocType: Quality Inspection,Inspected By,Inspisert av
@@ -352,14 +354,13 @@
 ,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 +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) må ha rollen «La Godkjenner &#39;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) må ha rollen «La Godkjenner &#39;
 DocType: Purchase Receipt,Vehicle Date,Vehicle Dato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medisinsk
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Grunnen for å tape
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation er stengt på følgende datoer som per Holiday Liste: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Muligheter
 DocType: Employee,Single,Enslig
-DocType: Issue,Attachment,Vedlegg
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budsjettet kan ikke stilles for konsernet kostnadssted
 DocType: Account,Cost of Goods Sold,Varekostnad
 DocType: Purchase Invoice,Yearly,Årlig
@@ -388,7 +389,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
 DocType: HR Settings,Employee record is created using selected field. ,Ansatt posten er opprettet ved hjelp av valgte feltet.
 DocType: Sales Order,Not Applicable,Gjelder ikke
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Holiday mester.
@@ -427,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Kosmetikk
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"To merge, following properties must be same for both items","Å fusjonere, må følgende egenskaper være lik for begge elementene"
 DocType: Shipping Rule,Net Weight,Netto Vekt
 DocType: Employee,Emergency Phone,Emergency Phone
 ,Serial No Warranty Expiry,Ingen garanti Utløpsserie
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Administrerende Underleverandører
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konto {0} tilhører ikke selskapet: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Konto {0} tilhører ikke selskapet: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Forkortelse allerede brukt for et annet selskap
 DocType: Selling Settings,Default Customer Group,Standard Kundegruppe
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Hvis deaktivere, &#39;Rounded Total-feltet ikke vil være synlig i enhver transaksjon"
 DocType: BOM,Operating Cost,Driftskostnader
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Ingen poster ble funnet i Faktura tabellen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vennligst velg først selskapet og Party Type
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Finansiell / regnskap år.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,akkumulerte verdier
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sorry, kan Serial Nos ikke bli slått sammen"
 DocType: Project Task,Project Task,Prosjektet Task
 ,Lead Id,Lead Id
@@ -492,7 +495,7 @@
 DocType: Quotation,Quotation To,Sitat Å
 DocType: Lead,Middle Income,Middle Income
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Åpning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standard Enhet for Element {0} kan ikke endres direkte fordi du allerede har gjort noen transaksjon (er) med en annen målenheter. Du må opprette et nytt element for å bruke et annet standardmålenheter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standard Enhet for Element {0} kan ikke endres direkte fordi du allerede har gjort noen transaksjon (er) med en annen målenheter. Du må opprette et nytt element for å bruke et annet standardmålenheter.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Bevilget beløpet kan ikke være negativ
 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.
@@ -570,7 +573,7 @@
 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 +543,Item has variants.,Elementet har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -583,6 +586,7 @@
 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 +33,Goods received from Suppliers.,Mottatte varer fra leverandører.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,i Verdi
 DocType: Lead,Campaign Name,Kampanjenavn
 ,Reserved,Reservert
 DocType: Purchase Order,Supply Raw Materials,Leverer råvare
@@ -597,16 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Konto med eksisterende transaksjon kan ikke konverteres til Ledger
 DocType: Delivery Note,Customer's Purchase Order No,Kundens innkjøpsordre Nei
 DocType: Employee,Cell Number,Cell Number
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Materiell Forespørsler Generert
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Auto Materiell Forespørsler Generert
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Mistet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke legge inn dagens kupong i &quot;Against Journal Entry-kolonnen
 apps/erpnext/erpnext/setup/setup_wizard/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.
 DocType: Item Group,Website Specifications,Nettstedet Spesifikasjoner
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Det er en feil i adresse Mal {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Ny Konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Fra {0} av typen {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rad {0}: Omregningsfaktor er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flere Pris regler eksisterer med samme kriteriene, kan du løse konflikten ved å prioritere. Pris Regler: {0}"
 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.,Regnskaps Oppføringer kan gjøres mot bladnoder. Føringer mot grupper er ikke tillatt.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan ikke deaktivere eller kansellere BOM som det er forbundet med andre stykklister
 DocType: Opportunity,Maintenance,Vedlikehold
@@ -649,7 +655,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,Prisliste ikke valgt
 DocType: Employee,Family Background,Familiebakgrunn
 DocType: Process Payroll,Send Email,Send E-Post
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Advarsel: Ugyldig Vedlegg {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Advarsel: Ugyldig Vedlegg {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ingen tillatelse
 DocType: Company,Default Bank Account,Standard Bank Account
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Hvis du vil filtrere basert på partiet, velger partiet Skriv inn først"
@@ -679,13 +685,13 @@
 DocType: Production Planning Tool,Select Items,Velg Items
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} mot Bill {1} datert {2}
 DocType: Maintenance Visit,Completion Status,Completion Status
-DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
+DocType: Production Order,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 +50,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/setup_wizard/install_fixtures.py +17,All Item Groups,Alle varegrupper
 DocType: Process Payroll,Activity Log,Aktivitetsloggen
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Netto gevinst / tap
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Netto gevinst / tap
 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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status er {2}
@@ -693,7 +699,7 @@
 DocType: Sales Order Item,Projected Qty,Anslått Antall
 DocType: Sales Invoice,Payment Due Date,Betalingsfrist
 DocType: Newsletter,Newsletter Manager,Nyhetsbrev manager
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Sak Variant {0} finnes allerede med samme attributtene
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Sak Variant {0} finnes allerede med samme attributtene
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Opening&quot;
 DocType: Notification Control,Delivery Note Message,Levering Note Message
 DocType: Expense Claim,Expenses,Utgifter
@@ -703,7 +709,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Forskning Og Utvikling
 ,Amount to Bill,Beløp til Bill
 DocType: Company,Registration Details,Registrering Detaljer
-DocType: Item,Re-Order Qty,Re-Order Antall
+DocType: Item Reorder,Re-Order Qty,Re-Order Antall
 DocType: Leave Block List Date,Leave Block List Date,La Block List Dato
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planlagt å sende til {0}
 DocType: Pricing Rule,Price or Discount,Pris eller rabatt
@@ -746,7 +752,7 @@
 DocType: Bank Reconciliation,Total Amount,Totalbeløp
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internett Publisering
 DocType: Production Planning Tool,Production Orders,Produksjonsordrer
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balanse Verdi
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Balanse Verdi
 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,Publisere synkronisere elementer
 DocType: Bank Reconciliation,Account Currency,Account Valuta
@@ -755,7 +761,7 @@
 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 +538,Item Variants {0} updated,Sak Varianter {0} oppdatert
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -832,7 +838,7 @@
 DocType: POS Profile,Cash/Bank Account,Cash / Bank Account
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Attributt tabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Rabatt
@@ -860,7 +866,7 @@
 DocType: Tax Rule,Shipping State,Shipping State
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Elementet må legges til med &quot;Get Elementer fra innkjøps Receipts &#39;knappen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Salgs Utgifter
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Standard Kjøpe
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Standard Kjøpe
 DocType: GL Entry,Against,Against
 DocType: Item,Default Selling Cost Center,Standard Selling kostnadssted
 DocType: Sales Partner,Implementation Partner,Gjennomføring Partner
@@ -902,7 +908,7 @@
 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 +210,Production Order {0} must be cancelled before cancelling this Sales Order,Produksjonsordre {0} må avbestilles før den avbryter denne salgsordre
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Vennligst sett &#39;Apply Ytterligere rabatt på&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Vennligst sett &#39;Apply Ytterligere rabatt på&#39;
 ,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.
@@ -970,9 +976,9 @@
 DocType: Contact,User ID,Bruker-ID
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Vis Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Produserer mot kundeordre
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Resten Av Verden
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1002,7 +1008,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Sorry, kan selskapene ikke fusjoneres"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Sorry, kan selskapene ikke fusjoneres"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Liten
 DocType: Employee,Employee Number,Ansatt Number
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Tilfellet Nei (e) allerede er i bruk. Prøv fra sak nr {0}
@@ -1021,7 +1027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landbruk
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Dine produkter eller tjenester
 DocType: Mode of Payment,Mode of Payment,Modus for betaling
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Website Bilde bør være en offentlig fil eller nettside URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Website Bilde bør være en offentlig fil eller nettside URL
 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
@@ -1093,6 +1099,7 @@
 DocType: Address,Utilities,Verktøy
 DocType: Purchase Invoice Item,Accounting,Regnskap
 DocType: Features Setup,Features Setup,Funksjoner Setup
+DocType: Item,Is Service Item,Er Tjenesten Element
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Tegningsperioden kan ikke være utenfor permisjon tildeling periode
 DocType: Activity Cost,Projects,Prosjekter
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Vennligst velg regnskapsår
@@ -1123,7 +1130,7 @@
 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 +465,cannot be greater than 100,kan ikke være større enn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Element {0} er ikke en lagervare
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1182,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Regjeringen
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Element Varianter
 DocType: Company,Services,Tjenester
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Parent kostnadssted
 DocType: Sales Invoice,Source,Source
 DocType: Leave Type,Is Leave Without Pay,Er permisjon uten Pay
@@ -1255,17 +1262,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Sende Betaling Email
 DocType: Dependent Task,Dependent Task,Avhengig Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Vis
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Netto endring i kontanter
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Netto endring i kontanter
 DocType: Salary Structure Deduction,Salary Structure Deduction,Lønn Struktur Fradrag
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Betaling Request allerede eksisterer {0}
 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 +182,Quantity must not be more than {0},Antall må ikke være mer enn {0}
@@ -1327,7 +1334,7 @@
 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: Packed 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
@@ -1336,7 +1343,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Company, Måned og regnskapsåret er obligatorisk"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Markedsføringskostnader
 ,Item Shortage Report,Sak Mangel Rapporter
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vekt er nevnt, \ nVennligst nevne &quot;Weight målenheter&quot; også"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vekt er nevnt, \ nVennligst nevne &quot;Weight målenheter&quot; også"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materialet Request brukes til å gjøre dette lager Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enkelt enhet av et element.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Tid Logg Batch {0} må være &quot;Skrevet&quot;
@@ -1347,6 +1354,7 @@
 DocType: Employee,Date Of Retirement,Pensjoneringstidspunktet
 DocType: Upload Attendance,Get Template,Få Mal
 DocType: Address,Postal,Postal
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 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
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Vennligst velg {0} først.
@@ -1375,12 +1383,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,For mange kolonner. Eksportere rapporten og skrive den ut ved hjelp av et regnearkprogram.
 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 +139,Main,Hoved
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Hoved
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Still prefiks for nummerering serien på dine transaksjoner
 DocType: Employee Attendance Tool,Employees HTML,ansatte HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,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 +367,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/stock/doctype/item/item.py +361,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
@@ -1405,7 +1413,6 @@
 DocType: Sales Order,To Deliver and Bill,Å levere og Bill
 DocType: GL Entry,Credit Amount in Account Currency,Credit beløp på kontoen Valuta
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Tid Logger for industrien.
-DocType: Item,Apply Warehouse-wise Reorder Level,Påfør Warehouse-messig Omgjøre nivå
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} må sendes
 DocType: Authorization Control,Authorization Control,Autorisasjon kontroll
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Avvist Warehouse er obligatorisk mot avvist Element {1}
@@ -1503,6 +1510,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,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 fullført for {2} qty av ferdigvarer i Produksjonsordre # {3}. Vennligst oppdater driftsstatus via Tid Logger
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investeringer
 DocType: Issue,Resolution Details,Oppløsning Detaljer
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Avsetninger
 DocType: Quality Inspection Reading,Acceptance Criteria,Akseptkriterier
 DocType: Item Attribute,Attribute Name,Attributt navn
 DocType: Item Group,Show In Website,Show I Website
@@ -1553,7 +1561,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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
 DocType: Leave Block List Allow,Leave Block List Allow,La Block List Tillat
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Gruppe til Non-gruppe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total Actual
@@ -1594,7 +1602,7 @@
 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 **.
 DocType: Opportunity,Customer / Lead Address,Kunde / Lead Adresse
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL-sertifikat på vedlegg {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL-sertifikat på vedlegg {0}
 DocType: Production Order Operation,Actual Operation Time,Selve Operasjon Tid
 DocType: Authorization Rule,Applicable To (User),Gjelder til (User)
 DocType: Purchase Taxes and Charges,Deduct,Trekke
@@ -1743,7 +1751,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Sak nr kan 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 merkes og vedlikeholde sitt bidrag i salgsaktivitet
 DocType: Item,Show a slideshow at the top of the page,Vis en lysbildeserie på toppen av siden
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Butikker
+DocType: Item,"Allow in Sales Order of type ""Service""",Tillate i salgsordre av type &quot;Service&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Butikker
 DocType: Time Log,Projects Manager,Prosjekter manager
 DocType: Serial No,Delivery Time,Leveringstid
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Aldring Based On
@@ -1768,7 +1777,7 @@
 ,Financial Analytics,Finansielle Analytics
 DocType: Quality Inspection,Verified By,Verified by
 DocType: Address,Subsidiary,Datterselskap
-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 endre selskapets standardvaluta, fordi det er eksisterende transaksjoner. Transaksjoner må avbestilles å endre valgt valuta."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Kan ikke endre selskapets standardvaluta, fordi det er eksisterende transaksjoner. Transaksjoner må avbestilles å endre valgt valuta."
 DocType: Quality Inspection,Purchase Receipt No,Kvitteringen Nei
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Penger
 DocType: Process Payroll,Create Salary Slip,Lag Lønn Slip
@@ -1816,7 +1825,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Råvare kan ikke være blank.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Kunne ikke oppdatere lager, inneholder faktura slippe frakt element."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 &#39;,&#39; Har Batch No &#39;,&#39; Er Stock Element&quot; og &quot;verdsettelsesmetode &#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Hurtig Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Du kan ikke endre prisen dersom BOM nevnt agianst ethvert element
@@ -1905,7 +1914,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Vennligst følgeseddel først
 DocType: Purchase Invoice,Currency and Price List,Valuta og prisliste
 DocType: Opportunity,Customer / Lead Name,Kunde / Lead navn
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Klaring Dato ikke nevnt
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Klaring Dato ikke nevnt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Produksjon
 DocType: Item,Allow Production Order,Tillat produksjonsordre
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Rad {0}: Startdato må være før sluttdato
@@ -1915,7 +1924,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 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 +118,My Addresses,Mine adresser
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Mine adresser
 DocType: Stock Ledger Entry,Outgoing Rate,Utgående Rate
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Organisering gren mester.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,eller
@@ -1984,7 +1993,7 @@
 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 +302,New Cost Center Name,New kostnadssted Navn
 DocType: Leave Control Panel,Leave Control Panel,La Kontrollpanel
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,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&gt; Trykking og merkevarebygging&gt; Adresse Mal.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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&gt; Trykking og merkevarebygging&gt; Adresse Mal.
 DocType: Appraisal,HR User,HR User
 DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter og avgifter fratrukket
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Problemer
@@ -2001,7 +2010,7 @@
 ,Sales Browser,Salg Browser
 DocType: Journal Entry,Total Credit,Total Credit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: Another {0} # {1} finnes mot aksje oppføring {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Lokal
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Stor
@@ -2020,7 +2029,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Alle salgstransaksjoner kan være merket mot flere ** Salgs Personer ** slik at du kan stille inn og overvåke mål.
 ,S.O. No.,SO No.
 DocType: Production Order Operation,Make Time Log,Gjør Tid Logg
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Vennligst sett omgjøring kvantitet
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Opprett Customer fra Lead {0}
 DocType: Price List,Applicable for Countries,Gjelder for Land
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Datamaskiner
@@ -2095,7 +2103,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Få Relevante Entries
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Regnskap Entry for Stock
 DocType: Sales Invoice,Sales Team1,Salg TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Element {0} finnes ikke
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Element {0} finnes ikke
 DocType: Sales Invoice,Customer Address,Kunde Adresse
 DocType: Payment Request,Recipient and Message,Mottaker og melding
 DocType: Purchase Invoice,Apply Additional Discount On,Påfør Ytterligere rabatt på
@@ -2137,7 +2145,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Verdivurdering Rate
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 &#39;innkjøps Receipts&#39; bord
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,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 +155,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
@@ -2175,7 +2183,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Skriv inn lindrende dato.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Kun La Applikasjoner med status &quot;Godkjent&quot; kan sendes inn
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Adresse Tittel er obligatorisk.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Adresse Tittel er obligatorisk.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Skriv inn navnet på kampanjen hvis kilden til henvendelsen er kampanje
 apps/erpnext/erpnext/setup/setup_wizard/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
@@ -2199,6 +2207,7 @@
 DocType: UOM,Must be Whole Number,Må være hele tall
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nye Løv Tildelte (i dager)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial No {0} finnes ikke
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Customer Warehouse (valgfritt)
 DocType: Pricing Rule,Discount Percentage,Rabatt Prosent
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
 apps/erpnext/erpnext/hooks.py +55,Orders,Bestillinger
@@ -2308,7 +2317,7 @@
 DocType: Appraisal,Appraisal,Appraisal
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Dato gjentas
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Autorisert signatur
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,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 +184,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
@@ -2477,7 +2486,7 @@
 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
 DocType: Sales Order Item,Supplier delivers to Customer,Leverandør leverer til kunden
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Vis skatt break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Vis skatt break-up
 apps/erpnext/erpnext/accounts/party.py +283,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 &#39;produseres&#39;
@@ -2526,7 +2535,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,Vennligst re-type firmanavn for å bekrefte
@@ -2553,8 +2562,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Lønn Struktur
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"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/setup_wizard/industry_type.py +9,Airline,Flyselskap
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Issue Material
@@ -2579,7 +2586,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Verdipapirer og råvarebørser
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard Enhet for Variant {0} må være samme som i malen {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard Enhet for Variant {0} må være samme som i malen {1}
 DocType: Shipping Rule,Calculate Based On,Beregn basert på
 DocType: Delivery Note Item,From Warehouse,Fra Warehouse
 DocType: Purchase Taxes and Charges,Valuation and Total,Verdivurdering og Total
@@ -2588,7 +2595,7 @@
 DocType: Account,Purchase User,Kjøp User
 DocType: Notification Control,Customize the Notification,Tilpass varslings
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Kontantstrøm fra driften
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard adresse mal kan ikke slettes
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Standard adresse mal kan ikke slettes
 DocType: Sales Invoice,Shipping Rule,Shipping Rule
 DocType: Manufacturer,Limited to 12 characters,Begrenset til 12 tegn
 DocType: Journal Entry,Print Heading,Print Overskrift
@@ -2681,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,Commercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Tjenester
@@ -2700,7 +2707,7 @@
 DocType: Customer,Default Receivable Accounts,Standard Fordringer Kunde
 DocType: Tax Rule,Billing State,Billing State
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Hente eksploderte BOM (inkludert underenheter)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,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 +95,Due Date is mandatory,Due Date er obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Økning for Egenskap {0} kan ikke være 0
@@ -2733,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Foreløpig Profit / Loss (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Foreløpig Profit / Loss (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Tilbake Mot Salg Faktura
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Sak 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Vennligst angi standardverdien {0} i selskapet {1}
@@ -2764,6 +2771,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Legg Child
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolle lov til å sette Frosne Kontoer 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 kostnadssted til hovedbok som den har barnet noder
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,åpning Verdi
 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,Provisjon på salg
 DocType: Offer Letter Term,Value / Description,Verdi / beskrivelse
@@ -2797,7 +2805,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Slettet alle transaksjoner knyttet til dette selskapet!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Som på dato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Prøvetid
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lagervare.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Utbetaling av lønn for måneden {0} og år {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto innsats Prisliste rente hvis mangler
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Totalt innbetalt beløp
@@ -2833,7 +2840,7 @@
 DocType: Payment Tool,Set Matching Amounts,Sett matchende Beløp
 DocType: Purchase Invoice,Taxes and Charges Added,Skatter og avgifter legges
 ,Sales Funnel,Sales trakt
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Forkortelsen er obligatorisk
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Forkortelsen er obligatorisk
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Takk for din interesse i å abonnere på våre oppdateringer
 ,Qty to Transfer,Antall overføre
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Sitater for å Leads eller kunder.
@@ -2861,7 +2868,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} er stoppet
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Barcode {0} allerede brukt i Element {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Kommende arrangementer
@@ -2883,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Velg regnskapsår ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS Profile nødvendig å foreta POS Entry
 DocType: Hub Settings,Name Token,Navn Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Standard Selling
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -3006,7 +3013,7 @@
 DocType: Sales Invoice,Paid Amount,Innbetalt beløp
 ,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
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,Sette dette Adressemal som standard så er det ingen andre standard
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo allerede i debet, har du ikke lov til å sette &quot;Balance må være &#39;som&#39; Credit &#39;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Kvalitetsstyring
 DocType: Production Planning Tool,Filter based on customer,Filter basert på kundens
@@ -3107,7 +3114,7 @@
 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å &quot;Angi som standard &#39;"
 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 +19,Shortage Qty,Mangel Antall
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;To Date&#39; er påkrevd
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generere pakksedler for pakker som skal leveres. Brukes til å varsle pakke nummer, innholdet i pakken og vekten."
@@ -3118,7 +3125,7 @@
 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 &quot;Skrevet&quot;, en e-pop-up automatisk åpnet for å sende en e-post til den tilhørende &quot;Kontakt&quot; 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 +749,It is needed to fetch Item Details.,Det er nødvendig å hente Element detaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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
@@ -3144,6 +3151,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: C-Form,Series,Series
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,Sak Klassifisering
@@ -3219,7 +3227,7 @@
 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 +434,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 +420,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."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kjøp Master manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Produksjonsordre {0} må sendes
@@ -3227,7 +3235,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Hoved Reports
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Til dags 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 +194,Add / Edit Prices,Legg til / Rediger priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Mine bestillinger
@@ -3275,7 +3283,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Row # {0}: Sett Leverandør for elementet {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Website Bilde {0} festet til Element {1} kan ikke finnes
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Website Bilde {0} festet til Element {1} kan ikke finnes
 DocType: Issue,Content Type,Innholdstype
 apps/erpnext/erpnext/setup/setup_wizard/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.
@@ -3289,7 +3297,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,«Har Serial No &#39;kan ikke være&#39; Ja &#39;for ikke-lagervare
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,«Har Serial No &#39;kan ikke være&#39; Ja &#39;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
@@ -3315,7 +3323,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Lukke konto {0} må være av typen Ansvar / Egenkapital
 DocType: Authorization Rule,Based On,Basert På
 DocType: Sales Order Item,Ordered Qty,Bestilte Antall
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Element {0} er deaktivert
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Element {0} er deaktivert
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Opp
 apps/erpnext/erpnext/controllers/recurring_document.py +168,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.
@@ -3323,7 +3331,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Kjøper må sjekkes, hvis dette gjelder for er valgt som {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabatt må være mindre enn 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv Off Beløp (Selskap Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Row # {0}: Vennligst sett omgjøring kvantitet
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Row # {0}: Vennligst sett omgjøring kvantitet
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Vennligst sett {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Gjenta på dag i måneden
@@ -3395,7 +3403,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Vis nå
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Velg perioden når fakturaen blir generert automatisk
 DocType: BOM,Raw Material Cost,Raw Material Cost
-DocType: Item,Re-Order Level,Re-Order nivå
+DocType: Item Reorder,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.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Deltid
 DocType: Employee,Applicable Holiday List,Gjelder Holiday List
@@ -3450,7 +3458,7 @@
 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 +573,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3529,7 +3537,7 @@
 DocType: Address,Office,Kontor
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Regnskap posteringer.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tilgjengelig Antall på From Warehouse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Vennligst velg Employee Record først.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,Vennligst velg Employee Record først.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,Skriv inn Expense konto
@@ -3604,7 +3612,7 @@
 DocType: Item Attribute,Numeric Values,Numeriske verdier
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Fest Logo
 DocType: Customer,Commission Rate,Kommisjon
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Gjør Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Gjør Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Block permisjon applikasjoner ved avdelingen.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Handlevognen er tom
 DocType: Production Order,Actual Operating Cost,Faktiske driftskostnader
@@ -3621,15 +3629,14 @@
 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 +380,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 +419,"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 +408,"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 +380, (Half Day),(Halv Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Få Elementer fra BOM
diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv
index 9abf080..e43977e 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% rozliczonych
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),"Kurs wymiany muszą być takie same, jak {0} {1} ({2})"
 DocType: Sales Invoice,Customer Name,Nazwa klienta
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Rachunku bankowego nie może być uznany za {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Rachunku bankowego nie może być uznany za {0}
 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.","Wszystkie eksportowe powiązane pola jak waluty, kursy wymiany, łącznie eksportu, wywozu sumy całkowitej itp są dostępne w dokumencie dostawy, POS, Cenniku, fakturze Sprzedaży, zamówieniu sprzedaży itp"
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Zaległość za {0} nie może być mniejsza niż ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,
 apps/erpnext/erpnext/setup/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
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Zaloguj wykonywanych przez użytkowników z zadań, które mogą być wykorzystywane do śledzenia czasu, rozliczeń."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Nowy {0}: # {1}
 ,Sales Partners Commission,
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Skrót nie może posiadać więcej niż 5 znaków
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Skrót nie może posiadać więcej niż 5 znaków
 DocType: Payment Request,Payment Request,Żądanie zapłaty
 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.",Atrybut Wartość {0} nie może być usunięty z {1} jako element Warianty \ istnieje z tym atrybutem.
@@ -187,7 +187,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +39,From Date should be within the Fiscal Year. Assuming From Date = {0},"""Data od"" powinna być w tym roku podatkowym. Przyjmując Datę od = {0}"
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Centrum kosztów {0} nie należy do Firmy {1}
-DocType: Customer,Individual,
+DocType: Customer,Individual,Indywidualny
 apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,
 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.,
@@ -196,6 +196,7 @@
 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ń (%)
 DocType: Offer Letter,Select Terms and Conditions,Wybierz Regulamin
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,Spośród Wartość
 DocType: Production Planning Tool,Sales Orders,Zlecenia sprzedaży
 DocType: Purchase Taxes and Charges,Valuation,Wycena
 ,Purchase Order Trends,Trendy Zamówienia Kupna
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Telewizja
 DocType: Production Order Operation,Updated via 'Time Log',"Aktualizowana przez ""Czas Zaloguj"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konto {0} nie jest przypisane do Firmy {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Ilość wyprzedzeniem nie może być większa niż {0} {1}
 DocType: Naming Series,Series List for this Transaction,
 DocType: Sales Invoice,Is Opening Entry,
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Wspomnieć, jeśli nie standardowe konto należności dotyczy"
@@ -227,7 +229,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Tworzy Pasek Wypłaty dla wskazanych wyżej kryteriów.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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&gt; Ustawienia&gt; Seria Naming
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Magazyn {0} nie należy do firmy {1}
 DocType: Item Website Specification,Item Website Specification,
 DocType: Payment Tool,Reference No,Nr Odniesienia
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Urlop Zablokowany
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,Urlop Zablokowany
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Roczny
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Uzgodnienia Stanu Pozycja
 DocType: Stock Entry,Sales Invoice No,Nr faktury sprzedażowej
@@ -249,7 +251,7 @@
 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 +606,Item {0} is cancelled,
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Zamówienie produktu
 DocType: Bank Reconciliation,Update Clearance Date,
 DocType: Item,Purchase Details,Szczegóły zakupu
@@ -288,7 +290,7 @@
 DocType: Employee,External Work History,Historia Zewnętrzna Pracy
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Circular Error Referencje
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,
-DocType: Lead,Industry,
+DocType: Lead,Industry,Przedsiębiorstwo
 DocType: Employee,Job Profile,Profil Pracy
 DocType: Newsletter,Newsletter,Newsletter
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Informuj za pomocą Maila (automatyczne)
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Dowód dostawy
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Konfigurowanie podatki
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} dwa razy wprowadzone w podatku produktu
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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
@@ -329,7 +331,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,Proszę przejrzeć załącznik
 DocType: Purchase Order,% Received,% Otrzymanych
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,
 ,Finished Goods,Ukończone dobra
 DocType: Delivery Note,Instructions,Instrukcje
 DocType: Quality Inspection,Inspected By,Skontrolowane przez
@@ -354,14 +356,13 @@
 ,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 +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) musi mieć rolę 'Leave Approver'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{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/setup_wizard/install_fixtures.py +39,Medical,Medyczny
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Powód straty
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Stacja robocza jest zamknięta w następujących terminach wg listy wakacje: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Możliwości
 DocType: Employee,Single,Pojedynczy
-DocType: Issue,Attachment,Załącznik
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budżet nie może być ustawiony na centrum kosztów Grupy
 DocType: Account,Cost of Goods Sold,Wartość sprzedanych pozycji w cenie nabycia
 DocType: Purchase Invoice,Yearly,Rocznie
@@ -390,7 +391,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,Atrybut {0} wybrane atrybuty kilka razy w tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Atrybut {0} wybrane atrybuty kilka razy w tabeli
 DocType: HR Settings,Employee record is created using selected field. ,Rekord pracownika tworzony jest przy użyciu zaznaczonego pola.
 DocType: Sales Order,Not Applicable,Nie dotyczy
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,
@@ -398,14 +399,14 @@
 DocType: Delivery Note,Billing Address,Adres Faktury
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +737,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",
+DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Jeśli zaznaczone, kwota podatku zostanie wliczona w cenie Drukuj Cenę / Drukuj Podsumowanie"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Razem szt
-DocType: Employee,Health Concerns,
+DocType: Employee,Health Concerns,Problemy Zdrowotne
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Niezapłacone
 DocType: Packing Slip,From Package No.,Od Nr Przesyłki
 DocType: Item Attribute,To Range,Range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,
-DocType: Features Setup,Imports,
+DocType: Features Setup,Imports,Importy
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Wszystkich liście przeznaczone jest obowiązkowe
 DocType: Job Opening,Description of a Job Opening,Opis Ogłoszenia o Pracę
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Działania oczekujące na dziś
@@ -429,7 +430,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Kosmetyki
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items",
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items",
 DocType: Shipping Rule,Net Weight,Waga netto
 DocType: Employee,Emergency Phone,Telefon bezpieczeństwa
 ,Serial No Warranty Expiry,
@@ -440,7 +441,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Zarządzanie Podwykonawstwo
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konto {0} nie należy do firmy: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Konto {0} nie należy do firmy: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Skrót już używany przez inną firmę
 DocType: Selling Settings,Default Customer Group,Domyślna grupa klientów
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Jeśli wyłączone, pozycja 'Końcowa zaokrąglona suma' nie będzie widoczna w żadnej transakcji"
 DocType: BOM,Operating Cost,Koszty Operacyjne
@@ -475,6 +477,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Nie znaleziono w tabeli faktury rekordy
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Najpierw wybierz typ firmy, a Party"
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Rok finansowy / księgowy.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,skumulowane wartości
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",
 DocType: Project Task,Project Task,Zadanie projektu
 ,Lead Id,ID Tropu
@@ -496,7 +499,7 @@
 DocType: Quotation,Quotation To,Wycena dla
 DocType: Lead,Middle Income,Średni Dochód
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Otwarcie (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Domyślnie Jednostka miary dla pozycji {0} nie może być zmieniana bezpośrednio, ponieważ masz już jakąś transakcję (y) z innym UOM. Musisz utworzyć nowy obiekt, aby użyć innego domyślnego UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Domyślnie Jednostka miary dla pozycji {0} nie może być zmieniana bezpośrednio, ponieważ masz już jakąś transakcję (y) z innym UOM. Musisz utworzyć nowy obiekt, aby użyć innego domyślnego UOM."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Przydzielona kwota nie może być ujemna
 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.
@@ -574,7 +577,7 @@
 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 +543,Item has variants.,Pozycja ma warianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,
@@ -587,6 +590,7 @@
 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 +33,Goods received from Suppliers.,Produkty otrzymane od dostawców.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,w polu Wartość
 DocType: Lead,Campaign Name,Nazwa kampanii
 ,Reserved,Zarezerwowany
 DocType: Purchase Order,Supply Raw Materials,Zaopatrzenia w surowce
@@ -601,16 +605,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Konto z istniejącymi zapisami nie może być konwertowane
 DocType: Delivery Note,Customer's Purchase Order No,Numer Zamówienia Zakupu Klienta
 DocType: Employee,Cell Number,Numer komórki
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Wnioski Auto Materiał Generated
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Wnioski Auto Materiał Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Straty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,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/setup_wizard/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ń.
 DocType: Item Group,Website Specifications,Specyfikacja strony WWW
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Wystąpił błąd w szablonie Adres {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Nowe konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: od {0} typu {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Wiersz {0}: Współczynnik konwersji jest obowiązkowe
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Wiele Zasady cen istnieje w tych samych kryteriów, proszę rozwiązywania konfliktów poprzez przypisanie priorytetu. Cena Zasady: {0}"
 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.,Zapisy księgowe mogą być wykonane na kontach podrzędnych. Wpisy wobec grupy kont nie są dozwolone.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nie można wyłączyć lub anulować LM jak to jest połączone z innymi LM
 DocType: Opportunity,Maintenance,Konserwacja
@@ -672,7 +678,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,Cennik nie wybrany
 DocType: Employee,Family Background,Tło rodzinne
 DocType: Process Payroll,Send Email,
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Warning: Invalid Załącznik {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Warning: Invalid Załącznik {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Brak uprawnień
 DocType: Company,Default Bank Account,Domyślne konto bankowe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Aby filtrować na podstawie partii, wybierz Party Wpisz pierwsze"
@@ -702,13 +708,13 @@
 DocType: Production Planning Tool,Select Items,Wybierz Elementy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} przed rachunkiem {1} z dnia {2}
 DocType: Maintenance Visit,Completion Status,Status ukończenia
-DocType: Sales Invoice Item,Target Warehouse,
+DocType: Production Order,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 +50,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/setup_wizard/install_fixtures.py +17,All Item Groups,Wszystkie grupy produktów
 DocType: Process Payroll,Activity Log,Dziennik aktywności
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Zysk / strata netto
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Zysk / strata netto
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatyczna wiadomość o założeniu transakcji
 DocType: Production Order,Item To Manufacture,Rzecz do wyprodukowania
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Stan jest {2}
@@ -716,7 +722,7 @@
 DocType: Sales Order Item,Projected Qty,Prognozowana ilość
 DocType: Sales Invoice,Payment Due Date,Termin Płatności
 DocType: Newsletter,Newsletter Manager,Biuletyn Kierownik
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Pozycja Wersja {0} istnieje już z samymi atrybutami
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Pozycja Wersja {0} istnieje już z samymi atrybutami
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Otwarcie&quot;
 DocType: Notification Control,Delivery Note Message,Wiadomość z Dowodu Dostawy
 DocType: Expense Claim,Expenses,Wydatki
@@ -726,7 +732,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Badania i rozwój
 ,Amount to Bill,Kwota rachunku
 DocType: Company,Registration Details,Szczegóły Rejestracji
-DocType: Item,Re-Order Qty,Ilość w ponowieniu zamówienia
+DocType: Item Reorder,Re-Order Qty,Ilość w ponowieniu zamówienia
 DocType: Leave Block List Date,Leave Block List Date,
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},
 DocType: Pricing Rule,Price or Discount,Cena albo Zniżka
@@ -746,8 +752,8 @@
 DocType: Serial No,Incoming Rate,
 DocType: Packing Slip,Gross Weight,Waga brutto
 apps/erpnext/erpnext/public/js/setup_wizard.js +70,The name of your company for which you are setting up this system.,Nazwa firmy / organizacji dla której uruchamiasz niniejszy system.
-DocType: HR Settings,Include holidays in Total no. of Working Days,
-DocType: Job Applicant,Hold,
+DocType: HR Settings,Include holidays in Total no. of Working Days,Dolicz święta do całkowitej liczby dni pracujących
+DocType: Job Applicant,Hold,Trzymaj
 DocType: Employee,Date of Joining,Data Wstąpienia
 DocType: Naming Series,Update Series,Zaktualizuj Serię
 DocType: Supplier Quotation,Is Subcontracted,
@@ -769,7 +775,7 @@
 DocType: Bank Reconciliation,Total Amount,Wartość całkowita
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,
 DocType: Production Planning Tool,Production Orders,Zamówienia Produkcji
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Wartość bilansu
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Wartość bilansu
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista cena sprzedaży
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikowanie synchronizować elementy
 DocType: Bank Reconciliation,Account Currency,Waluta konta
@@ -778,7 +784,7 @@
 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 +538,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -855,7 +861,7 @@
 DocType: POS Profile,Cash/Bank Account,Konto Kasa / Bank
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Stół atrybut jest obowiązkowy
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Zniżka (rabat)
@@ -883,10 +889,10 @@
 DocType: Tax Rule,Shipping State,Stan Shipping
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Rzecz musi być dodane za ""elementy z zakupu wpływy"" przycisk"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Koszty Sprzedaży
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,
 DocType: GL Entry,Against,Wyklucza
 DocType: Item,Default Selling Cost Center,Domyśle Centrum Kosztów Sprzedaży
-DocType: Sales Partner,Implementation Partner,
+DocType: Sales Partner,Implementation Partner,Partner Wdrożeniowy
 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/stock.py +273,Making Stock Entries,Dokonywanie stockowe Wpisy
@@ -925,7 +931,7 @@
 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 +210,Production Order {0} must be cancelled before cancelling this Sales Order,
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Proszę ustawić &quot;Zastosuj dodatkowe zniżki na &#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Proszę ustawić &quot;Zastosuj dodatkowe zniżki na &#39;
 ,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.,
@@ -951,7 +957,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Niebieski
 DocType: Purchase Invoice,Is Return,Czy Wróć
 DocType: Price List Country,Price List Country,Cena Kraj
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,"Kolejne powiązania mogą być tworzone tylko w powiązaniach typu ""grupa"""
 apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,Proszę ustawić Email ID
 DocType: Item,UOMs,Jednostki miary
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},{0} prawidłowe numery seryjne dla Pozycji {1}
@@ -985,7 +991,7 @@
 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/hr.py +220,Setting up Employees,Konfigurowanie Pracownicy
-apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Siatka """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Badania
 DocType: Maintenance Visit Purpose,Work Done,Praca wykonana
@@ -993,9 +999,9 @@
 DocType: Contact,User ID,ID Użytkownika
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Podgląd księgi
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najwcześniejszy
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Reszta świata
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,Raport z weryfikacji budżetu
 DocType: Salary Slip,Gross Pay,Płaca brutto
@@ -1025,7 +1031,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged",Przepraszamy ale firmy nie mogą zostać połaczone
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged",Przepraszamy ale firmy nie mogą zostać połaczone
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Mały
 DocType: Employee,Employee Number,Numer pracownika
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Numer(y) sprawy w użytku. Proszę spróbować Numer Sprawy {0}
@@ -1044,7 +1050,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Rolnictwo
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Twoje Produkty lub Usługi
 DocType: Mode of Payment,Mode of Payment,Rodzaj płatności
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Strona Obraz powinien być plik publiczny lub adres witryny
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Strona Obraz powinien być plik publiczny lub adres witryny
 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
@@ -1087,7 +1093,7 @@
 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'","Razem {0} dla wszystkich elementów jest równa zero, może powinieneś zmienić &quot;Dystrybucja opłat na podstawie&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,
 DocType: BOM Operation,Workstation,Stacja robocza
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Sprzęt komputerowy
 DocType: Attendance,HR Manager,
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Wybierz firmę
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,
@@ -1116,6 +1122,7 @@
 DocType: Address,Utilities,
 DocType: Purchase Invoice Item,Accounting,Księgowość
 DocType: Features Setup,Features Setup,Ustawienia właściwości
+DocType: Item,Is Service Item,Jest usługą
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Okres aplikacja nie może być okres alokacji urlopu poza
 DocType: Activity Cost,Projects,Projekty
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Wybierz Rok Podatkowy
@@ -1146,17 +1153,17 @@
 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 +465,cannot be greater than 100,nie może być większa niż 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
 DocType: Pricing Rule,"Higher the number, higher the priority","Im wyższa liczba, wyższy priorytet"
 ,Purchase Invoice Trends,Trendy Faktur Zakupów
 DocType: Employee,Better Prospects,Lepsze Alternatywy
-DocType: Appraisal,Goals,
+DocType: Appraisal,Goals,Cele
 DocType: Warranty Claim,Warranty / AMC Status,Gwarancja / AMC Status
 ,Accounts Browser,Przeglądarka kont
-DocType: GL Entry,GL Entry,
+DocType: GL Entry,GL Entry,Wejście GL
 DocType: HR Settings,Employee Settings,Ustawienia pracownika
 ,Batch-Wise Balance History,
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,"Lista ""Do zrobienia"""
@@ -1188,7 +1195,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +593,Packing Slip,List przewozowy
 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!,
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import nie powiódł się!
 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/setup_wizard/install_fixtures.py +83,Analyst,Analityk
@@ -1198,7 +1205,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +411,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
 DocType: Opportunity,With Items,Z przedmiotami
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,W ilości
 DocType: Notification Control,Expense Claim Rejected,Zwrot wydatku odrzucony
 DocType: Sales 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."
@@ -1206,7 +1213,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Rząd
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Warianty artykuł
 DocType: Company,Services,Usługi
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Razem ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Razem ({0})
 DocType: Cost Center,Parent Cost Center,Nadrzędny dział kalkulacji kosztów
 DocType: Sales Invoice,Source,Źródło
 DocType: Leave Type,Is Leave Without Pay,Czy urlopu bezpłatnego
@@ -1279,17 +1286,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Wyślij ponownie płatności E-mail
 DocType: Dependent Task,Dependent Task,Zadanie zależne
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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ść
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Zobacz
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Zmiana netto stanu środków pieniężnych
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Zmiana netto stanu środków pieniężnych
 DocType: Salary Structure Deduction,Salary Structure Deduction,
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Płatność Zapytanie już istnieje {0}
 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 +182,Quantity must not be more than {0},Ilość nie może być większa niż {0}
@@ -1351,7 +1358,7 @@
 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: Packed 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
@@ -1360,7 +1367,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Wydatki marketingowe
 ,Item Shortage Report,
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Waga jest określona, \n Ustaw także ""Wagę jednostkową"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Waga jest określona, \n Ustaw także ""Wagę jednostkową"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Jednostka produktu.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',
@@ -1371,6 +1378,7 @@
 DocType: Employee,Date Of Retirement,Data przejścia na emeryturę
 DocType: Upload Attendance,Get Template,Pobierz szablon
 DocType: Address,Postal,Pocztowy
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,Konfiguracja ERPNext zakończona!
 DocType: Item,Weightage,
 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
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Proszę najpierw wybrać {0}.
@@ -1399,12 +1407,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Zbyt wiele kolumn. Wyeksportować raport i wydrukować go za pomocą arkusza kalkulacyjnego.
 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 +139,Main,Główny
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Główny
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Wariant
 DocType: Naming Series,Set prefix for numbering series on your transactions,
 DocType: Employee Attendance Tool,Employees HTML,Pracownicy HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,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/stock/doctype/item/item.py +361,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
@@ -1429,7 +1437,6 @@
 DocType: Sales Order,To Deliver and Bill,Do dostarczenia i Bill
 DocType: GL Entry,Credit Amount in Account Currency,Kwota kredytu w walucie rachunku
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Czas Logi do produkcji.
-DocType: Item,Apply Warehouse-wise Reorder Level,Zastosuj Warehouse-mądry Reorder Level
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} musi być złożony
 DocType: Authorization Control,Authorization Control,Kontrola Autoryzacji
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Wiersz # {0}: Odrzucone Magazyn jest obowiązkowe przed odrzucony poz {1}
@@ -1488,7 +1495,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,
 apps/erpnext/erpnext/public/js/setup_wizard.js +224,e.g. 5,
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +150,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Wiersz {0}: Przyznana kwota {1} musi być mniejsza lub równa pozostałej kwoty faktury {2}
-DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,
+DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"Słownie, będzie widoczne w fakturze sprzedaży, po zapisaniu"
 DocType: Item,Is Sales Item,Jest pozycją sprzedawalną
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Drzewo kategorii
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,
@@ -1528,6 +1535,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Wiersz # {0}: {1} operacja nie zostanie zakończona do {2} Ilość wyrobów gotowych w produkcji Zamówienie # {3}. Proszę zaktualizować stan pracy za pomocą Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,
 DocType: Issue,Resolution Details,
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,przydziały
 DocType: Quality Inspection Reading,Acceptance Criteria,Kryteria akceptacji
 DocType: Item Attribute,Attribute Name,Nazwa atrybutu
 DocType: Item Group,Show In Website,Pokaż na stronie internetowej
@@ -1578,7 +1586,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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
 DocType: Leave Block List Allow,Leave Block List Allow,
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Skrót nie może być pusty lub być spacją
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Skrót nie może być pusty lub być spacją
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grupa do Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Razem Rzeczywisty
@@ -1619,7 +1627,7 @@
 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 **.
 DocType: Opportunity,Customer / Lead Address,Adres Klienta / Tropu
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Ostrzeżenie: Nieprawidłowy certyfikat SSL na przywiązanie {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Ostrzeżenie: Nieprawidłowy certyfikat SSL na przywiązanie {0}
 DocType: Production Order Operation,Actual Operation Time,Rzeczywisty Czas pracy
 DocType: Authorization Rule,Applicable To (User),Stosowne dla (Użytkownik)
 DocType: Purchase Taxes and Charges,Deduct,Odlicz
@@ -1639,7 +1647,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +44,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/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Wiersz #
-DocType: Purchase Invoice,In Words (Company Currency),
+DocType: Purchase Invoice,In Words (Company Currency),Słownie
 DocType: Pricing Rule,Supplier,Dostawca
 DocType: C-Form,Quarter,Kwartał
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Pozostałe drobne wydatki
@@ -1669,7 +1677,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +300,New Cost Center,Nowe Centrum Kosztów
 DocType: Bin,Ordered Quantity,Zamówiona Ilość
 apps/erpnext/erpnext/public/js/setup_wizard.js +57,"e.g. ""Build tools for builders""","np. ""Buduj narzędzia dla budowniczych"""
-DocType: Quality Inspection,In Process,
+DocType: Quality Inspection,In Process,W trakcie
 DocType: Authorization Rule,Itemwise Discount,
 DocType: Purchase Order Item,Reference Document Type,Oznaczenie typu dokumentu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,{0} against Sales Order {1},{0} przed Zleceniem Sprzedaży {1}
@@ -1768,7 +1776,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Numer sprawy nie może wynosić 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,
 DocType: Item,Show a slideshow at the top of the page,
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,
+DocType: Item,"Allow in Sales Order of type ""Service""",Pozwól się zlecenia sprzedaży typu &quot;Serwis&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,
 DocType: Time Log,Projects Manager,Kierownik Projektów
 DocType: Serial No,Delivery Time,Czas dostawy
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,
@@ -1793,7 +1802,7 @@
 ,Financial Analytics,Analityka finansowa
 DocType: Quality Inspection,Verified By,Zweryfikowane przez
 DocType: Address,Subsidiary,
-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.","Nie można zmienić domyślnej waluty firmy, ponieważ istnieją przypisane do niej transakcje. Anuluj transakcje, aby zmienić domyślną walutę"
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nie można zmienić domyślnej waluty firmy, ponieważ istnieją przypisane do niej transakcje. Anuluj transakcje, aby zmienić domyślną walutę"
 DocType: Quality Inspection,Purchase Receipt No,Nr Potwierdzenia Zakupu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Pieniądze zaliczkowe
 DocType: Process Payroll,Create Salary Slip,Utwórz pasek wynagrodzenia
@@ -1841,7 +1850,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Surowce nie może być puste.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Nie można zaktualizować akcji, faktura zawiera upuść element wysyłki."
 DocType: Newsletter,Test,
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 &quot;Czy numer seryjny&quot;, &quot;Czy Batch Nie &#39;,&#39; Czy Pozycja Zdjęcie&quot; i &quot;Metoda wyceny&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Szybkie Księgowanie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,
@@ -1950,7 +1959,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Proszę dostawy Uwaga pierwsza
 DocType: Purchase Invoice,Currency and Price List,Waluta i cennik
 DocType: Opportunity,Customer / Lead Name,Nazwa Klienta / Tropu
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Produkcja
 DocType: Item,Allow Production Order,Pozwól Zamówienie Produkcji
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,
@@ -1960,7 +1969,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Typ Nadrzędności
 DocType: Salary Structure,Total Earning,
 DocType: Purchase Receipt,Time at which materials were received,
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,Moje adresy
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Moje adresy
 DocType: Stock Ledger Entry,Outgoing Rate,Wychodzące Cena
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,lub
@@ -1995,7 +2004,7 @@
 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),
+DocType: Packing Slip,Identification of the package for the delivery (for print),Nr identyfikujący paczkę do dostawy (do druku)
 DocType: Bin,Reserved Quantity,Zarezerwowana ilość
 DocType: Landed Cost Voucher,Purchase Receipt Items,Przedmioty Potwierdzenia Zakupu
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Dostosowywanie formularzy
@@ -2016,7 +2025,7 @@
 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.","Wycena Zasada jest nadpisanie cennik / określenie procentowego rabatu, w oparciu o pewne kryteria."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magazyn może być tylko zmieniony poprzez Wpis Asortymentu / Notę Dostawy / Potwierdzenie zakupu
 DocType: Employee Education,Class / Percentage,
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Kierownik Marketingu i Sprzedaży
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Podatek dochodowy
 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.","Jeśli wybrana reguła Wycena jest dla 'Cena' spowoduje zastąpienie cennik. Zasada jest cena Wycena ostateczna cena, więc dalsze zniżki powinny być stosowane. W związku z tym, w transakcjach takich jak zlecenia sprzedaży, zamówienia itp, będzie pobrana w polu ""stopa"", a nie polu ""Cennik stopa""."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,
@@ -2029,7 +2038,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,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 +95,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.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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
 DocType: Purchase Invoice,Taxes and Charges Deducted,
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Zagadnienia
@@ -2046,7 +2055,7 @@
 ,Sales Browser,
 DocType: Journal Entry,Total Credit,
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Ostrzeżenie: Inny {0} # {1} istnieje we wpisie asortymentu {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Lokalne
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Duży
@@ -2065,7 +2074,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Wszystkie transakcje sprzedaży mogą być oznaczone przed wieloma ** Osoby sprzedaży **, dzięki czemu można ustawić i monitorować cele."
 ,S.O. No.,
 DocType: Production Order Operation,Make Time Log,Dodać do czasu Zaloguj
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Proszę ustawić ilość zmienić kolejność
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},
 DocType: Price List,Applicable for Countries,Zastosowanie dla krajów
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Komputery
@@ -2107,9 +2115,9 @@
 DocType: Account,Accounts User,Konta Użytkownika
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date",
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Frekwencja pracownika {0} jest już zaznaczona
-DocType: Packing Slip,If more than one package of the same type (for print),
+DocType: Packing Slip,If more than one package of the same type (for print),Jeśli więcej niż jedna paczka tego samego typu (do druku)
 DocType: C-Form Invoice Detail,Net Total,Łączna wartość netto
-DocType: Bin,FCFS Rate,
+DocType: Bin,FCFS Rate,Pierwsza rata
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Fakturowanie (faktury sprzedaży)
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Zaległa Ilość
 DocType: Project Task,Working,Pracuje
@@ -2129,7 +2137,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Zaległy
 DocType: Account,Stock Received But Not Billed,"Przyjęte na stan, nie zapłacone (zobowiązanie)"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +83,Root Account must be a group,Konto root musi być grupą
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,
+DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Wynagrodzenia brutto + Kwota zaległości + Kwota inkaso - Razem Odliczenie
 DocType: Monthly Distribution,Distribution Name,Nazwa Dystrybucji
 DocType: Features Setup,Sales and Purchase,
 DocType: Supplier Quotation Item,Material Request No,
@@ -2152,7 +2160,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Pobierz odpowiednie pozycje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Zapis księgowy dla zapasów
 DocType: Sales Invoice,Sales Team1,
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,
 DocType: Sales Invoice,Customer Address,Adres klienta
 DocType: Payment Request,Recipient and Message,Odbiorca i Message
 DocType: Purchase Invoice,Apply Additional Discount On,Zastosuj dodatkowe zniżki na
@@ -2194,7 +2202,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Wskaźnik wyceny
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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
@@ -2208,7 +2216,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Imię lub E-mail jest obowiązkowe
-apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,
+apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Kontrola jakości przychodzących.
 DocType: Purchase Order Item,Returned Qty,Wrócił szt
 DocType: Employee,Exit,Wyjście
 apps/erpnext/erpnext/accounts/doctype/account/account.py +155,Root Type is mandatory,
@@ -2232,7 +2240,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Podanie adresu jest wymagane
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Podanie adresu jest wymagane
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Wpisz nazwę przeprowadzanej kampanii jeżeli źródło pytania jest kampanią
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Wybierz rok podatkowy
@@ -2250,12 +2258,13 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Wpis zduplikowany
 DocType: Serial No,Under Warranty,Pod Gwarancją
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +408,[Error],[Błąd]
-DocType: Sales Order,In Words will be visible once you save the Sales Order.,
+DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Słownie, będzie widoczne w Zamówieniu Sprzedaży, po zapisaniu"
 ,Employee Birthday,Data urodzenia pracownika
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Kapitał wysokiego ryzyka
 DocType: UOM,Must be Whole Number,Musi być liczbą całkowitą
 DocType: Leave Control Panel,New Leaves Allocated (In Days),
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Magazyn klienta (opcjonalnie)
 DocType: Pricing Rule,Discount Percentage,Procent zniżki
 DocType: Payment Reconciliation Invoice,Invoice Number,Numer faktury
 apps/erpnext/erpnext/hooks.py +55,Orders,Zamówienia
@@ -2365,7 +2374,7 @@
 DocType: Appraisal,Appraisal,Ocena
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data jest powtórzona
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Upoważniony sygnatariusz
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,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 +184,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
@@ -2534,7 +2543,7 @@
 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
 DocType: Sales Order Item,Supplier delivers to Customer,Dostawca dostarcza Klientowi
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Pokaż Podatek rozpad
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Pokaż Podatek rozpad
 apps/erpnext/erpnext/accounts/party.py +283,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',
@@ -2583,7 +2592,7 @@
 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 +384,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,
+apps/erpnext/erpnext/stock/doctype/item/item.py +378,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/doctype/company/company.js +22,Please re-type company name to confirm,"Proszę ponownie wpisz nazwę firmy, aby potwierdzić"
@@ -2610,9 +2619,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Stwardnienie Cena Zasada istnieje z samych kryteriów, proszę rozwiązać \
- konfliktu przez wyznaczenie priorytet. Cena Zasady: {0}"
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Linia lotnicza
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Wydanie Materiał
@@ -2624,7 +2630,7 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Proszę wprowadzić szczegóły dotyczące konserwacji
 DocType: Item,Is Fixed Asset Item,Jest stałą pozycją aktywów
 DocType: Stock Entry,Including items for sub assemblies,W tym elementów dla zespołów sub
-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",
+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","Jeśli masz duże, wielostronicowe pliki dokumentów do drukowania, ta funkcja może być używana do dzielenia stron,  tak by były na każdej stronie drukowane dane z wszystkich nagłówków i stopek"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Wszystkie obszary
 DocType: Purchase Invoice,Items,Produkty
 DocType: Fiscal Year,Year Name,Nazwa roku
@@ -2633,11 +2639,11 @@
 DocType: Product Bundle Item,Product Bundle Item,Pakiet produktów Artykuł
 DocType: Sales Partner,Sales Partner Name,
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksymalna kwota faktury
-DocType: Purchase Invoice Item,Image View,
+DocType: Purchase Invoice Item,Image View,Widok obrazka
 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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Domyślne jednostki miary dla wariantu &quot;{0}&quot; musi być taki sam, jak w szablonie &#39;{1}&#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Domyślne jednostki miary dla wariantu &quot;{0}&quot; musi być taki sam, jak w szablonie &#39;{1}&#39;"
 DocType: Shipping Rule,Calculate Based On,Obliczone na podstawie
 DocType: Delivery Note Item,From Warehouse,Od Warehouse
 DocType: Purchase Taxes and Charges,Valuation and Total,Wycena i kwota całkowita
@@ -2646,7 +2652,7 @@
 DocType: Account,Purchase User,Zakup użytkownika
 DocType: Notification Control,Customize the Notification,Dostosuj powiadomienie
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Przepływy środków pieniężnych z działalności
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Szablon domyślny Adresu nie może być usunięty
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Szablon domyślny Adresu nie może być usunięty
 DocType: Sales Invoice,Shipping Rule,Zasada dostawy
 DocType: Manufacturer,Limited to 12 characters,Ograniczona do 12 znaków
 DocType: Journal Entry,Print Heading,Nagłówek do druku
@@ -2740,7 +2746,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,Komercyjny
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Niesamowity Serwis
@@ -2759,7 +2765,7 @@
 DocType: Customer,Default Receivable Accounts,Domyślne konta należności
 DocType: Tax Rule,Billing State,Stan Billing
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),
 DocType: Authorization Rule,Applicable To (Employee),Stosowne dla (Pracownik)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,Due Date jest obowiązkowe
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Przyrost dla atrybutu {0} nie może być 0
@@ -2792,7 +2798,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,
 DocType: Holiday List,Weekly Off,
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","np. 2012, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Wstępny Zysk / Strata (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Wstępny Zysk / Strata (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Powrót Against faktury sprzedaży
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Pozycja 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Proszę ustawić domyślną wartość {0} w Spółce {1}
@@ -2818,11 +2824,12 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Podatki od sprzedaży i opłaty Szablon
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Odzież i akcesoria
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Numer zlecenia
-DocType: Item Group,HTML / Banner that will show on the top of product list.,
+DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, który pokaże się na górze listy produktów."
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Określ warunki do obliczenia kwoty wysyłki
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Dodaj Dziecko
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rola dozwolone ustawić zamrożonych kont i Edytuj Mrożone wpisy
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Nie można przekonwertować centrum kosztów do księgi głównej, jak to ma węzły potomne"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Wartość otwarcia
 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,Prowizja od sprzedaży
 DocType: Offer Letter Term,Value / Description,Wartość / Opis
@@ -2856,7 +2863,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Pomyślnie usunięte wszystkie transakcje związane z tą firmą!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,W sprawie daty
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Domyślny magazyn jest obowiązkowy dla przedmiotu z asortymentu.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Płatność pensji za miesiąć {0} i rok {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Cennik stopy wkładka auto, jeśli brakuje"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Kwota całkowita Płatny
@@ -2892,7 +2898,7 @@
 DocType: Payment Tool,Set Matching Amounts,Ustaw Dopasowane Kwoty
 DocType: Purchase Invoice,Taxes and Charges Added,
 ,Sales Funnel,
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Skrót jest obowiązkowy
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Skrót jest obowiązkowy
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Dziękujemy za zainteresowanie w subskrypcji naszych aktualizacjach
 ,Qty to Transfer,Ilość do transferu
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Wycena dla Tropów albo Klientów
@@ -2920,7 +2926,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,
 DocType: Quotation,In Words will be visible once you save the Quotation.,
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} jest zatrzymany
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Kod kreskowy {0} jest już używana dla przedmiotu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,nadchodzące wydarzenia
@@ -2929,10 +2935,10 @@
 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/public/js/setup_wizard.js +196,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,
+DocType: Email Digest,Income / Expense,Przychody / Wydatki
 DocType: Employee,Personal Email,Osobisty E-mail
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Całkowitej wariancji
-DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",
+DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Jeśli opcja jest włączona, system będzie zamieszczać wpisy księgowe dla inwentarza automatycznie."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Pośrednictwo
 DocType: Address,Postal Code,kod pocztowy
 DocType: Production Order Operation,"in Minutes
@@ -2943,7 +2949,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Wybierz rok finansowy ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,Profil POS wymagany do tworzenia wpisu z POS
 DocType: Hub Settings,Name Token,Nazwa jest już w użyciu
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Co najmniej jeden magazyn jest wymagany
 DocType: Serial No,Out of Warranty,Poza Gwarancją
 DocType: BOM Replace Tool,Replace,
@@ -2951,7 +2957,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +59,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: Journal Entry Account,If Income or Expense,
+DocType: Journal Entry Account,If Income or Expense,Jeśli przychód lub koszt
 DocType: Features Setup,Item Batch Nos,
 DocType: Stock Ledger Entry,Stock Value Difference,
 apps/erpnext/erpnext/config/learn.py +239,Human Resource,Zasoby Ludzkie
@@ -2989,14 +2995,14 @@
 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.","Cennik nie stosuje regułę w danej transakcji, wszystkie obowiązujące przepisy dotyczące cen powinny być wyłączone."
 DocType: Company,Domain,Domena
 ,Sales Order Trends,
-DocType: Employee,Held On,
+DocType: Employee,Held On,W dniach
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Pozycja Produkcja
 ,Employee Information,Informacja o pracowniku
 apps/erpnext/erpnext/public/js/setup_wizard.js +224,Rate (%),Stawka (%)
 DocType: Time Log,Additional Cost,Dodatkowy koszt
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,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"
-DocType: Quality Inspection,Incoming,
+DocType: Quality Inspection,Incoming,Przychodzące
 DocType: BOM,Materials Required (Exploded),
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Zmniejsz wypłatę za Bezpłatny Urlop
 apps/erpnext/erpnext/public/js/setup_wizard.js +186,"Add users to your organization, other than yourself","Dodaj użytkowników do swojej organizacji, innych niż siebie"
@@ -3066,7 +3072,7 @@
 DocType: Sales Invoice,Paid Amount,Zapłacona kwota
 ,Available Stock for Packing Items,Dostępne ilości dla materiałów opakunkowych
 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"
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stan konta już Debit, nie możesz ustawić ""waga musi być"" jako ""Kredyty"""
 apps/erpnext/erpnext/setup/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
@@ -3131,7 +3137,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +264,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.",
+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 sprawdziłeś, wszystkie BOM dla elementów podzespołów oraz surowców są brane pod uwagę. W przeciwnym razie wszystkie elementy Podzespół będą traktowane jako surowiec."
 DocType: Material Request,Material Issue,Wydanie materiałów
 DocType: Hub Settings,Seller Description,Sprzedawca Opis
 DocType: Employee Education,Qualification,Kwalifikacja
@@ -3149,7 +3155,7 @@
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Brakująca firma w magazynach {0}
 DocType: POS Profile,Terms and Conditions,Regulamin
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +45,To Date should be within the Fiscal Year. Assuming To Date = {0},Aby Data powinna być w tym roku podatkowym. Zakładając To Date = {0}
-DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",
+DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Tutaj wypełnij i przechowaj dane takie jak wzrost, waga, alergie, problemy medyczne itd"
 DocType: Leave Block List,Applies to Company,Dotyczy Firmy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Nie można anulować, ponieważ wskazane Wprowadzenie na magazyn {0} istnieje"
 DocType: Purchase Invoice,In Words,Słownie
@@ -3167,7 +3173,7 @@
 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 +19,Shortage Qty,Niedobór szt
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
 DocType: Salary Slip,Salary Slip,
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Do daty' jest wymaganym polem
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Utwórz paski na opakowania do dostawy. Używane do informacji o numerze opakowania, zawartości i wadze."
@@ -3178,7 +3184,7 @@
 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 +749,It is needed to fetch Item Details.,"Jest to niezbędne, aby pobrać szczegółowe dotyczące pozycji."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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,
@@ -3204,6 +3210,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: C-Form,Series,Seria
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,Pozycja Klasyfikacja
@@ -3290,7 +3297,7 @@
 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 +434,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 +420,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
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Główny Menadżer Zakupów
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,
@@ -3298,7 +3305,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Raporty główne
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,
 DocType: Purchase Receipt Item,Prevdoc DocType,
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Dodaj / Edytuj ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Moje Zamówienia
@@ -3308,7 +3315,7 @@
 DocType: BOM,Manufacturing,Produkcja
 ,Ordered Items To Be Delivered,Zamówione produkty do dostarczenia
 DocType: Account,Income,Przychody
-DocType: Industry Type,Industry Type,
+DocType: Industry Type,Industry Type,Typ Przedsiębiorstwa
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,Coś poszło nie tak!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +101,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 +241,Sales Invoice {0} has already been submitted,Faktura Sprzedaży {0} została już wprowadzona
@@ -3331,7 +3338,7 @@
 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 +273,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,
+DocType: Naming Series,Help HTML,Pomoc 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 +143,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.
@@ -3346,7 +3353,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Wiersz # {0}: Ustaw Dostawca dla pozycji {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Strona Obraz {0} dołączone do pozycji {1} nie można znaleźć
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Strona Obraz {0} dołączone do pozycji {1} nie można znaleźć
 DocType: Issue,Content Type,Typ zawartości
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,
@@ -3360,7 +3367,7 @@
 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 +357,'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 +351,'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,Usługa nie może być oznaczana na przyszłość
 DocType: Pricing Rule,Pricing Rule Help,Wycena Zasada Pomoc
 DocType: Purchase Taxes and Charges,Account Head,Konto główne
@@ -3386,7 +3393,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Zamknięcie konta {0} musi być typu odpowiedzialności / Equity
 DocType: Authorization Rule,Based On,Bazujący na
 DocType: Sales Order Item,Ordered Qty,Ilość Zamówiona
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Element {0} jest wyłączony
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Element {0} jest wyłączony
 DocType: Stock Settings,Stock Frozen Upto,
 apps/erpnext/erpnext/controllers/recurring_document.py +168,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
@@ -3394,7 +3401,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Zakup musi być sprawdzona, jeśli dotyczy wybrano jako {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Zniżka musi wynosić mniej niż 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Napisz Off Kwota (Spółka Waluta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Wiersz # {0}: Proszę ustawić ilość zmienić kolejność
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Wiersz # {0}: Proszę ustawić ilość zmienić kolejność
 DocType: Landed Cost Voucher,Landed Cost Voucher,Koszt kuponu
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Ustaw {0}
 DocType: Purchase Invoice,Repeat on Day of Month,
@@ -3467,7 +3474,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Zobacz teraz
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,
 DocType: BOM,Raw Material Cost,Koszt surowców
-DocType: Item,Re-Order Level,Próg ponowienia zamówienia
+DocType: Item Reorder,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.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Niepełnoetatowy
 DocType: Employee,Applicable Holiday List,Stosowna Lista Urlopów
@@ -3488,11 +3495,11 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Kwota zafakturowana
 DocType: Attendance,Attendance,Usługa
 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.",
+DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Jeśli nie jest zaznaczone, lista będzie musiała być dodana do każdego działu, w którym ma zostać zastosowany."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +510,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.,
+DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Słownie będzie widoczna w Zamówieniu po zapisaniu
 DocType: Period Closing Voucher,Period Closing Voucher,Zamknięcie roku
 apps/erpnext/erpnext/config/stock.py +120,Price List master.,Ustawienia Cennika.
 DocType: Task,Review Date,
@@ -3513,7 +3520,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Okres wypowiedzenia
 DocType: Bank Reconciliation Detail,Voucher ID,ID Bonu
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,
-DocType: Packing Slip,Gross Weight UOM,
+DocType: Packing Slip,Gross Weight UOM,Waga brutto Jednostka miary
 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/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Konto kredytowe
@@ -3522,7 +3529,7 @@
 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 +573,Please specify Attribute Value for attribute {0},Proszę podać wartość atrybutu dla atrybutu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3545,7 +3552,7 @@
 DocType: Maintenance Schedule Item,Half Yearly,Pół Roku
 DocType: Lead,Blog Subscriber,Subskrybent Bloga
 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: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Jeśli zaznaczone, Całkowita liczba Dni Roboczych obejmie święta, a to zmniejsza wartość Wynagrodzenie za dzień"
 DocType: Purchase Invoice,Total Advance,
 apps/erpnext/erpnext/config/hr.py +235,Processing Payroll,Tworzenie listy płac
 DocType: Opportunity Item,Basic Rate,Podstawowy wskaźnik
@@ -3601,7 +3608,7 @@
 DocType: Address,Office,Biuro
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Dziennik zapisów księgowych.
 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 +226,Please select Employee Record first.,Proszę wybrać pierwszego pracownika
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,Proszę wybrać pierwszego pracownika
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,Wprowadź konto Wydatków
@@ -3634,7 +3641,7 @@
 DocType: BOM,With Operations,Wraz z działaniami
 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,
-DocType: Warranty Claim,If different than customer address,
+DocType: Warranty Claim,If different than customer address,Jeśli jest inny niż adres klienta
 DocType: BOM Operation,BOM Operation,
 DocType: Purchase Taxes and Charges,On Previous Row Amount,
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Podaj płatności Kwota w conajmniej jednym rzędzie
@@ -3676,7 +3683,7 @@
 DocType: Item Attribute,Numeric Values,Wartości liczbowe
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Załącz Logo
 DocType: Customer,Commission Rate,Wartość prowizji
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Bądź Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Bądź Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Zablokuj wnioski urlopowe według departamentów
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Koszyk jest pusty
 DocType: Production Order,Actual Operating Cost,Rzeczywisty koszt operacyjny
@@ -3693,15 +3700,14 @@
 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 +380,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 +419,"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 +408,"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 +380, (Half Day),(Pół dnia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(Pół dnia)
 DocType: Supplier,Credit Days,
 DocType: Leave Type,Is Carry Forward,
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,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 b3cb163..714458f 100644
--- a/erpnext/translations/pt-BR.csv
+++ b/erpnext/translations/pt-BR.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,Faturado %
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Taxa de câmbio deve ser o mesmo que {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nome do cliente
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},A conta bancária não pode ser nomeado como {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},A conta bancária não pode ser nomeado como {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Excelente para {0} não pode ser inferior a zero ( {1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Aplicação deixar Nova
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Aplicação deixar Nova
 apps/erpnext/erpnext/setup/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
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log de atividades realizadas por usuários contra as tarefas que podem ser usados para controle de tempo, de faturamento."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Nova {0}: # {1}
 ,Sales Partners Commission,Vendas Partners Comissão
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Abreviatura não pode ter mais de 5 caracteres
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Abreviatura não pode ter mais de 5 caracteres
 DocType: Payment Request,Payment Request,Pedido de Pagamento
 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} não pode ser removido a partir de {1} como item Variantes \ existe com este atributo.
@@ -196,6 +196,7 @@
 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
 DocType: Offer Letter,Select Terms and Conditions,Selecione os Termos e Condições
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,Valor fora
 DocType: Production Planning Tool,Sales Orders,Pedidos de Vendas
 DocType: Purchase Taxes and Charges,Valuation,Avaliação
 ,Purchase Order Trends,Ordem de Compra Trends
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,televisão
 DocType: Production Order Operation,Updated via 'Time Log',Atualizado via 'Time Log'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},A Conta {0} não pertence à Empresa {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},montante do adiantamento não pode ser maior do que {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista de séries para esta transação
 DocType: Sales Invoice,Is Opening Entry,Está abrindo Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Mencione se não padronizado conta a receber aplicável
@@ -227,7 +229,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Cria folha de pagamento para os critérios mencionados acima.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Sem descrição dada
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Pedido de Compra.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/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&gt; Configurações&gt; Naming Series"
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Armazém {0} não pertence à empresa {1}
 DocType: Item Website Specification,Item Website Specification,Especificação do Site do Item
 DocType: Payment Tool,Reference No,Número de referência
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Licenças Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Licenças Bloqueadas
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,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
@@ -249,7 +251,7 @@
 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 +606,Item {0} is cancelled,Item {0} é cancelada
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Item {0} é cancelada
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Pedido de material
 DocType: Bank Reconciliation,Update Clearance Date,Atualizar Data Liquidação
 DocType: Item,Purchase Details,Detalhes da compra
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Guia de Remessa
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configurando Impostos
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} entrou duas vezes no Imposto do Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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
@@ -329,7 +331,7 @@
 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 +215,Please see attachment,"Por favor, veja o anexo"
 DocType: Purchase Order,% Received,Recebido %
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Instalação já está completa !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Instalação já está completa !
 ,Finished Goods,Produtos Acabados
 DocType: Delivery Note,Instructions,Instruções
 DocType: Quality Inspection,Inspected By,Inspecionado por
@@ -354,14 +356,13 @@
 ,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 +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter a função 'Aprovador de Licenças'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter a função 'Aprovador de Licenças'
 DocType: Purchase Receipt,Vehicle Date,Veículo Data
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medicamentos
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Motivo para perder
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},"Workstation é fechado nas seguintes datas, conforme lista do feriado: {0}"
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Oportunidades
 DocType: Employee,Single,Único
-DocType: Issue,Attachment,Anexos
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Orçamento não pode ser definido para o grupo de centro de custo
 DocType: Account,Cost of Goods Sold,Custo dos Produtos Vendidos
 DocType: Purchase Invoice,Yearly,Anual
@@ -390,7 +391,7 @@
 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 +564,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 +550,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
 DocType: HR Settings,Employee record is created using selected field. ,Registro de empregado é criado usando o campo selecionado.
 DocType: Sales Order,Not Applicable,Não Aplicável
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Mestre férias .
@@ -429,7 +430,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Cosméticos
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"To merge, following properties must be same for both items","Para mesclar , seguintes propriedades devem ser os mesmos para ambos os itens"
 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
@@ -440,7 +441,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Gerenciando Subcontratação
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},A Conta {0} não pertence à Empresa: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},A Conta {0} não pertence à Empresa: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Abreviatura já utilizado para outra empresa
 DocType: Selling Settings,Default Customer Group,Grupo de Clientes padrão
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Se desativar, &#39;Arredondado Total&#39; campo não será visível em qualquer transação"
 DocType: BOM,Operating Cost,Custo de Operação
@@ -473,6 +475,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Nenhum registro encontrado na tabela de fatura
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Por favor, selecione Companhia e Festa Tipo primeiro"
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Exercício / contabilidade.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Os valores acumulados
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Desculpe, os números de ordem não podem ser mescladas"
 DocType: Project Task,Project Task,Tarefa do Projeto
 ,Lead Id,Cliente em Potencial ID
@@ -494,7 +497,7 @@
 DocType: Quotation,Quotation To,Cotação para
 DocType: Lead,Middle Income,Rendimento Médio
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Abertura (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,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. Você precisará criar um novo item para usar um UOM padrão diferente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,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. Você precisará criar um novo item para usar um UOM padrão diferente.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Montante alocado não pode ser negativo
 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.
@@ -572,7 +575,7 @@
 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,Termos da Carta de Oferta
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item has variants.,Item tem variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -585,6 +588,7 @@
 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 +33,Goods received from Suppliers.,Mercadorias recebidas de fornecedores.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,Em valor
 DocType: Lead,Campaign Name,Nome da Campanha
 ,Reserved,reservado
 DocType: Purchase Order,Supply Raw Materials,Abastecimento de Matérias-Primas
@@ -599,16 +603,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Contas com transações existentes não pode ser convertidas em livro-razão
 DocType: Delivery Note,Customer's Purchase Order No,Ordem de Compra do Cliente Não
 DocType: Employee,Cell Number,Telefone Celular
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Pedidos de Materiais Auto Gerado
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Pedidos de Materiais Auto Gerado
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdido
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,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/setup_wizard/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.
 DocType: Item Group,Website Specifications,Especificações do site
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Há um erro no seu modelo de endereço {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Nova Conta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: A partir de {0} do tipo {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Fator de Conversão é obrigatório
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Várias regras de preços existe com os mesmos critérios, por favor, resolver o conflito através da atribuição de prioridade. Regras Preço: {0}"
 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.,Lançamentos contábeis podem ser feitas contra nós folha. Entradas contra grupos não são permitidos.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,Não é possível desativar ou cancelar BOM vez que está associada com outras BOMs
 DocType: Opportunity,Maintenance,Manutenção
@@ -670,7 +676,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,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/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Aviso: Anexo inválido {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Aviso: Anexo inválido {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nenhuma permissão
 DocType: Company,Default Bank Account,Conta Bancária Padrão
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Para filtrar baseado em Festa, selecione Partido Escreva primeiro"
@@ -700,13 +706,13 @@
 DocType: Production Planning Tool,Select Items,Selecione itens
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} contra duplicata {1} na data {2}
 DocType: Maintenance Visit,Completion Status,Estado de Conclusão
-DocType: Sales Invoice Item,Target Warehouse,Almoxarifado de destino
+DocType: Production Order,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 +50,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/setup_wizard/install_fixtures.py +17,All Item Groups,Todos os grupos de itens
 DocType: Process Payroll,Activity Log,Log de Atividade
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Lucro / Prejuízo Líquido
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Lucro / Prejuízo Líquido
 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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},O status {0} {1} é {2}
@@ -714,7 +720,7 @@
 DocType: Sales Order Item,Projected Qty,Qtde. Projetada
 DocType: Sales Invoice,Payment Due Date,Data de Vencimento
 DocType: Newsletter,Newsletter Manager,Boletim Gerente
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Variant item {0} já existe com mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,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','Abrindo'
 DocType: Notification Control,Delivery Note Message,Mensagem da Guia de Remessa
 DocType: Expense Claim,Expenses,Despesas
@@ -724,7 +730,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Pesquisa e Desenvolvimento
 ,Amount to Bill,Valor a ser Faturado
 DocType: Company,Registration Details,Detalhes de Registro
-DocType: Item,Re-Order Qty,Re-order Qtde
+DocType: Item Reorder,Re-Order Qty,Re-order Qtde
 DocType: Leave Block List Date,Leave Block List Date,Deixe Data Lista de Bloqueios
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programado para enviar para {0}
 DocType: Pricing Rule,Price or Discount,Preço ou desconto
@@ -767,7 +773,7 @@
 DocType: Bank Reconciliation,Total Amount,Valor Total
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publishing Internet
 DocType: Production Planning Tool,Production Orders,Ordens de Produção
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Valor Patrimonial
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Valor Patrimonial
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de Preço de Venda
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicar para sincronizar itens
 DocType: Bank Reconciliation,Account Currency,Moeda da Conta
@@ -776,7 +782,7 @@
 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 +538,Item Variants {0} updated,Variantes item {0} atualizado
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -853,7 +859,7 @@
 DocType: POS Profile,Cash/Bank Account,Conta do Caixa/Banco
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 para
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,A tabela de atributos é obrigatório
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,Attribute table is mandatory,A tabela de atributos é 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/public/js/pos/pos.html +28,Discount,Desconto
@@ -881,7 +887,7 @@
 DocType: Tax Rule,Shipping State,Estado Envio
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"O artigo deve ser adicionado usando ""Obter itens de recibos de compra 'botão"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Despesas com Vendas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Compra padrão
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Compra padrão
 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
@@ -923,7 +929,7 @@
 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 +210,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/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',"Por favor, defina &quot;Aplicar desconto adicional em &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',"Por favor, defina &quot;Aplicar desconto adicional em &#39;"
 ,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.
@@ -991,9 +997,9 @@
 DocType: Contact,User ID,ID de Usuário
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Ver Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Mais antigas
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Fabricação contra a Ordem de Venda
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Resto do mundo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1023,7 +1029,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Desculpe , as empresas não podem ser mescladas"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Desculpe , as empresas não podem ser mescladas"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Pequeno
 DocType: Employee,Employee Number,Número do Funcionário
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Processo n º (s) já está em uso . Tente de Processo n {0}
@@ -1042,7 +1048,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Seus produtos ou serviços
 DocType: Mode of Payment,Mode of Payment,Forma de Pagamento
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Site de imagem deve ser um arquivo público ou URL do site
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Site de imagem deve ser um arquivo público ou URL do site
 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
@@ -1114,6 +1120,7 @@
 DocType: Address,Utilities,Serviços Públicos
 DocType: Purchase Invoice Item,Accounting,Contabilidade
 DocType: Features Setup,Features Setup,Configuração de características
+DocType: Item,Is Service Item,É item de serviço
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Período de aplicação não pode ser período de atribuição de licença fora
 DocType: Activity Cost,Projects,Projetos
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Por favor seleccione o Ano Fiscal
@@ -1144,7 +1151,7 @@
 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 +465,cannot be greater than 100,não pode ser maior do que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Item {0} não é um item de estoque
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1204,7 +1211,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,governo
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,As variantes de item
 DocType: Company,Services,Serviços
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centro de Custo pai
 DocType: Sales Invoice,Source,Fonte
 DocType: Leave Type,Is Leave Without Pay,É Licença Não Remunerada
@@ -1277,17 +1284,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Pagamento reenviar Email
 DocType: Dependent Task,Dependent Task,Tarefa dependente
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Visão
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Mudança líquida em dinheiro
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Mudança líquida em dinheiro
 DocType: Salary Structure Deduction,Salary Structure Deduction,Dedução da Estrutura Salarial
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Pedido de Pagamento já existe {0}
 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 +182,Quantity must not be more than {0},Quantidade não deve ser mais do que {0}
@@ -1349,7 +1356,7 @@
 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: Packed 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
@@ -1358,7 +1365,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Empresa , Mês e Ano Fiscal é obrigatória"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Despesas de Marketing
 ,Item Shortage Report,Item de relatório Escassez
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Mencione ""Peso UOM"" too"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Mencione ""Peso UOM"" too"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Pedido de material usado para fazer essa entrada de material
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Unidade única de um item.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Tempo Log Batch {0} deve ser ' enviado '
@@ -1369,6 +1376,7 @@
 DocType: Employee,Date Of Retirement,Data da aposentadoria
 DocType: Upload Attendance,Get Template,Obter Modelo
 DocType: Address,Postal,Postal
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,Setup ERPNext Complete!
 DocType: Item,Weightage,Peso
 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"
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Por favor seleccione {0} primeiro.
@@ -1397,12 +1405,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Muitas colunas. Exportar o relatório e imprimi-lo usando um aplicativo de planilha.
 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 +139,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Definir prefixo para séries de numeração em suas transações
 DocType: Employee Attendance Tool,Employees HTML,funcionários HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,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 +367,Default BOM ({0}) must be active for this item or its template,LDM Padrão ({0}) precisa estar ativo para este item ou o seu modelo
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,LDM Padrão ({0}) precisa 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
@@ -1427,7 +1435,6 @@
 DocType: Sales Order,To Deliver and Bill,Para Entregar e Bill
 DocType: GL Entry,Credit Amount in Account Currency,Montante de crédito em conta de moeda
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Logs de horário para a fabricação.
-DocType: Item,Apply Warehouse-wise Reorder Level,Aplicar Warehouse-wise Reordenar Nível
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} deve ser apresentado
 DocType: Authorization Control,Authorization Control,Controle de autorização
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Rejeitado Warehouse é obrigatória contra rejeitado item {1}
@@ -1526,6 +1533,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,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} não for completado por {2} qty de produtos acabados na ordem de produção # {3}. Por favor, atualize o status da operação via Tempo Logs"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investimentos
 DocType: Issue,Resolution Details,Detalhes da Resolução
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alocações
 DocType: Quality Inspection Reading,Acceptance Criteria,Critérios de Aceitação
 DocType: Item Attribute,Attribute Name,Nome do atributo
 DocType: Item Group,Show In Website,Mostrar No Site
@@ -1576,7 +1584,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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,Total do Disconto adicional
 DocType: Leave Block List Allow,Leave Block List Allow,Deixe Lista de Bloqueios Permitir
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grupo de Não-Grupo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,esportes
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total real
@@ -1617,7 +1625,7 @@
 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**.
 DocType: Opportunity,Customer / Lead Address,Endereço do Cliente/Cliente em Potencial
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
 DocType: Production Order Operation,Actual Operation Time,Tempo Real da Operação
 DocType: Authorization Rule,Applicable To (User),Aplicável Para (Usuário)
 DocType: Purchase Taxes and Charges,Deduct,Deduzir
@@ -1766,7 +1774,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Caso n não pode 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,Se você tiver Equipe de Vendas e Parceiros de Venda (Parceiros de Canal) eles podem ser marcadas e manter suas contribuições na atividade de vendas
 DocType: Item,Show a slideshow at the top of the page,Mostrar uma apresentação de slides no topo da página
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Lojas
+DocType: Item,"Allow in Sales Order of type ""Service""",Permitir na Ordem de venda do tipo &quot;Serviço&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Lojas
 DocType: Time Log,Projects Manager,Gerente de Projetos
 DocType: Serial No,Delivery Time,Prazo de entrega
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Envelhecimento Baseado em
@@ -1791,7 +1800,7 @@
 ,Financial Analytics,Análise Financeira
 DocType: Quality Inspection,Verified By,Verificado Por
 DocType: Address,Subsidiary,Subsidiário
-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.","Não é possível alterar a moeda padrão da empresa, porque existem operações existentes. Transações devem ser canceladas para alterar a moeda padrão."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Não é possível alterar a moeda padrão da empresa, porque existem operações existentes. Transações devem ser canceladas para alterar a moeda padrão."
 DocType: Quality Inspection,Purchase Receipt No,Nº do Recibo de Compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Dinheiro Ganho
 DocType: Process Payroll,Create Salary Slip,Criar Folha de Pagamento
@@ -1839,7 +1848,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar estoque, fatura contém gota artigo do transporte."
 DocType: Newsletter,Test,Teste
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 &#39;não tem Serial&#39;, &#39;Tem Lote n&#39;, &#39;é Stock item &quot;e&quot; Método de avaliação&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Breve Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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
@@ -1948,7 +1957,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Por favor de entrega Nota primeiro
 DocType: Purchase Invoice,Currency and Price List,Moeda e Preço
 DocType: Opportunity,Customer / Lead Name,Nome do Cliente/Cliente em Potencial
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Apuramento data não mencionada
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Apuramento data não mencionada
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Produção
 DocType: Item,Allow Production Order,Permitir Ordem de Produção
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Data de início deve ser anterior a data de término
@@ -1958,7 +1967,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 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 +118,My Addresses,Os meus endereços
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Os meus endereços
 DocType: Stock Ledger Entry,Outgoing Rate,Taxa de saída
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Mestre Organização ramo .
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,ou
@@ -2027,7 +2036,7 @@
 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 +302,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 +95,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."
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impostos e Encargos Deduzidos
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Issues
@@ -2044,7 +2053,7 @@
 ,Sales Browser,Navegador de Vendas
 DocType: Journal Entry,Total Credit,Crédito Total
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,local
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Grande
@@ -2063,7 +2072,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Todas as transações de vendas pode ser marcado contra várias pessoas das vendas ** ** para que você pode definir e monitorar as metas.
 ,S.O. No.,Número de S.O.
 DocType: Production Order Operation,Make Time Log,Make Time Log
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,"Por favor, defina a quantidade de reabastecimento"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},"Por favor, crie um Cliente apartir do Cliente em Potencial {0}"
 DocType: Price List,Applicable for Countries,Aplicável para os Países
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computadores
@@ -2150,7 +2158,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Obter entradas relevantes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Lançamento Contábil de Estoque
 DocType: Sales Invoice,Sales Team1,Equipe de Vendas 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Item {0} não existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Item {0} não existe
 DocType: Sales Invoice,Customer Address,Endereço do Cliente
 DocType: Payment Request,Recipient and Message,Destinatário ea mensagem
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar desconto adicional em
@@ -2192,7 +2200,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Taxa de Avaliação
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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
@@ -2230,7 +2238,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Por favor, indique data alívio ."
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Só Deixar Aplicações com status ""Aprovado"" podem ser submetidos"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Titulo do Endereço é obrigatório.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Titulo do Endereço é obrigatório.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Digite o nome da campanha se o motivo da consulta foi uma campanha.
 apps/erpnext/erpnext/setup/setup_wizard/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
@@ -2254,6 +2262,7 @@
 DocType: UOM,Must be Whole Number,Deve ser Número inteiro
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Novas Licenças alocadas (em dias)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial Não {0} não existe
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Armazém Cliente (Opcional)
 DocType: Pricing Rule,Discount Percentage,Percentagem de Desconto
 DocType: Payment Reconciliation Invoice,Invoice Number,Número da Fatura
 apps/erpnext/erpnext/hooks.py +55,Orders,Encomendas
@@ -2363,7 +2372,7 @@
 DocType: Appraisal,Appraisal,Avaliação
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data é repetida
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Signatário autorizado
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},Deixe aprovador deve ser um dos {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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
@@ -2532,7 +2541,7 @@
 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
 DocType: Sales Order Item,Supplier delivers to Customer,Fornecedor entrega ao Cliente
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Mostrar imposto break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Mostrar imposto break-up
 apps/erpnext/erpnext/accounts/party.py +283,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 '
@@ -2582,7 +2591,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,"Por favor, re-tipo o nome da empresa para confirmar"
@@ -2609,9 +2618,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Estrutura Salarial
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Multiple regra de preço existe com os mesmos critérios, por favor resolver \
- conflito, atribuindo prioridade. Regras Preço: {0}"
 DocType: Account,Bank,Banco
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Companhia Aérea
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Material Issue
@@ -2636,7 +2642,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valores Mobiliários e Bolsas de Mercadorias
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidade de medida padrão para a variante &#39;{0}&#39; deve ser o mesmo que no modelo &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidade de medida padrão para a variante &#39;{0}&#39; deve ser o mesmo que no modelo &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcule Baseado em
 DocType: Delivery Note Item,From Warehouse,Do Armazém
 DocType: Purchase Taxes and Charges,Valuation and Total,Valorização e Total
@@ -2645,7 +2651,7 @@
 DocType: Account,Purchase User,Compra de Usuário
 DocType: Notification Control,Customize the Notification,Personalize a Notificação
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Fluxo de Caixa das Operações
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Template endereço padrão não pode ser excluído
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Template endereço padrão não pode ser excluído
 DocType: Sales Invoice,Shipping Rule,Regra de envio
 DocType: Manufacturer,Limited to 12 characters,Limitados a 12 caracteres
 DocType: Journal Entry,Print Heading,Cabeçalho de impressão
@@ -2739,7 +2745,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Principais Serviços
@@ -2758,7 +2764,7 @@
 DocType: Customer,Default Receivable Accounts,Padrão Contas a Receber
 DocType: Tax Rule,Billing State,Estado de faturamento
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Transferir
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Fetch BOM explodiu (incluindo sub-conjuntos )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,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 +95,Due Date is mandatory,Due Date é obrigatória
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Atributo incremento para {0} não pode ser 0
@@ -2791,7 +2797,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Lucro Provisória / Loss (Crédito)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Lucro Provisória / Loss (Crédito)
 DocType: Sales Invoice,Return Against Sales Invoice,Retorno Contra Vendas Fatura
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,O item 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},"Por favor, defina o valor padrão {0} in Company {1}"
@@ -2822,6 +2828,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Adicionar sub-item
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Papel permissão para definir as contas congeladas e editar entradas congeladas
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Não é possível converter Centro de Custo de contabilidade , uma vez que tem nós filhos"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Valor de abertura
 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,Comissão sobre Vendas
 DocType: Offer Letter Term,Value / Description,Valor / Descrição
@@ -2855,7 +2862,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Excluído com sucesso todas as transacções relacionadas com esta empresa!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Como em Data
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,provação
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Armazém padrão é obrigatório para estoque Item.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,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,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
@@ -2891,7 +2897,7 @@
 DocType: Payment Tool,Set Matching Amounts,Definir os montantes a condizer
 DocType: Purchase Invoice,Taxes and Charges Added,Impostos e Encargos Adicionados
 ,Sales Funnel,Funil de Vendas
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Abreviatura é obrigatória
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Abreviatura é obrigatória
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Obrigado por seu interesse na subscrição de nossas atualizações
 ,Qty to Transfer,Qtde transferir
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotações para Clientes em Potencial ou Clientes.
@@ -2919,7 +2925,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} está parado
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Código de barras {0} já utilizado em item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Próximos Eventos
@@ -2942,7 +2948,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Selecione o ano fiscal ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS perfil necessário para fazer POS Entry
 DocType: Hub Settings,Name Token,Nome do token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,venda padrão
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,venda padrão
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -3065,7 +3071,7 @@
 DocType: Sales Invoice,Paid Amount,Valor pago
 ,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"
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","O saldo já está em débito, você não tem permissão para definir 'saldo deve ser' como 'crédito'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestão da Qualidade
 DocType: Production Planning Tool,Filter based on customer,Filtrar baseado em cliente
@@ -3166,7 +3172,7 @@
 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 de emails para suporte. ( por exemplo pos-vendas@examplo.com.br )
 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 +578,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Data Final' é necessária
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Gerar deslizamentos de embalagem para os pacotes a serem entregues. Usado para notificar número do pacote, o conteúdo do pacote e seu peso."
@@ -3177,7 +3183,7 @@
 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 &quot;Enviadas&quot;, um pop-up abre automaticamente para enviar um e-mail para o &quot;Contato&quot; 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 +749,It is needed to fetch Item Details.,É preciso buscar Número detalhes.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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
@@ -3203,6 +3209,7 @@
 DocType: BOM,Manufacturing User,Usuários Fabricação
 DocType: Purchase Order,Raw Materials Supplied,Matérias-primas em actualização
 DocType: Purchase Invoice,Recurring Print Format,Recorrente Formato de Impressão
+DocType: C-Form,Series,série
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,Classificação do Item
@@ -3289,7 +3296,7 @@
 DocType: Workstation,Operating Costs,Custos Operacionais
 DocType: Employee Leave Approver,Employee Leave Approver,Licença do Funcionário Aprovada
 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 +434,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 +420,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."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Compra Mestre Gerente
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Ordem de produção {0} deve ser apresentado
@@ -3297,7 +3304,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Relatórios principais
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Até o momento não pode ser antes a partir da data
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Adicionar / Editar preços
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Meus pedidos
@@ -3345,7 +3352,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Row # {0}: Jogo Fornecedor para o item {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Site Imagem {0} anexada ao Item {1} não pode ser encontrado
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Site Imagem {0} anexada ao Item {1} não pode ser encontrado
 DocType: Issue,Content Type,Tipo de Conteúdo
 apps/erpnext/erpnext/setup/setup_wizard/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.
@@ -3359,7 +3366,7 @@
 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 +357,'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 +351,'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
@@ -3385,7 +3392,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Fechando Conta {0} deve ser do tipo de responsabilidade / Patrimônio Líquido
 DocType: Authorization Rule,Based On,Baseado em
 DocType: Sales Order Item,Ordered Qty,ordenada Qtde
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Item {0} está desativada
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Item {0} está desativada
 DocType: Stock Settings,Stock Frozen Upto,Estoque congelado até
 apps/erpnext/erpnext/controllers/recurring_document.py +168,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.
@@ -3393,7 +3400,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Compra deve ser verificada, se for caso disso nos items selecionados como {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Desconto deve ser inferior a 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Escrever Off Montante (Companhia de moeda)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,"Row # {0}: Por favor, defina a quantidade de reabastecimento"
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,"Row # {0}: Por favor, defina a quantidade de reabastecimento"
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Comprovante Custo
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Defina {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Repita no Dia do Mês
@@ -3466,7 +3473,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Agora
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Selecione o período em que a fatura será gerada automaticamente
 DocType: BOM,Raw Material Cost,Custo de Matéria-Prima
-DocType: Item,Re-Order Level,Re-order Nível
+DocType: Item Reorder,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.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,De meio expediente
 DocType: Employee,Applicable Holiday List,Lista de Férias Aplicável
@@ -3521,7 +3528,7 @@
 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 +573,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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 de Encerramento Real (via Registros de Tempo)
 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}
@@ -3600,7 +3607,7 @@
 DocType: Address,Office,Escritório
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Lançamentos no livro Diário.
 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 +226,Please select Employee Record first.,"Por favor, selecione Employee primeiro registro."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,"Por favor, selecione Employee primeiro registro."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,Por favor insira Conta Despesa
@@ -3675,7 +3682,7 @@
 DocType: Item Attribute,Numeric Values,Os valores numéricos
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Anexar Logo
 DocType: Customer,Commission Rate,Taxa de Comissão
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Faça Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Faça Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Bloquear licenças por departamento.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,O carrinho está vazio
 DocType: Production Order,Actual Operating Cost,Custo Operacional Real
@@ -3692,15 +3699,14 @@
 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 +380,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 +419,"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 +408,"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 +380, (Half Day),(Meio Dia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Obter itens de BOM
diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index 1a7671e..490f767 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,Anunciado%
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Taxa de câmbio deve ser o mesmo que {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nome do cliente
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},A conta bancária não pode ser nomeado como {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},A conta bancária não pode ser nomeado como {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Excelente para {0} não pode ser inferior a zero ( {1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Aplicação deixar Nova
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Aplicação deixar Nova
 apps/erpnext/erpnext/setup/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
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log de atividades realizadas por usuários contra as tarefas que podem ser usados para controle de tempo, de faturamento."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Nova {0}: # {1}
 ,Sales Partners Commission,Vendas Partners Comissão
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Abreviatura não pode ter mais de 5 caracteres
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Abreviatura não pode ter mais de 5 caracteres
 DocType: Payment Request,Payment Request,Pedido de Pagamento
 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} não pode ser removido a partir de {1} como item Variantes \ existe com este atributo.
@@ -196,6 +196,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,Selecione os Termos e Condições
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,Valor fora
 DocType: Production Planning Tool,Sales Orders,Pedidos de Vendas
 DocType: Purchase Taxes and Charges,Valuation,Avaliação
 ,Purchase Order Trends,Ordem de Compra Trends
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,televisão
 DocType: Production Order Operation,Updated via 'Time Log',Atualizado via 'Time Log'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Conta {0} não pertence à empresa {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},montante do adiantamento não pode ser maior do que {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista de séries para esta transação
 DocType: Sales Invoice,Is Opening Entry,Está abrindo Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Mencione se não padronizado conta a receber aplicável
@@ -227,7 +229,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Cria folha de salário para os critérios acima mencionados.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Sem descrição dada
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Pedido de compra.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/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&gt; Configurações&gt; Naming Series"
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Armazém {0} não pertence à empresa {1}
 DocType: Item Website Specification,Item Website Specification,Especificação Site item
 DocType: Payment Tool,Reference No,Número de referência
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Deixe Bloqueados
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Deixe Bloqueados
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,Annual,anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Da Reconciliação item
 DocType: Stock Entry,Sales Invoice No,Vendas factura n
@@ -249,7 +251,7 @@
 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 +606,Item {0} is cancelled,Item {0} é cancelada
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Item {0} é cancelada
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Pedido de material
 DocType: Bank Reconciliation,Update Clearance Date,Atualize Data Liquidação
 DocType: Item,Purchase Details,Detalhes de compra
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Guia de remessa
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configurando Impostos
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} entrou duas vezes no item Imposto
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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
@@ -329,7 +331,7 @@
 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 +215,Please see attachment,"Por favor, veja anexo"
 DocType: Purchase Order,% Received,% Recebido
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Setup al voltooid !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Setup al voltooid !
 ,Finished Goods,afgewerkte producten
 DocType: Delivery Note,Instructions,Instruções
 DocType: Quality Inspection,Inspected By,Inspecionado por
@@ -354,14 +356,13 @@
 ,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 +169,{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 +189,{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/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
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},"Workstation é fechado nas seguintes datas, conforme lista do feriado: {0}"
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Oportunidades
 DocType: Employee,Single,Único
-DocType: Issue,Attachment,Acessório
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Orçamento não pode ser definido para o grupo de centro de custo
 DocType: Account,Cost of Goods Sold,Custo dos Produtos Vendidos
 DocType: Purchase Invoice,Yearly,Anual
@@ -390,7 +391,7 @@
 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 +564,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 +550,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
 DocType: HR Settings,Employee record is created using selected field. ,Registro de empregado é criado usando o campo selecionado.
 DocType: Sales Order,Not Applicable,Não Aplicável
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Férias Principais.
@@ -429,7 +430,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Cosméticos
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"To merge, following properties must be same for both items","Te fuseren , moeten volgende eigenschappen hetzelfde zijn voor beide posten"
 DocType: Shipping Rule,Net Weight,Peso Líquido
 DocType: Employee,Emergency Phone,Emergency Phone
 ,Serial No Warranty Expiry,Caducidade Não Serial Garantia
@@ -440,7 +441,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Gerenciando Subcontratação
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Conta {0} não pertence à empresa: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Conta {0} não pertence à empresa: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Abreviatura já utilizado para outra empresa
 DocType: Selling Settings,Default Customer Group,Grupo de Clientes padrão
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Se desativar, &#39;Arredondado Total &quot;campo não será visível em qualquer transação"
 DocType: BOM,Operating Cost,Custo de Operação
@@ -476,6 +478,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Nenhum registro encontrado na tabela de fatura
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Por favor, selecione Companhia e Festa Tipo primeiro"
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Exercício / contabilidade.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Os valores acumulados
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sorry , kan de serienummers niet worden samengevoegd"
 DocType: Project Task,Project Task,Projeto Tarefa
 ,Lead Id,lead Id
@@ -497,7 +500,7 @@
 DocType: Quotation,Quotation To,Orçamento Para
 DocType: Lead,Middle Income,Rendimento Médio
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Abertura (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,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. Você precisará criar um novo item para usar um UOM padrão diferente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,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. Você precisará criar um novo item para usar um UOM padrão diferente.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Montante atribuído não pode ser negativo
 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.
@@ -575,7 +578,7 @@
 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 +543,Item has variants.,Item tem variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -588,6 +591,7 @@
 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 +33,Goods received from Suppliers.,Mercadorias recebidas de fornecedores.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,Em valor
 DocType: Lead,Campaign Name,Nome da campanha
 ,Reserved,gereserveerd
 DocType: Purchase Order,Supply Raw Materials,Abastecimento de Matérias-Primas
@@ -602,16 +606,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Conta com a transação existente não pode ser convertido em livro
 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/stock/reorder_item.py +171,Auto Material Requests Generated,Pedidos de Materiais Auto Gerado
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Pedidos de Materiais Auto Gerado
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdido
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,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/setup_wizard/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.
 DocType: Item Group,Website Specifications,Especificações do site
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Há um erro no seu modelo de endereço {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Nova Conta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: A partir de {0} do tipo {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Fator de Conversão é obrigatório
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Várias regras de preços existe com os mesmos critérios, por favor, resolver o conflito através da atribuição de prioridade. Regras Preço: {0}"
 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.,Lançamentos contábeis podem ser feitas contra nós folha. Entradas contra grupos não são permitidos.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,Não é possível desativar ou cancelar BOM vez que está associada com outras BOMs
 DocType: Opportunity,Maintenance,Manutenção
@@ -673,7 +679,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,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/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Aviso: Anexo inválido {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Aviso: Anexo inválido {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nenhuma permissão
 DocType: Company,Default Bank Account,Conta Bancária Padrão
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Para filtrar baseado em Festa, selecione Partido Escreva primeiro"
@@ -703,13 +709,13 @@
 DocType: Production Planning Tool,Select Items,Selecione itens
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} contra conta {1} com a data de {2}
 DocType: Maintenance Visit,Completion Status,Status de conclusão
-DocType: Sales Invoice Item,Target Warehouse,Armazém alvo
+DocType: Production Order,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 +50,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/setup_wizard/install_fixtures.py +17,All Item Groups,Todos os grupos de itens
 DocType: Process Payroll,Activity Log,Registro de Atividade
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Lucro / Prejuízo Líquido
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Lucro / Prejuízo Líquido
 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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} estatuto é {2}
@@ -717,7 +723,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 +247,Item Variant {0} already exists with same attributes,Variant item {0} já existe com mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,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','Abertura'
 DocType: Notification Control,Delivery Note Message,Mensagem Nota de Entrega
 DocType: Expense Claim,Expenses,Despesas
@@ -727,7 +733,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Pesquisa e Desenvolvimento
 ,Amount to Bill,Neerkomen op Bill
 DocType: Company,Registration Details,Detalhes registro
-DocType: Item,Re-Order Qty,Re-order Qtde
+DocType: Item Reorder,Re-Order Qty,Re-order Qtde
 DocType: Leave Block List Date,Leave Block List Date,Deixe Data Lista de Bloqueios
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programado para enviar para {0}
 DocType: Pricing Rule,Price or Discount,Preço ou Desconto
@@ -770,7 +776,7 @@
 DocType: Bank Reconciliation,Total Amount,Valor Total
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publishing Internet
 DocType: Production Planning Tool,Production Orders,Ordens de Produção
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balance Waarde
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Balance Waarde
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de Preço de Venda
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicar para sincronizar itens
 DocType: Bank Reconciliation,Account Currency,Conta Moeda
@@ -779,7 +785,7 @@
 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 +538,Item Variants {0} updated,Variantes item {0} atualizado
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -856,7 +862,7 @@
 DocType: POS Profile,Cash/Bank Account,Caixa / Banco Conta
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Tabela de atributo é obrigatório
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Desconto
@@ -884,7 +890,7 @@
 DocType: Tax Rule,Shipping State,Estado Envio
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"O artigo deve ser adicionado usando ""Obter itens de recibos de compra 'botão"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Despesas com Vendas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Compra padrão
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Compra padrão
 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
@@ -926,7 +932,7 @@
 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 +210,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/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',"Por favor, defina &quot;Aplicar desconto adicional em &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',"Por favor, defina &quot;Aplicar desconto adicional em &#39;"
 ,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.
@@ -994,9 +1000,9 @@
 DocType: Contact,User ID,ID de utilizador
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Ver Diário
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Mais Cedo
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Fabricação contra a Ordem de Vendas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Resto do mundo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1026,7 +1032,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Pequeno
 DocType: Employee,Employee Number,Número de empregado
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Processo n º (s) já está em uso . Tente de Processo n {0}
@@ -1045,7 +1051,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Uw producten of diensten
 DocType: Mode of Payment,Mode of Payment,Modo de Pagamento
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Site de imagem deve ser um arquivo público ou URL do site
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Site de imagem deve ser um arquivo público ou URL do site
 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
@@ -1117,6 +1123,7 @@
 DocType: Address,Utilities,Utilitários
 DocType: Purchase Invoice Item,Accounting,Contabilidade
 DocType: Features Setup,Features Setup,Configuração características
+DocType: Item,Is Service Item,É item de serviço
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Período de aplicação não pode ser período de atribuição de licença fora
 DocType: Activity Cost,Projects,Projetos
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Por favor seleccione o Ano Fiscal
@@ -1147,7 +1154,7 @@
 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 +465,cannot be greater than 100,não pode ser maior do que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Item {0} não é um item de estoque
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1207,7 +1214,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Governo
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,As variantes de item
 DocType: Company,Services,Serviços
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centro de Custo pai
 DocType: Sales Invoice,Source,Fonte
 DocType: Leave Type,Is Leave Without Pay,É licença sem vencimento
@@ -1280,17 +1287,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Pagamento reenviar Email
 DocType: Dependent Task,Dependent Task,Tarefa dependente
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Vista
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Mudança líquida em dinheiro
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Mudança líquida em dinheiro
 DocType: Salary Structure Deduction,Salary Structure Deduction,Dedução Estrutura Salarial
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Pedido de Pagamento já existe {0}
 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 +182,Quantity must not be more than {0},Quantidade não deve ser mais do que {0}
@@ -1352,7 +1359,7 @@
 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: Packed 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
@@ -1361,7 +1368,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Bedrijf , maand en het fiscale jaar is verplicht"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Despesas de Marketing
 ,Item Shortage Report,Punt Tekort Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Mencione ""Peso UOM"" too"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Mencione ""Peso UOM"" too"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Pedido de material usado para fazer isto Stock Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Única unidade de um item.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Tempo Log Batch {0} deve ser ' enviado '
@@ -1372,6 +1379,7 @@
 DocType: Employee,Date Of Retirement,Data da aposentadoria
 DocType: Upload Attendance,Get Template,Obter modelo
 DocType: Address,Postal,Postal
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,Setup ERPNext Complete!
 DocType: Item,Weightage,Weightage
 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"
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Por favor seleccione {0} primeiro.
@@ -1400,12 +1408,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Muitas colunas. Exportar o relatório e imprimi-lo usando um aplicativo de planilha.
 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 +139,Main,principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,principal
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Definir prefixo para numeração de série em suas transações
 DocType: Employee Attendance Tool,Employees HTML,Funcionários HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,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 +367,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/stock/doctype/item/item.py +361,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
@@ -1430,7 +1438,6 @@
 DocType: Sales Order,To Deliver and Bill,Para Entregar e Bill
 DocType: GL Entry,Credit Amount in Account Currency,Montante de crédito em conta de moeda
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Logs de horário para a fabricação.
-DocType: Item,Apply Warehouse-wise Reorder Level,Aplicar Warehouse-wise Reordenar Nível
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} deve ser apresentado
 DocType: Authorization Control,Authorization Control,Controle de autorização
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Rejeitado Warehouse é obrigatória contra rejeitado item {1}
@@ -1529,6 +1536,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,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} não for completado por {2} qty de produtos acabados na ordem de produção # {3}. Por favor, atualize o status da operação via Tempo Logs"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investimentos
 DocType: Issue,Resolution Details,Detalhes de Resolução
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alocações
 DocType: Quality Inspection Reading,Acceptance Criteria,Critérios de Aceitação
 DocType: Item Attribute,Attribute Name,Nome do atributo
 DocType: Item Group,Show In Website,Mostrar No Site
@@ -1579,7 +1587,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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
 DocType: Leave Block List Allow,Leave Block List Allow,Deixe Lista de Bloqueios Permitir
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grupo de Não-Grupo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,esportes
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total real
@@ -1620,7 +1628,7 @@
 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 **.
 DocType: Opportunity,Customer / Lead Address,Klant / Lead Adres
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
 DocType: Production Order Operation,Actual Operation Time,Actual Tempo Operação
 DocType: Authorization Rule,Applicable To (User),Para aplicável (Utilizador)
 DocType: Purchase Taxes and Charges,Deduct,Subtrair
@@ -1769,7 +1777,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Zaak nr. mag geen 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,Se você tiver Equipe de Vendas e Parceiros de Venda (Parceiros de Canal) podem ser marcadas e manter sua contribuição na atividade de vendas
 DocType: Item,Show a slideshow at the top of the page,Ver uma apresentação de slides no topo da página
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Lojas
+DocType: Item,"Allow in Sales Order of type ""Service""",Permitir na Ordem de venda do tipo &quot;Serviço&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Lojas
 DocType: Time Log,Projects Manager,Gerente de Projetos
 DocType: Serial No,Delivery Time,Prazo de entrega
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Antiguidade Baseado em
@@ -1794,7 +1803,7 @@
 ,Financial Analytics,Análise Financeira
 DocType: Quality Inspection,Verified By,Verificado Por
 DocType: Address,Subsidiary,Subsidiário
-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.","Não é possível alterar a moeda padrão da empresa, porque existem operações existentes. Transações devem ser canceladas para alterar a moeda padrão."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Não é possível alterar a moeda padrão da empresa, porque existem operações existentes. Transações devem ser canceladas para alterar a moeda padrão."
 DocType: Quality Inspection,Purchase Receipt No,Compra recibo Não
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Dinheiro Earnest
 DocType: Process Payroll,Create Salary Slip,Criar folha de salário
@@ -1842,7 +1851,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar estoque, fatura contém gota artigo do transporte."
 DocType: Newsletter,Test,Teste
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 &#39;não tem Serial&#39;, &#39;Tem Lote n&#39;, &#39;é Stock item &quot;e&quot; Método de avaliação&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Breve Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,U kunt geen koers veranderen als BOM agianst een item genoemd
@@ -1951,7 +1960,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Por favor de entrega Nota primeiro
 DocType: Purchase Invoice,Currency and Price List,Moeda e Lista de Preços
 DocType: Opportunity,Customer / Lead Name,Cliente / Nome de chumbo
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Apuramento data não mencionada
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Apuramento data não mencionada
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,produção
 DocType: Item,Allow Production Order,Permitir Ordem de Produção
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Data de início deve ser anterior a data de término
@@ -1961,7 +1970,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
 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 +118,My Addresses,Os meus endereços
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Os meus endereços
 DocType: Stock Ledger Entry,Outgoing Rate,Taxa de saída
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Mestre Organização ramo .
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,ou
@@ -2030,7 +2039,7 @@
 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 +302,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 +95,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."
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impostos e Encargos Deduzidos
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Issues
@@ -2047,7 +2056,7 @@
 ,Sales Browser,Navegador Vendas
 DocType: Journal Entry,Total Credit,Crédito Total
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,local
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Grande
@@ -2066,7 +2075,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Todas as transações de vendas pode ser marcado contra várias pessoas das vendas ** ** para que você pode definir e monitorar as metas.
 ,S.O. No.,S.O. Nee.
 DocType: Production Order Operation,Make Time Log,Make Time Log
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,"Por favor, defina a quantidade de reabastecimento"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},"Por favor, crie Cliente de chumbo {0}"
 DocType: Price List,Applicable for Countries,Aplicável para os Países
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,informática
@@ -2153,7 +2161,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Obter entradas relevantes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Entrada de Contabilidade da
 DocType: Sales Invoice,Sales Team1,Vendas team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Item {0} não existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Item {0} não existe
 DocType: Sales Invoice,Customer Address,Endereço do cliente
 DocType: Payment Request,Recipient and Message,Destinatário ea mensagem
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar desconto adicional em
@@ -2195,7 +2203,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Taxa de valorização
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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
@@ -2233,7 +2241,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Por favor, indique data alívio ."
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Só Deixar Aplicações com status ""Aprovado"" podem ser submetidos"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,O título do Endereço é obrigatório.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,O título do Endereço é obrigatório.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Digite o nome da campanha se fonte de pesquisa é a campanha
 apps/erpnext/erpnext/setup/setup_wizard/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
@@ -2257,6 +2265,7 @@
 DocType: UOM,Must be Whole Number,Deve ser Número inteiro
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Folhas novas atribuído (em dias)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial Não {0} não existe
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Armazém Cliente (Opcional)
 DocType: Pricing Rule,Discount Percentage,Percentagem de Desconto
 DocType: Payment Reconciliation Invoice,Invoice Number,Número da fatura
 apps/erpnext/erpnext/hooks.py +55,Orders,Encomendas
@@ -2366,7 +2375,7 @@
 DocType: Appraisal,Appraisal,Avaliação
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data é repetido
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Signatário autorizado
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},Deixe aprovador deve ser um dos {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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
@@ -2535,7 +2544,7 @@
 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
 DocType: Sales Order Item,Supplier delivers to Customer,Fornecedor entrega ao Cliente
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Mostrar imposto break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Mostrar imposto break-up
 apps/erpnext/erpnext/accounts/party.py +283,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 '
@@ -2585,7 +2594,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,"Por favor, re-tipo o nome da empresa para confirmar"
@@ -2612,9 +2621,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Estrutura Salarial
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Multiple regra de preço existe com os mesmos critérios, por favor resolver \
- conflito, atribuindo prioridade. Regras Preço: {0}"
 DocType: Account,Bank,Banco
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Companhia aérea
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Material Issue
@@ -2639,7 +2645,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valores Mobiliários e Bolsas de Mercadorias
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidade de medida padrão para a variante &#39;{0}&#39; deve ser o mesmo que no modelo &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidade de medida padrão para a variante &#39;{0}&#39; deve ser o mesmo que no modelo &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcule Baseado em
 DocType: Delivery Note Item,From Warehouse,Do Armazém
 DocType: Purchase Taxes and Charges,Valuation and Total,Avaliação e Total
@@ -2648,7 +2654,7 @@
 DocType: Account,Purchase User,Compra de Usuário
 DocType: Notification Control,Customize the Notification,Personalize a Notificação
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Fluxo de Caixa das Operações
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Template endereço padrão não pode ser excluído
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Template endereço padrão não pode ser excluído
 DocType: Sales Invoice,Shipping Rule,Regra de envio
 DocType: Manufacturer,Limited to 12 characters,Limitados a 12 caracteres
 DocType: Journal Entry,Print Heading,Imprimir título
@@ -2742,7 +2748,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Serviços impressionante
@@ -2761,7 +2767,7 @@
 DocType: Customer,Default Receivable Accounts,Padrão Contas a Receber
 DocType: Tax Rule,Billing State,Estado de faturamento
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Transferir
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Fetch ontplofte BOM ( inclusief onderdelen )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,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 +95,Due Date is mandatory,Due Date é obrigatória
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Atributo incremento para {0} não pode ser 0
@@ -2794,7 +2800,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Lucro Provisória / Loss (Crédito)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Lucro Provisória / Loss (Crédito)
 DocType: Sales Invoice,Return Against Sales Invoice,Retorno Contra Vendas Fatura
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,O item 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},"Por favor, defina o valor padrão {0} in Company {1}"
@@ -2825,6 +2831,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Adicionar Descendente
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Papel permissão para definir as contas congeladas e editar entradas congeladas
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Não é possível converter Centro de Custo de contabilidade , uma vez que tem nós filhos"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Valor de abertura
 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,Comissão sobre Vendas
 DocType: Offer Letter Term,Value / Description,Valor / Descrição
@@ -2858,7 +2865,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Excluído com sucesso todas as transacções relacionadas com esta empresa!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Como em Data
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,provação
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Armazém padrão é obrigatório para estoque Item.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,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
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Montante total pago
@@ -2894,7 +2900,7 @@
 DocType: Payment Tool,Set Matching Amounts,Definir os montantes a condizer
 DocType: Purchase Invoice,Taxes and Charges Added,Impostos e Encargos Adicionado
 ,Sales Funnel,Sales Funnel
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Abreviatura é obrigatória
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Abreviatura é obrigatória
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Obrigado por seu interesse na subscrição de nossas atualizações
 ,Qty to Transfer,Aantal Transfer
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotações para Leads ou Clientes.
@@ -2922,7 +2928,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} está parado
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Barcode {0} já utilizado em item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,próximos eventos
@@ -2945,7 +2951,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Selecione o ano fiscal ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS perfil necessário para fazer POS Entry
 DocType: Hub Settings,Name Token,Nome do token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,venda padrão
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,venda padrão
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -3068,7 +3074,7 @@
 DocType: Sales Invoice,Paid Amount,Valor pago
 ,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"
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo já em débito, não tem permissão para definir 'saldo deve ser' como 'crédito'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestão da Qualidade
 DocType: Production Planning Tool,Filter based on customer,Filtrar baseado em cliente
@@ -3169,7 +3175,7 @@
 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 +19,Shortage Qty,Escassez Qtde
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' O campo Para Data ' é necessária
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Gerar deslizamentos de embalagem para os pacotes a serem entregues. Usado para notificar número do pacote, o conteúdo do pacote e seu peso."
@@ -3180,7 +3186,7 @@
 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 &quot;Enviado&quot;, um e-mail pop-up aberta automaticamente para enviar um e-mail para o associado &quot;Contato&quot;, 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 +749,It is needed to fetch Item Details.,É preciso buscar Número detalhes.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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
@@ -3206,6 +3212,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: C-Form,Series,serie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,Classificação do Item
@@ -3292,7 +3299,7 @@
 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 +434,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 +420,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."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Compra Mestre Gerente
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Ordem de produção {0} deve ser apresentado
@@ -3300,7 +3307,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Relatórios principais
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Tot op heden kan niet eerder worden vanaf datum
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Adicionar / Editar preços
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Meus pedidos
@@ -3348,7 +3355,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Row # {0}: Jogo Fornecedor para o item {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Site Imagem {0} anexada ao Item {1} não pode ser encontrado
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Site Imagem {0} anexada ao Item {1} não pode ser encontrado
 DocType: Issue,Content Type,Tipo de conteúdo
 apps/erpnext/erpnext/setup/setup_wizard/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.
@@ -3362,7 +3369,7 @@
 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 +357,'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 +351,'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
@@ -3388,7 +3395,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Fechando Conta {0} deve ser do tipo de responsabilidade / Patrimônio Líquido
 DocType: Authorization Rule,Based On,Baseado em
 DocType: Sales Order Item,Ordered Qty,bestelde Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Item {0} está desativada
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Item {0} está desativada
 DocType: Stock Settings,Stock Frozen Upto,Fotografia congelada Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +168,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.
@@ -3396,7 +3403,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Compra deve ser verificada, se for caso disso for selecionado como {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Desconto deve ser inferior a 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Escrever Off Montante (Companhia de moeda)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,"Row # {0}: Por favor, defina a quantidade de reabastecimento"
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,"Row # {0}: Por favor, defina a quantidade de reabastecimento"
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Comprovante Custo
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Defina {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Repita no Dia do Mês
@@ -3469,7 +3476,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Já
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Selecione o período em que a factura será gerado automaticamente
 DocType: BOM,Raw Material Cost,Custo de Matéria-Prima
-DocType: Item,Re-Order Level,Re-order Nível
+DocType: Item Reorder,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.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Lista de férias aplicável
@@ -3524,7 +3531,7 @@
 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 +573,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3603,7 +3610,7 @@
 DocType: Address,Office,Escritório
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Lançamentos contábeis em diários
 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 +226,Please select Employee Record first.,"Por favor, selecione Employee primeiro registro."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,"Por favor, selecione Employee primeiro registro."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,Por favor insira Conta Despesa
@@ -3678,7 +3685,7 @@
 DocType: Item Attribute,Numeric Values,Os valores numéricos
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,anexar Logo
 DocType: Customer,Commission Rate,Taxa de Comissão
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Faça Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Faça Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Bloquear deixar aplicações por departamento.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Carrinho está vazio
 DocType: Production Order,Actual Operating Cost,Custo operacional real
@@ -3695,15 +3702,14 @@
 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 +380,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 +419,"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 +408,"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 +380, (Half Day),(Meio Dia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Obter itens da Lista de Material
diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index 362e05c..6143a7b 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% Facurat
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Rata de schimb trebuie să fie aceeași ca și {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nume client
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Contul bancar nu poate fi numit ca {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Contul bancar nu poate fi numit ca {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Restante pentru {0} nu poate fi mai mică decât zero ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Noua cerere de concediu
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Noua cerere de concediu
 apps/erpnext/erpnext/setup/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
@@ -81,7 +81,7 @@
 DocType: Company,Phone No,Nu telefon
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log activităților efectuate de utilizatori, contra Sarcinile care pot fi utilizate pentru timpul de urmărire, facturare."
 ,Sales Partners Commission,Agent vânzări al Comisiei
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Prescurtarea nu poate contine mai mult de 5 caractere
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Prescurtarea nu poate contine mai mult de 5 caractere
 DocType: Payment Request,Payment Request,Cerere de plata
 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.",Caracteristica Valoarea {0} nu poate fi scos din {1} ca postul variante \ exista cu acest atribut.
@@ -195,6 +195,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,Selectați Termeni și condiții
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,Valoarea afară
 DocType: Production Planning Tool,Sales Orders,Comenzi de vânzări
 DocType: Purchase Taxes and Charges,Valuation,Evaluare
 ,Purchase Order Trends,Comandă de aprovizionare Tendințe
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televiziune
 DocType: Production Order Operation,Updated via 'Time Log',"Actualizat prin ""Ora Log"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Contul {0} nu aparține Companiei {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Suma avans nu poate fi mai mare decât {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista de serie pentru această tranzacție
 DocType: Sales Invoice,Is Opening Entry,Deschiderea este de intrare
 DocType: Customer Group,Mention if non-standard receivable account applicable,Menționa dacă non-standard de cont primit aplicabil
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Creare fluturas de salariu pentru criteriile mentionate mai sus.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Nici o descriere dat
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Cere pentru cumpărare.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/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&gt; Setări&gt; Seria Naming
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Depozit {0} nu aparține companiei {1}
 DocType: Item Website Specification,Item Website Specification,Specificație Site Articol
 DocType: Payment Tool,Reference No,De referință nr
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Concediu Blocat
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Concediu Blocat
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock reconciliere Articol
 DocType: Stock Entry,Sales Invoice No,Factură de vânzări Nu
@@ -248,7 +250,7 @@
 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 +606,Item {0} is cancelled,Articolul {0} este anulat
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Articolul {0} este anulat
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Cerere de material
 DocType: Bank Reconciliation,Update Clearance Date,Actualizare Clearance Data
 DocType: Item,Purchase Details,Detalii de cumpărare
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Nota de Livrare
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configurarea Impozite
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} a fost introdus de două ori în taxa articolului
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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
@@ -328,7 +330,7 @@
 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 +215,Please see attachment,Vă rugăm să consultați atașament
 DocType: Purchase Order,% Received,% Primit
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Setup deja complet!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Setup deja complet!
 ,Finished Goods,Produse Finite
 DocType: Delivery Note,Instructions,Instrucţiuni
 DocType: Quality Inspection,Inspected By,Inspectat de
@@ -353,14 +355,13 @@
 ,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 +169,{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 +189,{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/setup_wizard/install_fixtures.py +39,Medical,Medical
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Motiv pentru a pierde
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation este închis la următoarele date ca pe lista de vacanta: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Oportunitati
 DocType: Employee,Single,Celibatar
-DocType: Issue,Attachment,Atașament
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Buget nu poate fi setat pentru cost Center Group
 DocType: Account,Cost of Goods Sold,Cost Bunuri Vândute
 DocType: Purchase Invoice,Yearly,Anual
@@ -389,7 +390,7 @@
 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 +564,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 +550,Attribute {0} selected multiple times in Attributes Table,Atribut {0} selectat de mai multe ori în tabelul Atribute
 DocType: HR Settings,Employee record is created using selected field. ,Inregistrarea angajatului este realizata prin utilizarea campului selectat.
 DocType: Sales Order,Not Applicable,Nu se aplică
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Maestru de vacanta.
@@ -428,7 +429,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Cosmetică
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"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: Shipping Rule,Net Weight,Greutate netă
 DocType: Employee,Emergency Phone,Telefon de Urgență
 ,Serial No Warranty Expiry,Serial Nu Garantie pana
@@ -439,7 +440,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Gestionarea Subcontractarea
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Contul {0} nu apartine companiei: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Contul {0} nu apartine companiei: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Abreviere deja folosit pentru o altă companie
 DocType: Selling Settings,Default Customer Group,Group Client Implicit
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Dacă este dezactivat, câmpul 'Total Rotunjit' nu va fi vizibil in nici o tranzacție"
 DocType: BOM,Operating Cost,Costul de operare
@@ -472,6 +474,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Nu sunt găsite în tabelul de factură înregistrări
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vă rugăm să selectați Company și Partidul Tip primul
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,An financiar / contabil.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Valorile acumulate
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Ne pare rău, Serial nr nu se pot uni"
 DocType: Project Task,Project Task,Proiect Sarcina
 ,Lead Id,Id Conducere
@@ -493,7 +496,7 @@
 DocType: Quotation,Quotation To,Citat Pentru a
 DocType: Lead,Middle Income,Venituri medii
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Deschidere (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Unitatea de măsură implicită pentru postul {0} nu poate fi schimbat direct, deoarece aveti si voi deja unele tranzacții (i) cu un alt UOM. Veți avea nevoie pentru a crea un nou element pentru a utiliza un alt implicit UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Unitatea de măsură implicită pentru postul {0} nu poate fi schimbat direct, deoarece aveti si voi deja unele tranzacții (i) cu un alt UOM. Veți avea nevoie pentru a crea un nou element pentru a utiliza un alt implicit UOM."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Suma alocată nu poate fi negativă
 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.
@@ -571,7 +574,7 @@
 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 +543,Item has variants.,Element are variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -584,6 +587,7 @@
 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 +33,Goods received from Suppliers.,Bunuri primite de la furnizori.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,în valoare
 DocType: Lead,Campaign Name,Denumire campanie
 ,Reserved,Rezervat
 DocType: Purchase Order,Supply Raw Materials,Aprovizionarea cu materii prime
@@ -598,16 +602,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Un cont cu tranzacții existente nu poate fi transformat în registru contabil
 DocType: Delivery Note,Customer's Purchase Order No,Nr. Comanda de Aprovizionare Client
 DocType: Employee,Cell Number,Număr Celula
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Cereri materiale Auto Generat
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Cereri materiale Auto Generat
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Pierdut
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,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/setup_wizard/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.
 DocType: Item Group,Website Specifications,Site-ul Specificații
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Există o eroare în șablon Address {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Cont nou
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: de la {0} de tipul {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rând {0}: Factorul de conversie este obligatorie
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Reguli de preturi multiple există cu aceleași criterii, vă rugăm să rezolve conflictul prin atribuirea de prioritate. Reguli de preț: {0}"
 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.,Intrările contabile pot fi create comparativ nodurilor frunză. Intrările comparativ grupurilor nu sunt permise.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nu se poate deactiva sau anula FDM, deoarece este conectat cu alte FDM-uri"
 DocType: Opportunity,Maintenance,Mentenanţă
@@ -669,7 +675,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,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/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Atenție: Attachment invalid {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Atenție: Attachment invalid {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nici o permisiune
 DocType: Company,Default Bank Account,Cont Bancar Implicit
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Pentru a filtra pe baza Party, selectați Party Tip primul"
@@ -699,13 +705,13 @@
 DocType: Production Planning Tool,Select Items,Selectați Elemente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} comparativ cu factura {1} din data de {2}
 DocType: Maintenance Visit,Completion Status,Stare Finalizare
-DocType: Sales Invoice Item,Target Warehouse,Țintă Warehouse
+DocType: Production Order,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 +50,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/setup_wizard/install_fixtures.py +17,All Item Groups,Toate grupurile articolului
 DocType: Process Payroll,Activity Log,Jurnal Activitate
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Profit / pierdere net
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Profit / pierdere net
 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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} statusul este {2}
@@ -713,7 +719,7 @@
 DocType: Sales Order Item,Projected Qty,Proiectat Cantitate
 DocType: Sales Invoice,Payment Due Date,Data scadentă de plată
 DocType: Newsletter,Newsletter Manager,Newsletter Director
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Postul Varianta {0} există deja cu aceleași atribute
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Postul Varianta {0} există deja cu aceleași atribute
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Deschiderea&quot;
 DocType: Notification Control,Delivery Note Message,Nota de Livrare Mesaj
 DocType: Expense Claim,Expenses,Cheltuieli
@@ -723,7 +729,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Cercetare & Dezvoltare
 ,Amount to Bill,Sumă pentru facturare
 DocType: Company,Registration Details,Detalii de înregistrare
-DocType: Item,Re-Order Qty,Re-comanda Cantitate
+DocType: Item Reorder,Re-Order Qty,Re-comanda Cantitate
 DocType: Leave Block List Date,Leave Block List Date,Data Lista Concedii Blocate
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programat pentru a trimite la {0}
 DocType: Pricing Rule,Price or Discount,Preț sau Reducere
@@ -766,7 +772,7 @@
 DocType: Bank Reconciliation,Total Amount,Suma totală
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Editura Internet
 DocType: Production Planning Tool,Production Orders,Comenzi de producție
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Valoarea bilanţului
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Valoarea bilanţului
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de prețuri de vânzare
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publica pentru a sincroniza articole
 DocType: Bank Reconciliation,Account Currency,Moneda cont
@@ -775,7 +781,7 @@
 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 +538,Item Variants {0} updated,Postul variante {0} actualizat
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -852,7 +858,7 @@
 DocType: POS Profile,Cash/Bank Account,Numerar/Cont Bancar
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Tabelul atribut este obligatoriu
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Reducere
@@ -880,7 +886,7 @@
 DocType: Tax Rule,Shipping State,Stat de transport maritim
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Postul trebuie să fie adăugate folosind ""obține elemente din Cumpără Încasări"" buton"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Cheltuieli de vânzare
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Cumpararea Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Cumpararea Standard
 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
@@ -922,7 +928,7 @@
 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 +210,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/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Vă rugăm să setați &quot;Aplicați discount suplimentar pe&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Vă rugăm să setați &quot;Aplicați discount suplimentar pe&quot;
 ,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.
@@ -990,9 +996,9 @@
 DocType: Contact,User ID,ID-ul de utilizator
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Vezi Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Cel mai devreme
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Fabricarea de comandă de vânzări
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Restul lumii
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1022,7 +1028,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Ne pare rău, companiile nu se pot uni"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Ne pare rău, companiile nu se pot uni"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Mic
 DocType: Employee,Employee Number,Numar angajat
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Cazul nr. (s) este deja utilizat. Încercați din cazul nr. {s}
@@ -1041,7 +1047,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultură
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Produsele sau serviciile dvs.
 DocType: Mode of Payment,Mode of Payment,Mod de plata
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Site-ul Image ar trebui să fie un fișier public sau site-ul URL-ul
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Site-ul Image ar trebui să fie un fișier public sau site-ul URL-ul
 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
@@ -1113,6 +1119,7 @@
 DocType: Address,Utilities,Utilitați
 DocType: Purchase Invoice Item,Accounting,Contabilitate
 DocType: Features Setup,Features Setup,Caracteristici de setare
+DocType: Item,Is Service Item,Este Serviciul Articol
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Perioada de aplicare nu poate fi perioadă de alocare concediu în afara
 DocType: Activity Cost,Projects,Proiecte
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Vă rugăm să selectați Anul fiscal
@@ -1143,7 +1150,7 @@
 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 +465,cannot be greater than 100,nu poate fi mai mare de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Articolul{0} nu este un element de stoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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ă
@@ -1202,7 +1209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Guvern
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Variante Postul
 DocType: Company,Services,Servicii
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Părinte Cost Center
 DocType: Sales Invoice,Source,Sursă
 DocType: Leave Type,Is Leave Without Pay,Este concediu fără plată
@@ -1274,17 +1281,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Retrimite e-mail de plată
 DocType: Dependent Task,Dependent Task,Sarcina dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Vezi
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Schimbarea net în numerar
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Schimbarea net în numerar
 DocType: Salary Structure Deduction,Salary Structure Deduction,Structura Salariul Deducerea
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Cerere de plată există deja {0}
 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 +182,Quantity must not be more than {0},Cantitatea nu trebuie să fie mai mare de {0}
@@ -1346,7 +1353,7 @@
 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: Packed 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
@@ -1355,7 +1362,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Compania, Luna și Anul fiscal sunt obligatorii"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Cheltuieli de marketing
 ,Item Shortage Report,Raport Articole Lipsa
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Cerere de material utilizat pentru a face acest stoc de intrare
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Unitate unică a unui articol.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',"Ora Log Lot {0} trebuie să fie ""Înscris"""
@@ -1366,6 +1373,7 @@
 DocType: Employee,Date Of Retirement,Data Pensionare
 DocType: Upload Attendance,Get Template,Obține șablon
 DocType: Address,Postal,Poștal
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 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
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Vă rugăm să selectați {0} primul.
@@ -1394,12 +1402,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Prea multe coloane. Exporta raportul și imprima utilizând o aplicație de calcul tabelar.
 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 +139,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variantă
 DocType: Naming Series,Set prefix for numbering series on your transactions,Set prefix pentru seria de numerotare pe tranzacțiile dvs.
 DocType: Employee Attendance Tool,Employees HTML,Angajații HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,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 +367,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/stock/doctype/item/item.py +361,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
@@ -1424,7 +1432,6 @@
 DocType: Sales Order,To Deliver and Bill,Pentru a livra și Bill
 DocType: GL Entry,Credit Amount in Account Currency,Suma de credit în cont valutar
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Timp Busteni pentru productie.
-DocType: Item,Apply Warehouse-wise Reorder Level,Aplicați nivel de reorganizare tip depozit
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} trebuie să fie introdus
 DocType: Authorization Control,Authorization Control,Control de autorizare
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Respins Warehouse este obligatorie împotriva postul respins {1}
@@ -1521,6 +1528,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Rând # {0}: {1} Funcționare nu este finalizată pentru {2} cantitate de produse finite în Producție Comanda # {3}. Vă rugăm să actualizați starea de funcționare prin timp Busteni
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investiții
 DocType: Issue,Resolution Details,Rezoluția Detalii
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alocări
 DocType: Quality Inspection Reading,Acceptance Criteria,Criteriile de receptie
 DocType: Item Attribute,Attribute Name,Denumire atribut
 DocType: Item Group,Show In Website,Arata pe site-ul
@@ -1571,7 +1579,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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
 DocType: Leave Block List Allow,Leave Block List Allow,Permite Lista Concedii Blocate
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr nu poate fi gol sau spațiu
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr nu poate fi gol sau spațiu
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grup non-grup
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Raport real
@@ -1588,6 +1596,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Închiderea (deschidere + Totaluri)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Vă rugăm să specificați în valută companie
 DocType: Workstation,Wages per hour,Salarii pe oră
+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},echilibru stoc în Serie {0} va deveni negativ {1} pentru postul {2} la Depozitul {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Arată / Ascunde caracteristici cum ar fi de serie nr, POS etc"
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Ca urmare a solicitărilor de materiale au fost ridicate în mod automat în funcție de nivelul de re-comanda item
 apps/erpnext/erpnext/controllers/accounts_controller.py +252,Account {0} is invalid. Account Currency must be {1},Contul {0} nu este valid. Contul valutar trebuie să fie {1}
@@ -1611,7 +1620,7 @@
 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 **.
 DocType: Opportunity,Customer / Lead Address,Client / Adresa principala
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Atenție: certificat SSL invalid pe atașament {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Atenție: certificat SSL invalid pe atașament {0}
 DocType: Production Order Operation,Actual Operation Time,Timp efectiv de funcționare
 DocType: Authorization Rule,Applicable To (User),Aplicabil pentru (utilizator)
 DocType: Purchase Taxes and Charges,Deduct,Deduce
@@ -1760,7 +1769,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Cazul Nr. nu poate fi 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,"Dacă exista Echipa de Eanzari si Partenerii de Vanzari (Parteneri de Canal), acestea pot fi etichetate și isi pot menține contribuția in activitatea de vânzări"
 DocType: Item,Show a slideshow at the top of the page,Arata un slideshow din partea de sus a paginii
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Magazine
+DocType: Item,"Allow in Sales Order of type ""Service""",Permite în comandă de vânzări de tip &quot;Service&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Magazine
 DocType: Time Log,Projects Manager,Manager Proiecte
 DocType: Serial No,Delivery Time,Timp de Livrare
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Uzură bazată pe
@@ -1785,7 +1795,7 @@
 ,Financial Analytics,Analitica Financiara
 DocType: Quality Inspection,Verified By,Verificate de
 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.","Nu se poate schimba moneda implicita a companiei, deoarece există tranzacții in desfasurare. Tranzacțiile trebuie să fie anulate pentru a schimba moneda implicita."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nu se poate schimba moneda implicita a companiei, deoarece există tranzacții in desfasurare. Tranzacțiile trebuie să fie anulate pentru a schimba moneda implicita."
 DocType: Quality Inspection,Purchase Receipt No,Primirea de cumpărare Nu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Banii cei mai castigati
 DocType: Process Payroll,Create Salary Slip,Crea Fluturasul de Salariul
@@ -1833,7 +1843,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Materii prime nu poate fi gol.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Nu a putut fi actualizat stoc, factura conține drop de transport maritim."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 &quot;nu are nici o serie&quot;, &quot;are lot nr&quot;, &quot;Este Piesa&quot; și &quot;Metoda de evaluare&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick Jurnal de intrare
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Nu puteți schimba rata dacă BOM menționat agianst orice element
@@ -1942,7 +1952,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Vă rugăm livrare Nota primul
 DocType: Purchase Invoice,Currency and Price List,Valută și lista de prețuri
 DocType: Opportunity,Customer / Lead Name,Client / Nume Principal
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Data Aprobare nespecificata
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Data Aprobare nespecificata
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Producţie
 DocType: Item,Allow Production Order,Permiteţi comandă de producţie
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Rând {0}: Data începerii trebuie să fie înainte de Data de încheiere
@@ -1952,7 +1962,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
 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 +118,My Addresses,Adresele mele
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Adresele mele
 DocType: Stock Ledger Entry,Outgoing Rate,Rata de ieșire
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Ramură organizație maestru.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,sau
@@ -2021,7 +2031,7 @@
 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 +302,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 +95,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.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impozite și Taxe dedus
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Probleme
@@ -2038,7 +2048,7 @@
 ,Sales Browser,Vânzări Browser
 DocType: Journal Entry,Total Credit,Total credit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,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/setup_wizard/setup_wizard.py +392,Local,Local
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Mare
@@ -2057,7 +2067,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Toate tranzacțiile de vânzări pot fi etichetate comparativ mai multor **Persoane de vânzări** pentru ca dvs. sa puteţi configura și monitoriza obiective.
 ,S.O. No.,SO Nu.
 DocType: Production Order Operation,Make Time Log,Fa-ti timp Log
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Vă rugăm să setați cantitatea reordona
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Vă rugăm să creați client de plumb {0}
 DocType: Price List,Applicable for Countries,Aplicabile pentru țările
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computere
@@ -2144,7 +2153,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Obține intrările relevante
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Intrare contabilitate pentru stoc
 DocType: Sales Invoice,Sales Team1,Vânzări TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Articolul {0} nu există
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Articolul {0} nu există
 DocType: Sales Invoice,Customer Address,Adresă client
 DocType: Payment Request,Recipient and Message,Destinatar și mesaje
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicați Discount suplimentare La
@@ -2185,7 +2194,8 @@
 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 +274,Price List Currency not selected,Lista de pret Valuta nu selectat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,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/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Postul Rând {0}: Chitanță de achiziție {1} nu există în tabelul de mai sus &quot;Încasări de achiziție&quot;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,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
@@ -2223,7 +2233,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Vă rugăm să introduceți data alinarea.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Lasă doar Aplicatii cu statutul de ""Aprobat"" pot fi depuse"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Titlul adresei este obligatoriu.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Titlul adresei este obligatoriu.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Introduceți numele de campanie dacă sursa de anchetă este campanie
 apps/erpnext/erpnext/setup/setup_wizard/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
@@ -2247,6 +2257,7 @@
 DocType: UOM,Must be Whole Number,Trebuie să fie Număr întreg
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Frunze noi alocate (în zile)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial Nu {0} nu există
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Depozit de client (opțional)
 DocType: Pricing Rule,Discount Percentage,Procentul de Reducere
 DocType: Payment Reconciliation Invoice,Invoice Number,Numar factura
 apps/erpnext/erpnext/hooks.py +55,Orders,Comenzi
@@ -2356,7 +2367,7 @@
 DocType: Appraisal,Appraisal,Expertiză
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data se repetă
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Semnatar autorizat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,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 +184,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
@@ -2470,6 +2481,7 @@
 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
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Livrat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Postul {0}: Cantitate comandat {1} nu poate fi mai mică de cantitate minimă de comandă {2} (definită la punctul).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Lunar Procentaj Distribuție
 DocType: Territory,Territory Targets,Obiective Territory
 DocType: Delivery Note,Transporter Info,Info Transporter
@@ -2524,7 +2536,7 @@
 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ă
 DocType: Sales Order Item,Supplier delivers to Customer,Furnizor livrează la client
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Arată impozit break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Arată impozit break-up
 apps/erpnext/erpnext/accounts/party.py +283,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'
@@ -2686,7 +2698,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,Vă rugăm să re-tip numele companiei pentru a confirma
@@ -2713,9 +2725,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Structura salariu
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Există Preț multiple articolul cu aceleași criterii, vă rugăm să rezolve conflictele \
- prin atribuirea prioritate. Reguli Pret: {0}"
 DocType: Account,Bank,Bancă
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Linie aeriană
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Eliberarea Material
@@ -2740,7 +2749,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,A Valorilor Mobiliare și Burselor de Mărfuri
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitatea implicit de măsură pentru Variant &#39;{0} &quot;trebuie să fie la fel ca în Template&quot; {1} &quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitatea implicit de măsură pentru Variant &#39;{0} &quot;trebuie să fie la fel ca în Template&quot; {1} &quot;
 DocType: Shipping Rule,Calculate Based On,Calculaţi pe baza
 DocType: Delivery Note Item,From Warehouse,Din depozitul
 DocType: Purchase Taxes and Charges,Valuation and Total,Evaluare și Total
@@ -2749,7 +2758,7 @@
 DocType: Account,Purchase User,Cumpărare de utilizare
 DocType: Notification Control,Customize the Notification,Personalizare Notificare
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Cash Flow din Operațiuni
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Format implicit Adresa nu poate fi șters
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Format implicit Adresa nu poate fi șters
 DocType: Sales Invoice,Shipping Rule,Regula de transport maritim
 DocType: Manufacturer,Limited to 12 characters,Limitată la 12 de caractere
 DocType: Journal Entry,Print Heading,Imprimare Titlu
@@ -2843,7 +2852,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicii extraordinare
@@ -2862,7 +2871,7 @@
 DocType: Customer,Default Receivable Accounts,Implicit Conturi creanțe
 DocType: Tax Rule,Billing State,Stat de facturare
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Obtine FDM expandat (inclusiv subansamblurile)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,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 +95,Due Date is mandatory,Due Date este obligatorie
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Creștere pentru Atribut {0} nu poate fi 0
@@ -2894,7 +2903,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Profit provizorie / Pierdere (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Profit provizorie / Pierdere (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Reveni Împotriva Vânzări factură
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Punctul 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Vă rugăm să setați valoare implicită {0} în {1} companie
@@ -2925,6 +2934,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Adăugaţi fiu
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolul pot organiza conturile înghețate și congelate Editați intrările
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Nu se poate converti de cost Centrul de registru, deoarece are noduri copil"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Valoarea de deschidere
 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,Comision pentru Vânzări
 DocType: Offer Letter Term,Value / Description,Valoare / Descriere
@@ -2958,7 +2968,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Șters cu succes toate tranzacțiile legate de aceasta companie!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Ca pe data
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probă
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Depozitul Implicit este obligatoriu pentru articol din stoc.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Plata salariului pentru luna {0} și {1 an}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Inserați Auto rata Lista de prețuri, dacă lipsește"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Total Suma plătită
@@ -2994,7 +3003,7 @@
 DocType: Payment Tool,Set Matching Amounts,Sume de potrivire Set
 DocType: Purchase Invoice,Taxes and Charges Added,Impozite și Taxe Added
 ,Sales Funnel,De vânzări pâlnie
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Abreviere este obligatorie
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Abreviere este obligatorie
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Vă mulțumim pentru interesul dumneavoastră în abonarea la actualizările noastre
 ,Qty to Transfer,Cantitate de a transfera
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citate la Oportunitati sau clienți.
@@ -3022,7 +3031,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} este oprit
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Cod de bare {0} deja folosit pentru articolul {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,evenimente viitoare
@@ -3045,7 +3054,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Selectați anul fiscal ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS Profil necesare pentru a face POS intrare
 DocType: Hub Settings,Name Token,Numele Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Vanzarea Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Vanzarea Standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -3119,6 +3128,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,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/stock/doctype/material_request/material_request.py +127,The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3},Total Eliberarea / Transfer cantitatea {0} cu material Cerere {1} nu poate fi mai mare decât cantitatea solicitată {2} pentru postul {3}
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,Buletine
 DocType: Address,Shipping,Transport
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stoc Ledger intrare
@@ -3166,7 +3176,7 @@
 DocType: Sales Invoice,Paid Amount,Suma plătită
 ,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
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,Setarea acestei Format Adresa implicit ca nu exista nici un alt implicit
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Soldul contului este deja în credit, nu vă este permis să setați ""Balanța trebuie să fie"" drept ""Credit""."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Managementul calității
 DocType: Production Planning Tool,Filter based on customer,Filtru bazat pe client
@@ -3267,7 +3277,7 @@
 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 +19,Shortage Qty,Lipsă Cantitate
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Până la data' este necesară
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generarea de ambalare slip pentru pachetele de a fi livrate. Folosit pentru a notifica numărul pachet, conținutul pachetului și greutatea sa."
@@ -3278,7 +3288,7 @@
 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 +749,It is needed to fetch Item Details.,Este nevoie să-i aducă Detalii despre articol.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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
@@ -3304,6 +3314,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: C-Form,Series,Serii
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,Postul Clasificare
@@ -3390,7 +3401,7 @@
 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 +434,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 +420,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."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Cumpărare Maestru de Management
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Producția de Ordine {0} trebuie să fie prezentate
@@ -3398,7 +3409,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Rapoarte Principale
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Până în prezent nu poate fi înainte de data
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc Doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Adăugați / editați preturi
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Comenzile mele
@@ -3446,7 +3457,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Row # {0}: Set Furnizor de produs {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Site-ul Image {0} atașat la postul {1} nu poate fi găsit
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Site-ul Image {0} atașat la postul {1} nu poate fi găsit
 DocType: Issue,Content Type,Tip Conținut
 apps/erpnext/erpnext/setup/setup_wizard/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.\
@@ -3460,7 +3471,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,'Are numãr de serie' nu poate fi 'Da' pentru articolele care nu au stoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,'Are numãr de serie' nu poate fi 'Da' pentru articolele care nu au 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
@@ -3486,7 +3497,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Contul {0} de închidere trebuie să fie de tip răspunderii / capitaluri proprii
 DocType: Authorization Rule,Based On,Bazat pe
 DocType: Sales Order Item,Ordered Qty,Ordonat Cantitate
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Postul {0} este dezactivat
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +168,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ă.
@@ -3494,7 +3505,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Destinat Cumpărării trebuie să fie bifat, dacă Se Aplica Pentru este selectat ca şi {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Reducerea trebuie să fie mai mică de 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Scrie Off Suma (Compania de valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Row # {0}: Va rugam sa seta cantitatea reordona
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Row # {0}: Va rugam sa seta cantitatea reordona
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Cost Landed
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Vă rugăm să setați {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Repetați în ziua de Luna
@@ -3567,7 +3578,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Vizualizează acum
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Selectați perioada în care factura va fi generat automat
 DocType: BOM,Raw Material Cost,Materie primă Cost
-DocType: Item,Re-Order Level,Nivelul de re-comandă
+DocType: Item Reorder,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ă.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Listă de concedii aplicabile
@@ -3622,7 +3633,7 @@
 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 +573,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 +559,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}
@@ -3701,7 +3712,8 @@
 DocType: Address,Office,Birou
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Inregistrari contabile de jurnal.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Cantitate Disponibil la Depozitul
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Vă rugăm să selectați Angajat Înregistrare întâi.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,Vă rugăm să selectați Angajat Înregistrare întâi.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rând {0}: Parte / conturi nu se potrivește cu {1} / {2} din {3} {4}
 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 +240,Please enter Expense Account,Va rugam sa introduceti cont de cheltuieli
 DocType: Account,Stock,Stoc
@@ -3775,7 +3787,7 @@
 DocType: Item Attribute,Numeric Values,Valori numerice
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Atașați logo
 DocType: Customer,Commission Rate,Rata de Comision
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Face Varianta
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Face Varianta
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Blocaţi cereri de concediu pe departamente.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Coșul este gol
 DocType: Production Order,Actual Operating Cost,Cost efectiv de operare
@@ -3792,15 +3804,14 @@
 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 +380,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 +419,"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 +408,"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 +380, (Half Day),(Jumatate de zi)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Obține articole din FDM
diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv
index 5aab403..abf0001 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% Выставлено
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),"Курс должен быть таким же, как {0} {1} ({2})"
 DocType: Sales Invoice,Customer Name,Наименование заказчика
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Банковский счет не может быть назван {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Банковский счет не может быть назван {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Выдающийся для {0} не может быть меньше нуля ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Новый Оставить заявку
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Новый Оставить заявку
 apps/erpnext/erpnext/setup/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,Форма оплаты счета
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Журнал деятельность, осуществляемая пользователей от задач, которые могут быть использованы для отслеживания времени, биллинга."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Новый {0}: # {1}
 ,Sales Partners Commission,Комиссионные Партнеров по продажам
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Аббревиатура не может иметь более 5 символов
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Аббревиатура не может иметь более 5 символов
 DocType: Payment Request,Payment Request,Платежный запрос
 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.",Атрибут Значение {0} не может быть удалена из {1} в качестве пункта Варианты \ существуют с этим атрибутом.
@@ -196,6 +196,7 @@
 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 (%),Скидка на Прайс-лист ставка (%)
 DocType: Offer Letter,Select Terms and Conditions,Выберите Сроки и условия
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,аута
 DocType: Production Planning Tool,Sales Orders,Заказы клиентов
 DocType: Purchase Taxes and Charges,Valuation,Оценка
 ,Purchase Order Trends,Заказ на покупку Тенденции
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Телевидение
 DocType: Production Order Operation,Updated via 'Time Log',"Обновлено помощью ""Time Вход"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Аккаунт {0} не принадлежит компании {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},"Предварительная сумма не может быть больше, чем {0} {1}"
 DocType: Naming Series,Series List for this Transaction,Список Серия для этого сделки
 DocType: Sales Invoice,Is Opening Entry,Открывает запись
 DocType: Customer Group,Mention if non-standard receivable account applicable,Упоминание если нестандартная задолженность счет применимо
@@ -227,7 +229,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Создает ведомость расчета зарплаты за вышеуказанные критерии.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Не введено описание
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Запрос на покупку.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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&gt; Настройки&gt; именования серии"
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Склад {0} не принадлежит компания {1}
 DocType: Item Website Specification,Item Website Specification,Пункт Сайт Спецификация
 DocType: Payment Tool,Reference No,Ссылка Нет
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Оставьте Заблокированные
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,Оставьте Заблокированные
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,За год
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Фото Примирение товара
 DocType: Stock Entry,Sales Invoice No,Номер Счета Продажи
@@ -249,7 +251,7 @@
 DocType: Pricing Rule,Supplier Type,Тип поставщика
 DocType: Item,Publish in Hub,Опубликовать в Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Пункт {0} отменяется
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Заказ материалов
 DocType: Bank Reconciliation,Update Clearance Date,Обновление просвет Дата
 DocType: Item,Purchase Details,Покупка Подробности
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,· Отметки о доставке
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Настройка Налоги
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата запись была изменена после того, как вытащил его. Пожалуйста, вытащить его снова."
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} введен дважды в налог по позиции
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,"Пожалуйста, выберите месяц и год"
@@ -329,7 +331,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Ваш адрес электронной почты
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,"Пожалуйста, см. приложение"
 DocType: Purchase Order,% Received,% Получено
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Настройка Уже завершена!!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Настройка Уже завершена!!
 ,Finished Goods,Готовая продукция
 DocType: Delivery Note,Instructions,Инструкции
 DocType: Quality Inspection,Inspected By,Проверено
@@ -354,14 +356,13 @@
 ,Purchase Register,Покупка Становиться на учет
 DocType: Landed Cost Item,Applicable Charges,Взимаемых платежах
 DocType: Workstation,Consumable Cost,Расходные Стоимость
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) должен иметь роль ""Подтверждающий Отсутствие"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) должен иметь роль ""Подтверждающий Отсутствие"""
 DocType: Purchase Receipt,Vehicle Date,Дата
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Медицинский
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина потери
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Рабочая станция закрыта в следующие сроки согласно Список праздников: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Возможности
 DocType: Employee,Single,Единственный
-DocType: Issue,Attachment,Привязанность
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Бюджет не может быть установлен для группы МВЗ
 DocType: Account,Cost of Goods Sold,Себестоимость проданного товара
 DocType: Purchase Invoice,Yearly,Ежегодно
@@ -390,7 +391,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} выбрано несколько раз в таблице атрибутов
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} выбрано несколько раз в таблице атрибутов
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Не применяется
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Мастер отдыха.
@@ -429,7 +430,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Косметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items","Чтобы объединить, следующие свойства должны быть одинаковыми для обоих пунктов"
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Чтобы объединить, следующие свойства должны быть одинаковыми для обоих пунктов"
 DocType: Shipping Rule,Net Weight,Вес нетто
 DocType: Employee,Emergency Phone,В случае чрезвычайных ситуаций
 ,Serial No Warranty Expiry,не Серийный Нет Гарантия Срок
@@ -440,7 +441,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Управление субподряда
 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,"Скорость, с которой Прайс-лист валюта конвертируется в базовую валюту компании"
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Аккаунт {0} не принадлежит компании: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Аккаунт {0} не принадлежит компании: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Аббревиатура уже используется для другой компании
 DocType: Selling Settings,Default Customer Group,По умолчанию Группа клиентов
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Если отключить, 'закругленными Всего' поле не будет виден в любой сделке"
 DocType: BOM,Operating Cost,Эксплуатационные затраты
@@ -475,6 +477,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Не записи не найдено в таблице счетов
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Пожалуйста, выберите компании и партийных первого типа"
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Финансовый / отчетного года.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Накопленные значения
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","К сожалению, серийные номера не могут быть объединены"
 DocType: Project Task,Project Task,Проект Задача
 ,Lead Id,ID лида
@@ -496,7 +499,7 @@
 DocType: Quotation,Quotation To,Цитата Для
 DocType: Lead,Middle Income,Средний доход
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Открытие (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"По умолчанию Единица измерения для п {0} не может быть изменен непосредственно, потому что вы уже сделали некоторые сделки (сделок) с другим UOM. Вам нужно будет создать новый пункт для использования другого умолчанию единица измерения."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"По умолчанию Единица измерения для п {0} не может быть изменен непосредственно, потому что вы уже сделали некоторые сделки (сделок) с другим UOM. Вам нужно будет создать новый пункт для использования другого умолчанию единица измерения."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Выделенные сумма не может быть отрицательным
 DocType: Purchase Order Item,Billed Amt,Счетов выдано кол-во
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Логический Склад, по которому сделаны складские записи"
@@ -574,7 +577,7 @@
 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 +543,Item has variants.,Пункт имеет варианты.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,Дерево Тип
@@ -587,6 +590,7 @@
 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 +33,Goods received from Suppliers.,"Товары, полученные от поставщиков."
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,В цене
 DocType: Lead,Campaign Name,Название кампании
 ,Reserved,Зарезервировано
 DocType: Purchase Order,Supply Raw Materials,Поставка сырья
@@ -601,16 +605,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Счет с существующими проводками не может быть преобразован в регистр
 DocType: Delivery Note,Customer's Purchase Order No,Клиентам Заказ Нет
 DocType: Employee,Cell Number,Количество звонков
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,"Запросы Авто материал, полученный"
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,"Запросы Авто материал, полученный"
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Поражений
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Вы не можете ввести текущий ваучер в «Против Запись в журнале 'колонке
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Энергоэффективность
 DocType: Opportunity,Opportunity From,Возможность От
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Ежемесячная выписка зарплата.
 DocType: Item Group,Website Specifications,Сайт характеристики
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Существует ошибка в адресной Шаблон {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Новая учетная запись
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: С {0} типа {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коэффициент преобразования является обязательным
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Несколько Цена Правила существует с теми же критериями, пожалуйста разрешить конфликт путем присвоения приоритета. Цена Правила: {0}"
 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.,Бухгалтерские записи можно с листовыми узлами. Записи против групп не допускаются.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете отключить или отменить спецификации, как она связана с другими спецификациями"
 DocType: Opportunity,Maintenance,Обслуживание
@@ -672,7 +678,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,Прайс-лист не выбран
 DocType: Employee,Family Background,Семья Фон
 DocType: Process Payroll,Send Email,Отправить e-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Внимание: Неверный Приложение {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Внимание: Неверный Приложение {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Нет разрешения
 DocType: Company,Default Bank Account,По умолчанию Банковский счет
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Чтобы отфильтровать на основе партии, выберите партия первого типа"
@@ -702,13 +708,13 @@
 DocType: Production Planning Tool,Select Items,Выберите товары
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} по Счету {1} от {2}
 DocType: Maintenance Visit,Completion Status,Статус завершения
-DocType: Sales Invoice Item,Target Warehouse,Целевая Склад
+DocType: Production Order,Target Warehouse,Целевая Склад
 DocType: Item,Allow over delivery or receipt upto this percent,Разрешить доставку на получение или Шифрование до этого процента
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,Ожидаемая дата поставки не может быть до даты заказа на продажу
 DocType: Upload Attendance,Import Attendance,Импорт Посещаемость
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Все группы товаров
 DocType: Process Payroll,Activity Log,Журнал активности
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Чистая прибыль / убытки
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Чистая прибыль / убытки
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматически создавать сообщение о подаче сделок.
 DocType: Production Order,Item To Manufacture,Элемент Производство
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статус {2}
@@ -716,7 +722,7 @@
 DocType: Sales Order Item,Projected Qty,Прогнозируемый Количество
 DocType: Sales Invoice,Payment Due Date,Дата платежа
 DocType: Newsletter,Newsletter Manager,Рассылка менеджер
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Пункт Вариант {0} уже существует же атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Пункт Вариант {0} уже существует же атрибутами
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Открытие&quot;
 DocType: Notification Control,Delivery Note Message,Доставка Примечание сообщение
 DocType: Expense Claim,Expenses,Расходы
@@ -726,7 +732,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Научно-исследовательские и опытно-конструкторские работы
 ,Amount to Bill,"Сумма, Биллу"
 DocType: Company,Registration Details,Регистрационные данные
-DocType: Item,Re-Order Qty,Re порядка Кол-во
+DocType: Item Reorder,Re-Order Qty,Re порядка Кол-во
 DocType: Leave Block List Date,Leave Block List Date,Оставьте Блок-лист Дата
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Планируется отправить {0}
 DocType: Pricing Rule,Price or Discount,Цена или Скидка
@@ -769,7 +775,7 @@
 DocType: Bank Reconciliation,Total Amount,Общая сумма
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Интернет издания
 DocType: Production Planning Tool,Production Orders,Производственные заказы
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Валюта баланса
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Валюта баланса
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Прайс-лист продаж
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Опубликовать синхронизировать элементы
 DocType: Bank Reconciliation,Account Currency,Валюта счета
@@ -778,7 +784,7 @@
 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 +538,Item Variants {0} updated,Пункт Варианты {0} обновляются
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,Пункт Варианты {0} обновляются
 DocType: Quality Inspection Reading,Reading 6,Чтение 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Счета-фактуры Advance
 DocType: Address,Shop,Магазин
@@ -855,7 +861,7 @@
 DocType: POS Profile,Cash/Bank Account,Наличные / Банковский счет
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Удалены пункты без изменения в количестве или стоимости.
 DocType: Delivery Note,Delivery To,Доставка Для
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,Атрибут стол является обязательным
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Скидка
@@ -883,7 +889,7 @@
 DocType: Tax Rule,Shipping State,Государственный Доставка
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Товар должен быть добавлены с помощью ""Получить товары от покупки ПОСТУПЛЕНИЯ кнопку '"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Расходы на продажи
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Стандартный Покупка
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Стандартный Покупка
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,По умолчанию Продажа Стоимость центр
 DocType: Sales Partner,Implementation Partner,Реализация Партнер
@@ -925,7 +931,7 @@
 DocType: Sales Partner,Distributor,Дистрибьютор
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корзина Правило Доставка
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',"Пожалуйста, установите &quot;Применить Дополнительная Скидка On &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',"Пожалуйста, установите &quot;Применить Дополнительная Скидка On &#39;"
 ,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.,Выберите Журналы время и предоставить для создания нового счета-фактуры.
@@ -993,9 +999,9 @@
 DocType: Contact,User ID,ID пользователя
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Посмотреть Леджер
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Старейшие
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем, пожалуйста, измените имя элемента или переименовать группу товаров"
 DocType: Production Order,Manufacture against Sales Order,Производство против заказ клиента
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Остальной мир
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,Зарплата до вычетов
@@ -1025,7 +1031,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","К сожалению, компании не могут быть объединены"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","К сожалению, компании не могут быть объединены"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Небольшой
 DocType: Employee,Employee Number,Общее число сотрудников
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Случай Нет (ы) уже используется. Попробуйте из дела № {0}
@@ -1044,7 +1050,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Сельское хозяйство
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Ваши продукты или услуги
 DocType: Mode of Payment,Mode of Payment,Способ оплаты
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Сайт изображение должно быть общественное файл или адрес веб-сайта
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Сайт изображение должно быть общественное файл или адрес веб-сайта
 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,Склад Контактная информация
@@ -1116,6 +1122,7 @@
 DocType: Address,Utilities,Инженерное оборудование
 DocType: Purchase Invoice Item,Accounting,Бухгалтерия
 DocType: Features Setup,Features Setup,Особенности установки
+DocType: Item,Is Service Item,Является Service Элемент
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Срок подачи заявлений не может быть период распределения пределами отпуск
 DocType: Activity Cost,Projects,Проекты
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Пожалуйста, выберите финансовый год"
@@ -1146,7 +1153,7 @@
 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 +465,cannot be greater than 100,"не может быть больше, чем 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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 +1213,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Правительство
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Предмет Варианты
 DocType: Company,Services,Услуги
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Всего ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Всего ({0})
 DocType: Cost Center,Parent Cost Center,Родитель МВЗ
 DocType: Sales Invoice,Source,Источник
 DocType: Leave Type,Is Leave Without Pay,Является отпуск без
@@ -1279,17 +1286,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Повторно оплаты на e-mail
 DocType: Dependent Task,Dependent Task,Зависит Задача
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,Израсходованное количество
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Просмотр
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Чистое изменение денежных средств
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Чистое изменение денежных средств
 DocType: Salary Structure Deduction,Salary Structure Deduction,Зарплата Структура Вычет
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Оплата Запрос уже существует {0}
 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 +182,Quantity must not be more than {0},Количество должно быть не более {0}
@@ -1351,7 +1358,7 @@
 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: Packed Item,To Warehouse (Optional),На склад (Необязательно)
 DocType: Sales Invoice,Paid Amount (Company Currency),Платные Сумма (Компания валют)
 DocType: Purchase Invoice,Additional Discount,Дополнительная скидка
 DocType: Selling Settings,Selling Settings,Продажа Настройки
@@ -1360,7 +1367,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Компания, месяц и финансовый год является обязательным"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Маркетинговые расходы
 ,Item Shortage Report,Пункт Нехватка Сообщить
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вес упоминается, \n Пожалуйста, укажите ""Вес Единица измерения"" слишком"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вес упоминается, \n Пожалуйста, укажите ""Вес Единица измерения"" слишком"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,"Материал Запрос используется, чтобы сделать эту Stock запись"
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Одно устройство элемента.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Время входа Пакетная {0} должен быть 'Представленные'
@@ -1371,6 +1378,7 @@
 DocType: Employee,Date Of Retirement,Дата выбытия
 DocType: Upload Attendance,Get Template,Получить шаблон
 DocType: Address,Postal,Почтовый
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,Настройка ERPNext завершена!
 DocType: Item,Weightage,Weightage
 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,"Группа клиентов с таким именем уже существует. Пожалуйста, измените имя клиента или имя группы клиентов"
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,"Пожалуйста, выберите {0} в первую очередь."
@@ -1399,12 +1407,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Слишком много столбцов. Экспорт отчета и распечатать его с помощью приложения электронной таблицы.
 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 +139,Main,Основные
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Основные
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Вариант
 DocType: Naming Series,Set prefix for numbering series on your transactions,Установить префикс для нумерации серии на ваших сделок
 DocType: Employee Attendance Tool,Employees HTML,Сотрудники HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,"Приостановленный заказ не может быть отменен. Снимите с заказа статус ""Приостановлено"" для отмены"
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,По умолчанию BOM ({0}) должен быть активным для данного элемента или в шаблоне
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,Варианты
@@ -1429,7 +1437,6 @@
 DocType: Sales Order,To Deliver and Bill,Для доставки и оплаты
 DocType: GL Entry,Credit Amount in Account Currency,Сумма кредита в валюте счета
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Журналы Время для изготовления.
-DocType: Item,Apply Warehouse-wise Reorder Level,Применить Склад-накрест Reorder уровень
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} должны быть представлены
 DocType: Authorization Control,Authorization Control,Авторизация управления
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ряд # {0}: Отклонено Склад является обязательным в отношении отклонил Пункт {1}
@@ -1528,6 +1535,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Ряд # {0}: Режим {1} не завершены {2} Кол-во готовой продукции в производстве Приказ № {3}. Пожалуйста, обновите статус работы через журнал времени"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Инвестиции
 DocType: Issue,Resolution Details,Разрешение Подробнее
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ассигнования
 DocType: Quality Inspection Reading,Acceptance Criteria,Критерий приемлемости
 DocType: Item Attribute,Attribute Name,Имя атрибута
 DocType: Item Group,Show In Website,Показать на сайте
@@ -1578,7 +1586,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,Расходов претензии ожидает одобрения. Только расходов утверждающий можете обновить статус.
 DocType: Purchase Invoice,Additional Discount Amount,Дополнительная скидка Сумма
 DocType: Leave Block List Allow,Leave Block List Allow,Оставьте Черный список Разрешить
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Аббревиатура не может быть пустой или пробелом
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Аббревиатура не может быть пустой или пробелом
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Группа не-группы
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спорт
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Общий фактический
@@ -1619,7 +1627,7 @@
 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**.,**Фискальный год** представляет собой финансовый год. Все бухгалтерские записи и другие крупные сделки отслеживаются по **Фискальному году**.
 DocType: Opportunity,Customer / Lead Address,Заказчик / Ведущий Адрес
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Внимание: Неверный сертификат SSL на привязанности {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Внимание: Неверный сертификат SSL на привязанности {0}
 DocType: Production Order Operation,Actual Operation Time,Фактическая Время работы
 DocType: Authorization Rule,Applicable To (User),Применимо к (Пользователь)
 DocType: Purchase Taxes and Charges,Deduct,Вычеты €
@@ -1768,7 +1776,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Дело № не может быть 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,"Если у вас есть отдел продаж и продажа партнеры (Channel Partners), они могут быть помечены и поддерживать их вклад в сбытовой деятельности"
 DocType: Item,Show a slideshow at the top of the page,Показ слайдов в верхней части страницы
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Магазины
+DocType: Item,"Allow in Sales Order of type ""Service""",Разрешить в заказ клиента типа &quot;услуг&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Магазины
 DocType: Time Log,Projects Manager,Менеджер проектов
 DocType: Serial No,Delivery Time,Время доставки
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,"Проблемам старения, на основе"
@@ -1793,7 +1802,7 @@
 ,Financial Analytics,Финансовая аналитика
 DocType: Quality Inspection,Verified By,Verified By
 DocType: Address,Subsidiary,Филиал
-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.","Невозможно изменить Базовая валюта компании, потому что есть существующие операции. Сделки должны быть отменены, чтобы поменять валюту."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Невозможно изменить Базовая валюта компании, потому что есть существующие операции. Сделки должны быть отменены, чтобы поменять валюту."
 DocType: Quality Inspection,Purchase Receipt No,Покупка Получение Нет
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Задаток
 DocType: Process Payroll,Create Salary Slip,Создание Зарплата Слип
@@ -1841,7 +1850,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Сырье не может быть пустым.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Не удалось обновить запас, счет-фактура содержит падение пункт доставки."
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 +459,Quick Journal Entry,Быстрый журнал запись
@@ -1951,7 +1960,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,"Пожалуйста, накладной первый"
 DocType: Purchase Invoice,Currency and Price List,Валюта и прайс-лист
 DocType: Opportunity,Customer / Lead Name,Заказчик / Ведущий Имя
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Клиренс Дата не упоминается
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Клиренс Дата не упоминается
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Производство
 DocType: Item,Allow Production Order,Разрешить производственного заказа
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Ряд {0}: Дата начала должна быть раньше даты окончания
@@ -1961,7 +1970,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
 DocType: Salary Structure,Total Earning,Всего Заработок
 DocType: Purchase Receipt,Time at which materials were received,"Момент, в который были получены материалы"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,Мои Адреса
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Мои Адреса
 DocType: Stock Ledger Entry,Outgoing Rate,Исходящие Оценить
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Организация филиал мастер.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,или
@@ -2030,7 +2039,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Управление групповой клиентов дерево.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Новый Центр Стоимость Имя
 DocType: Leave Control Panel,Leave Control Panel,Оставьте панели управления
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"Нет умолчанию Адрес шаблона не найдено. Пожалуйста, создайте новый из Setup> Печать и брендинга> Адресная шаблон."
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"Нет умолчанию Адрес шаблона не найдено. Пожалуйста, создайте новый из Setup> Печать и брендинга> Адресная шаблон."
 DocType: Appraisal,HR User,HR Пользователь
 DocType: Purchase Invoice,Taxes and Charges Deducted,"Налоги, которые вычитаются"
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Вопросов
@@ -2047,7 +2056,7 @@
 ,Sales Browser,Браузер по продажам
 DocType: Journal Entry,Total Credit,Всего очков
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Внимание: Еще {0} # {1} существует против вступления фондовой {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Локальные
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Большой
@@ -2066,7 +2075,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Все сделок купли-продажи могут быть помечены против нескольких ** продавцы ** так что вы можете устанавливать и контролировать цели.
 ,S.O. No.,КО №
 DocType: Production Order Operation,Make Time Log,Сделать временной лаг
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,"Пожалуйста, установите количество тональный"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},"Пожалуйста, создайте Клиента от свинца {0}"
 DocType: Price List,Applicable for Countries,Применимо для стран
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Компьютеры
@@ -2153,7 +2161,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Получить соответствующие записи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Бухгалтерский учет Вход для запасе
 DocType: Sales Invoice,Sales Team1,Продажи Команда1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Пункт {0} не существует
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Пункт {0} не существует
 DocType: Sales Invoice,Customer Address,Клиент Адрес
 DocType: Payment Request,Recipient and Message,Получатель и сообщение
 DocType: Purchase Invoice,Apply Additional Discount On,Применить Дополнительная скидка на
@@ -2195,7 +2203,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Оценка Оцените
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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,Переименовать Входить
@@ -2233,7 +2241,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Пожалуйста, введите даты снятия."
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Только Оставьте приложений с статуса ""Одобрено"" могут быть представлены"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Название адреса является обязательным.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Название адреса является обязательным.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Введите имя кампании, если источником исследования является кампания"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Газетных издателей
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Выберите финансовый год
@@ -2257,6 +2265,7 @@
 DocType: UOM,Must be Whole Number,Должно быть Целое число
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Новые листья Выделенные (в днях)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Серийный номер {0} не существует
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Склад Клиент (Необязательно)
 DocType: Pricing Rule,Discount Percentage,Скидка в процентах
 DocType: Payment Reconciliation Invoice,Invoice Number,Номер накладной
 apps/erpnext/erpnext/hooks.py +55,Orders,Заказы
@@ -2366,7 +2375,7 @@
 DocType: Appraisal,Appraisal,Оценка
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Дата повторяется
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Право подписи
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},Оставьте утверждающий должен быть одним из {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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,Время
@@ -2535,7 +2544,7 @@
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Заменить Tool
 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 +733,Show tax break-up,Показать налог распад
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Показать налог распад
 apps/erpnext/erpnext/accounts/party.py +283,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',Если вы привлечь в производственной деятельности. Включает элемент 'производится'
@@ -2585,7 +2594,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,"Пожалуйста, повторите ввод название компании, чтобы подтвердить"
@@ -2612,9 +2621,6 @@
 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,Дата Присоединение должно быть больше Дата рождения
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Зарплата Структура
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Несколько Цена Правило существует с теми же критериями,, пожалуйста, решить \
- конфликта отдавая приоритет. Цена Правила: {0}"
 DocType: Account,Bank,Банк:
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиалиния
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Материал Выпуск
@@ -2639,7 +2645,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Ценные бумаги и товарных бирж
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"По умолчанию Единица измерения для варианта &#39;{0}&#39; должно быть такой же, как в шаблоне &#39;{1}&#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"По умолчанию Единица измерения для варианта &#39;{0}&#39; должно быть такой же, как в шаблоне &#39;{1}&#39;"
 DocType: Shipping Rule,Calculate Based On,Рассчитать на основе
 DocType: Delivery Note Item,From Warehouse,От Склад
 DocType: Purchase Taxes and Charges,Valuation and Total,Оценка и Всего
@@ -2648,7 +2654,7 @@
 DocType: Account,Purchase User,Покупка пользователя
 DocType: Notification Control,Customize the Notification,Настроить уведомления
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Поток денежных средств от операций
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Адрес по умолчанию шаблона не может быть удален
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Адрес по умолчанию шаблона не может быть удален
 DocType: Sales Invoice,Shipping Rule,Правило Доставка
 DocType: Manufacturer,Limited to 12 characters,Ограничено до 12 символов
 DocType: Journal Entry,Print Heading,Распечатать Заголовок
@@ -2742,7 +2748,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,Проект мудрый данные не доступны для коммерческого предложения
 DocType: Project,Expected End Date,Ожидаемая дата завершения
 DocType: Appraisal Template,Appraisal Template Title,Оценка шаблона Название
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,Коммерческий сектор
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Потрясающие услуги
@@ -2761,7 +2767,7 @@
 DocType: Customer,Default Receivable Accounts,По умолчанию Дебиторская задолженность
 DocType: Tax Rule,Billing State,Государственный счетов
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Переложить
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Fetch разобранном BOM (в том числе узлов)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),Fetch разобранном BOM (в том числе узлов)
 DocType: Authorization Rule,Applicable To (Employee),Применимо к (Сотрудник)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,Благодаря Дата является обязательным
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Прирост за атрибут {0} не может быть 0
@@ -2794,7 +2800,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Отрицательный Оценка курс не допускается
 DocType: Holiday List,Weekly Off,Еженедельный Выкл
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Для, например 2012, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Предварительная прибыль / убыток (Кредит)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Предварительная прибыль / убыток (Кредит)
 DocType: Sales Invoice,Return Against Sales Invoice,Вернуться против накладная
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Пункт 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},"Пожалуйста, установите значение по умолчанию {0} в обществе {1}"
@@ -2825,6 +2831,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Добавить дочерний
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Роль разрешено устанавливать замороженные счета & Редактировать Замороженные Записи
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Невозможно преобразовать МВЗ в книге, как это имеет дочерние узлы"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Значение открытия
 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,Комиссия по продажам
 DocType: Offer Letter Term,Value / Description,Значение / Описание
@@ -2858,7 +2865,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,"Успешно удален все сделки, связанные с этой компанией!"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,По состоянию на Дата
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Испытательный срок
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,По умолчанию Склад является обязательным для складе Пункт.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Выплата заработной платы за месяц {0} и год {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Авто вставка Скорость Цены, если не хватает"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Всего уплаченной суммы
@@ -2894,7 +2900,7 @@
 DocType: Payment Tool,Set Matching Amounts,Соответствующего набора суммы
 DocType: Purchase Invoice,Taxes and Charges Added,Налоги и сборы Добавил
 ,Sales Funnel,Воронка продаж
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Аббревиатура является обязательной
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Аббревиатура является обязательной
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Спасибо за ваш интерес к подписке на обновления
 ,Qty to Transfer,Кол-во для передачи
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Котировки в снабжении или клиентов.
@@ -2922,7 +2928,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,Поставщик цитаты
 DocType: Quotation,In Words will be visible once you save the Quotation.,По словам будет виден только вы сохраните цитаты.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} остановлен
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Штрихкод {0} уже используется в позиции {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Предстоящие События
@@ -2945,7 +2951,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Выберите финансовый год ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,"POS-профиля требуется, чтобы сделать запись POS"
 DocType: Hub Settings,Name Token,Имя маркера
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Стандартный Продажа
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Стандартный Продажа
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,"По крайней мере, один склад является обязательным"
 DocType: Serial No,Out of Warranty,По истечении гарантийного срока
 DocType: BOM Replace Tool,Replace,Заменить
@@ -3068,7 +3074,7 @@
 DocType: Sales Invoice,Paid Amount,Выплаченная сумма
 ,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,"Установка этого Адрес шаблон по умолчанию, поскольку нет никакого другого умолчанию"
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,"Установка этого Адрес шаблон по умолчанию, поскольку нет никакого другого умолчанию"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс счета в Дебете, запрещена установка 'Баланс должен быть' как 'Кредит'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Управление качеством
 DocType: Production Planning Tool,Filter based on customer,Фильтр на основе клиента
@@ -3169,7 +3175,7 @@
 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 +19,Shortage Qty,Нехватка Кол-во
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Состояние вариант {0} существует с теми же атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Состояние вариант {0} существует с теми же атрибутами
 DocType: Salary Slip,Salary Slip,Зарплата скольжения
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"Поле ""До Даты"" является обязательным для заполнения"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Создание упаковочные листы для пакетов будет доставлено. Используется для уведомления номер пакета, содержимое пакета и его вес."
@@ -3180,7 +3186,7 @@
 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 +749,It is needed to fetch Item Details.,Он необходим для извлечения Подробности Элемента.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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} уже существует
@@ -3206,6 +3212,7 @@
 DocType: BOM,Manufacturing User,Производство пользователя
 DocType: Purchase Order,Raw Materials Supplied,Давальческого сырья
 DocType: Purchase Invoice,Recurring Print Format,Периодическая Формат печати
+DocType: C-Form,Series,Серии значений
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,Ожидаемая дата поставки не может быть до заказа на Дата
 DocType: Appraisal,Appraisal Template,Оценка шаблона
 DocType: Item Group,Item Classification,Пункт Классификация
@@ -3292,7 +3299,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: запись Изменить порядок уже существует для этого склада {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.","Не можете объявить как потерял, потому что цитаты было сделано."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Покупка Мастер-менеджер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Производственный заказ {0} должны быть представлены
@@ -3300,7 +3307,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Основные отчеты
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,На сегодняшний день не может быть раньше от даты
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Добавить / Изменить цены
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Мои Заказы
@@ -3348,7 +3355,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Ряд # {0}: Установить Поставщик по пункту {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Сайт изображения {0} прикреплен к пункту {1} не может быть найден
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Сайт изображения {0} прикреплен к пункту {1} не может быть найден
 DocType: Issue,Content Type,Тип контента
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Компьютер
 DocType: Item,List this Item in multiple groups on the website.,Перечислите этот пункт в нескольких группах на веб-сайте.
@@ -3362,7 +3369,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,"""Имеет Серийный номер"" не может быть ""Да"" для не складской позиции"
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'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,Основной счет
@@ -3388,7 +3395,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Закрытие счета {0} должен быть типа ответственностью / собственный капитал
 DocType: Authorization Rule,Based On,На основании
 DocType: Sales Order Item,Ordered Qty,Заказал Кол-во
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Пункт {0} отключена
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Пункт {0} отключена
 DocType: Stock Settings,Stock Frozen Upto,Фото Замороженные До
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},Период с Период и датам обязательных для повторяющихся {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Проектная деятельность / задачи.
@@ -3396,7 +3403,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Покупка должна быть проверена, если выбран Применимо для как {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Скидка должна быть меньше 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Списание Сумма (Компания валют)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,"Ряд # {0}: Пожалуйста, установите количество тональный"
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,"Ряд # {0}: Пожалуйста, установите количество тональный"
 DocType: Landed Cost Voucher,Landed Cost Voucher,Земельные стоимости путевки
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Пожалуйста, установите {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Повторите с Днем Ежемесячно
@@ -3469,7 +3476,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Просмотр сейчас
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Выберите период, когда счет-фактура будет сгенерирован автоматически"
 DocType: BOM,Raw Material Cost,Сырье Стоимость
-DocType: Item,Re-Order Level,Re-ордера и уровней
+DocType: Item Reorder,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.,"Введите предметы и плановый Количество, для которых необходимо повысить производственные заказы или скачать сырье для анализа."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Неполная занятость
 DocType: Employee,Applicable Holiday List,Применимо Список праздников
@@ -3524,7 +3531,7 @@
 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 +573,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3603,7 +3610,7 @@
 DocType: Address,Office,Офис
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Журнал бухгалтерских записей.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно Кол-во на со склада
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,"Пожалуйста, выберите Employee Record первым."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,"Пожалуйста, выберите Employee Record первым."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,"Пожалуйста, введите Expense счет"
@@ -3678,7 +3685,7 @@
 DocType: Item Attribute,Numeric Values,Числовые значения
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Прикрепить логотип
 DocType: Customer,Commission Rate,Комиссия
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Сделать Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Сделать Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Блок отпуска приложений отделом.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Корзина Пусто
 DocType: Production Order,Actual Operating Cost,Фактическая Эксплуатационные расходы
@@ -3695,15 +3702,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Чтобы установить уровень повторного заказа, деталь должна быть Покупка товара или товара Производство"
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),(Полдня)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(Полдня)
 DocType: Supplier,Credit Days,Кредитные дней
 DocType: Leave Type,Is Carry Forward,Является ли переносить
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Получить элементов из спецификации
diff --git a/erpnext/translations/sk.csv b/erpnext/translations/sk.csv
index c9cb402..a8e353e 100644
--- a/erpnext/translations/sk.csv
+++ b/erpnext/translations/sk.csv
@@ -33,7 +33,7 @@
 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,Meno zákazníka
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Bankový účet nemôže byť menovaný ako {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Bankový účet nemôže byť menovaný ako {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Vynikající pro {0} nemůže být nižší než nula ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,New Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,New Leave Application
 apps/erpnext/erpnext/setup/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
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log činností vykonávaných uživateli proti úkoly, které mohou být použity pro sledování času, fakturaci."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Nový {0}: # {1}
 ,Sales Partners Commission,Obchodní partneři Komise
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Zkratka nesmí mít více než 5 znaků
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Zkratka nesmí mít více než 5 znaků
 DocType: Payment Request,Payment Request,Platba Dopyt
 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.",Atribút Hodnota {0} nemôže byť odstránený z {1} ako položka Varianty \ existovať tohto atribútu.
@@ -196,6 +196,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,Vyberte Podmienky
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,limitu
 DocType: Production Planning Tool,Sales Orders,Prodejní objednávky
 DocType: Purchase Taxes and Charges,Valuation,Ocenění
 ,Purchase Order Trends,Nákupní objednávka trendy
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televize
 DocType: Production Order Operation,Updated via 'Time Log',"Aktualizováno přes ""Time Log"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Účet {0} nepatří do společnosti {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Množstvo vopred nemôže byť väčšia ako {0} {1}
 DocType: Naming Series,Series List for this Transaction,Řada seznam pro tuto transakci
 DocType: Sales Invoice,Is Opening Entry,Je vstupní otvor
 DocType: Customer Group,Mention if non-standard receivable account applicable,Zmienka v prípade neštandardnej pohľadávky účet použiteľná
@@ -227,7 +229,7 @@
 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/templates/generators/item.html +30,No description given,Bez popisu
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Žádost o koupi.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/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&gt; Nastavenia&gt; Naming Séria
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Sklad {0} nepatří ke společnosti {1}
 DocType: Item Website Specification,Item Website Specification,Položka webových stránek Specifikace
 DocType: Payment Tool,Reference No,Referenční číslo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Nechte Blokováno
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Nechte Blokováno
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,Annual,Roční
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Reklamní Odsouhlasení Item
 DocType: Stock Entry,Sales Invoice No,Prodejní faktuře č
@@ -249,7 +251,7 @@
 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 +606,Item {0} is cancelled,Položka {0} je zrušená
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Položka {0} je zrušená
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Požadavek na materiál
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizace Výprodej Datum
 DocType: Item,Purchase Details,Nákup Podrobnosti
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Dodací list
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Nastavenie Dane
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} vložené dvakrát v Daňovej Položke
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} vložené dvakrát v Daňovej Položke
 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
@@ -329,7 +331,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Vaša e-mailová adresa
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,"Prosím, viz příloha"
 DocType: Purchase Order,% Received,% Prijaté
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Setup již dokončen !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Setup již dokončen !!
 ,Finished Goods,Hotové zboží
 DocType: Delivery Note,Instructions,Instrukce
 DocType: Quality Inspection,Inspected By,Zkontrolován
@@ -354,14 +356,13 @@
 ,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 +169,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), musí mať úlohu ""Schvalovateľ voľna"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), musí mať úlohu ""Schvalovateľ voľna"""
 DocType: Purchase Receipt,Vehicle Date,Dátum Vehicle
 apps/erpnext/erpnext/setup/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
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation je uzavřena v následujících dnech podle Prázdninový Seznam: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Príležitosti
 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čne
@@ -390,7 +391,7 @@
 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 +564,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 +550,Attribute {0} selected multiple times in Attributes Table,Atribút {0} vybraný niekoľkokrát v atribútoch tabuľke
 DocType: HR Settings,Employee record is created using selected field. ,Záznam Zaměstnanec je vytvořena pomocí vybrané pole.
 DocType: Sales Order,Not Applicable,Nehodí se
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Holiday master.
@@ -429,7 +430,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"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: Shipping Rule,Net Weight,Hmotnost
 DocType: Employee,Emergency Phone,Nouzový telefon
 ,Serial No Warranty Expiry,Pořadové č záruční lhůty
@@ -440,7 +441,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Správa Subdodávky
 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}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Účet {0} nepatří k firmě: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Skratka už použitý pre inú spoločnosť
 DocType: Selling Settings,Default Customer Group,Výchozí Customer Group
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Je-li zakázat, ""zaokrouhlí celková"" pole nebude viditelný v jakékoli transakce"
 DocType: BOM,Operating Cost,Provozní náklady
@@ -474,6 +476,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Nalezené v tabulce faktury Žádné záznamy
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vyberte první společnost a Party Typ
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Finanční / Účetní rok.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,neuhradená Hodnoty
 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"
 DocType: Project Task,Project Task,Úloha Project
 ,Lead Id,Id Obchodnej iniciatívy
@@ -495,7 +498,7 @@
 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/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Východzí merná jednotka bodu {0} nemôže byť zmenená priamo, pretože ste už nejaké transakcie (y) s iným nerozpustených. Budete musieť vytvoriť novú položku použiť iný predvolený UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Východzí merná jednotka bodu {0} nemôže byť zmenená priamo, pretože ste už nejaké transakcie (y) s iným nerozpustených. Budete musieť vytvoriť novú položku použiť iný predvolený UOM."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Přidělená částka nemůže být záporná
 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."
@@ -573,7 +576,7 @@
 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 +543,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -586,6 +589,7 @@
 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 +33,Goods received from Suppliers.,Zboží od dodavatelů.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,v Hodnota
 DocType: Lead,Campaign Name,Název kampaně
 ,Reserved,Rezervováno
 DocType: Purchase Order,Supply Raw Materials,Dodávok surovín
@@ -600,16 +604,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Účet s transakcemi nelze převést na hlavní účetní knihu
 DocType: Delivery Note,Customer's Purchase Order No,Zákazníka Objednávka No
 DocType: Employee,Cell Number,Číslo buňky
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Žiadosti Auto materiál vygenerovaný
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Žiadosti Auto materiál vygenerovaný
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Ztracený
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,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/setup_wizard/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í.
 DocType: Item Group,Website Specifications,Webových stránek Specifikace
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Tam je chyba v adrese šablóne {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Nový účet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} typu {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Viac Cena pravidlá existuje u rovnakých kritérií, prosím vyriešiť konflikt tým, že priradí prioritu. Cena Pravidlá: {0}"
 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.,Účtovné Prihlášky možno proti koncovej uzly. Záznamy proti skupinám nie sú povolené.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nelze deaktivovat nebo zrušit BOM, jak to souvisí s ostatními kusovníky"
 DocType: Opportunity,Maintenance,Údržba
@@ -671,7 +677,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,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/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Varovanie: Neplatná Príloha {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Varovanie: Neplatná Príloha {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nemáte oprávnenie
 DocType: Company,Default Bank Account,Prednastavený Bankový účet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Ak chcete filtrovať na základe Party, vyberte typ Party prvý"
@@ -701,13 +707,13 @@
 DocType: Production Planning Tool,Select Items,Vyberte položky
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} proti účtu {1} z dňa {2}
 DocType: Maintenance Visit,Completion Status,Dokončení Status
-DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
+DocType: Production Order,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 +50,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/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 / strata
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} stav je {2}
@@ -715,7 +721,7 @@
 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 +247,Item Variant {0} already exists with same attributes,Variant Položky {0} už existuje s rovnakými vlastnosťami
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,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',"""Otváranie"""
 DocType: Notification Control,Delivery Note Message,Delivery Note Message
 DocType: Expense Claim,Expenses,Výdaje
@@ -725,7 +731,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Výzkum a vývoj
 ,Amount to Bill,Částka k Fakturaci
 DocType: Company,Registration Details,Registrace Podrobnosti
-DocType: Item,Re-Order Qty,Re-Order Množství
+DocType: Item Reorder,Re-Order Qty,Re-Order Množství
 DocType: Leave Block List Date,Leave Block List Date,Nechte Block List Datum
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Plánované poslat na {0}
 DocType: Pricing Rule,Price or Discount,Cena nebo Sleva
@@ -768,7 +774,7 @@
 DocType: Bank Reconciliation,Total Amount,Celková částka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Výrobní Objednávky
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Zůstatek Hodnota
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Zůstatek Hodnota
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Sales Ceník
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikování synchronizovat položky
 DocType: Bank Reconciliation,Account Currency,Mena účtu
@@ -777,7 +783,7 @@
 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 +538,Item Variants {0} updated,Varianty Položky {0} aktualizované
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -854,7 +860,7 @@
 DocType: POS Profile,Cash/Bank Account,Hotovostný / Bankový účet
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Atribút tabuľka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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 byť záporné
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Sleva
@@ -882,7 +888,7 @@
 DocType: Tax Rule,Shipping State,Prepravné State
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Položka musí být přidány pomocí ""získat předměty z kupní příjmy"" tlačítkem"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Prodejní náklady
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Standardní Nakupování
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Standardní Nakupování
 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
@@ -924,7 +930,7 @@
 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 +210,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/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Prosím nastavte na &quot;Použiť dodatočnú zľavu On&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Prosím nastavte na &quot;Použiť dodatočnú zľavu On&quot;
 ,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.
@@ -992,9 +998,9 @@
 DocType: Contact,User ID,User ID
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,View Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Nejstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Výroba na odběratele
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Zbytek světa
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1024,7 +1030,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Malý
 DocType: Employee,Employee Number,Počet zaměstnanců
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Případ číslo (čísla) již v provozu. Zkuste se věc č {0}
@@ -1043,7 +1049,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Poľnohospodárstvo
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Vaše Produkty alebo Služby
 DocType: Mode of Payment,Mode of Payment,Způsob platby
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Webové stránky Image by mala byť verejná súboru alebo webovej stránky URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Webové stránky Image by mala byť verejná súboru alebo webovej stránky URL
 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
@@ -1115,6 +1121,7 @@
 DocType: Address,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,Účtovníctvo
 DocType: Features Setup,Features Setup,Nastavení Funkcí
+DocType: Item,Is Service Item,Je Service Item
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Obdobie podávania žiadostí nemôže byť alokačné obdobie vonku voľno
 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"
@@ -1145,7 +1152,7 @@
 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 +465,cannot be greater than 100,nemôže byť väčšie ako 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Položka {0} není skladem
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1205,7 +1212,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Vláda
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Varianty Položky
 DocType: Company,Services,Služby
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Celkem ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Celkem ({0})
 DocType: Cost Center,Parent Cost Center,Nadřazené Nákladové středisko
 DocType: Sales Invoice,Source,Zdroj
 DocType: Leave Type,Is Leave Without Pay,Je odísť bez Pay
@@ -1278,17 +1285,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Znovu poslať e-mail Payment
 DocType: Dependent Task,Dependent Task,Závislý Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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í
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Zobraziť
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Čistá zmena v hotovosti
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Čistá zmena v hotovosti
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plat Struktura Odpočet
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Platba Dopyt už existuje {0}
 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 +182,Quantity must not be more than {0},Množství nesmí být větší než {0}
@@ -1350,7 +1357,7 @@
 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: Packed 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,Nastavenia pre Predaj
@@ -1359,7 +1366,7 @@
 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ý"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Marketingové náklady
 ,Item Shortage Report,Položka Nedostatek Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnost je uvedeno, \n uveďte prosím ""váha UOM"" příliš"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnost je uvedeno, \n uveďte prosím ""váha UOM"" příliš"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiál Žádost používá k výrobě této populace Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Single jednotka položky.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',"Time Log Batch {0} musí být ""Odesláno"""
@@ -1370,6 +1377,7 @@
 DocType: Employee,Date Of Retirement,Datum odchodu do důchodu
 DocType: Upload Attendance,Get Template,Získat šablonu
 DocType: Address,Postal,Poštovní
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 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ů"
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,"Prosím, vyberte {0} jako první."
@@ -1398,12 +1406,12 @@
 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 +139,Main,Hlavné
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Hlavné
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Varianta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
 DocType: Employee Attendance Tool,Employees HTML,Zamestnanci HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,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 +367,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/stock/doctype/item/item.py +361,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
@@ -1428,7 +1436,6 @@
 DocType: Sales Order,To Deliver and Bill,Dodať a Bill
 DocType: GL Entry,Credit Amount in Account Currency,Kreditné Čiastka v mene účtu
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Čas Protokoly pre výrobu.
-DocType: Item,Apply Warehouse-wise Reorder Level,Použít Skladovací-moudrý Seřadit sezn Level
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} musí být předloženy
 DocType: Authorization Control,Authorization Control,Autorizace Control
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Riadok # {0}: zamietnutie Warehouse je povinná proti zamietnutej bodu {1}
@@ -1527,6 +1534,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,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/hr/doctype/leave_type/leave_type.js +3,Allocations,alokácie
 DocType: Quality Inspection Reading,Acceptance Criteria,Kritéria přijetí
 DocType: Item Attribute,Attribute Name,Název atributu
 DocType: Item Group,Show In Website,Show pro webové stránky
@@ -1577,7 +1585,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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
 DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Skrátená nemôže byť prázdne alebo priestor
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Skrátená nemôže byť prázdne alebo priestor
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Skupina na Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportovní
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Celkem Aktuální
@@ -1618,7 +1626,7 @@
 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**.,** Fiškálny rok ** predstavuje finančný rok. Všetky účtovné záznamy a ďalšie významné transakcie sú sledované pod ** Fiškálny rok **.
 DocType: Opportunity,Customer / Lead Address,Zákazník / Iniciatíva Adresa
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Varovanie: Neplatný certifikát SSL na prílohu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Varovanie: Neplatný certifikát SSL na prílohu {0}
 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
@@ -1767,7 +1775,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Případ č nemůže být 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,"Máte-li prodejní tým a prodej Partners (obchodních partnerů), které mohou být označeny a udržovat svůj příspěvek v prodejní činnosti"
 DocType: Item,Show a slideshow at the top of the page,Ukazují prezentaci v horní části stránky
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Obchody
+DocType: Item,"Allow in Sales Order of type ""Service""",Povoliť v predajnej objednávke typu &quot;služby&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Obchody
 DocType: Time Log,Projects Manager,Správce projektů
 DocType: Serial No,Delivery Time,Dodací lhůta
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Stárnutí dle
@@ -1792,7 +1801,7 @@
 ,Financial Analytics,Finanční Analýza
 DocType: Quality Inspection,Verified By,Verified By
 DocType: Address,Subsidiary,Dceřiný
-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.","Nelze změnit výchozí měně společnosti, protože tam jsou stávající transakce. Transakce musí být zrušena, aby změnit výchozí měnu."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nelze změnit výchozí měně společnosti, protože tam jsou stávající transakce. Transakce musí být zrušena, aby změnit výchozí měnu."
 DocType: Quality Inspection,Purchase Receipt No,Číslo příjmky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
 DocType: Process Payroll,Create Salary Slip,Vytvořit výplatní pásce
@@ -1840,7 +1849,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Nie je možné aktualizovať zásob, faktúra obsahuje pokles lodnej dopravy tovaru."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 &quot;Má sériové číslo&quot;, &quot;má Batch Nie&quot;, &quot;Je skladom&quot; a &quot;ocenenie Method&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Rýchly vstup Journal
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
@@ -1949,7 +1958,7 @@
 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,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/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Výprodej Datum není uvedeno
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Výroba
 DocType: Item,Allow Production Order,Povolit výrobní objednávky
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,"Row {0}: datum zahájení, musí být před koncem roku Datum"
@@ -1959,7 +1968,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 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 +118,My Addresses,Moje Adresy
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Moje Adresy
 DocType: Stock Ledger Entry,Outgoing Rate,Odchádzajúce Rate
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Organizace větev master.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,alebo
@@ -2028,7 +2037,7 @@
 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 +302,New Cost Center Name,Názov nového nákladového strediska
 DocType: Leave Control Panel,Leave Control Panel,Nechte Ovládací panely
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,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."
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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
 DocType: Purchase Invoice,Taxes and Charges Deducted,Daně a odečtené
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Problémy
@@ -2045,7 +2054,7 @@
 ,Sales Browser,Sales Browser
 DocType: Journal Entry,Total Credit,Celkový Credit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Upozornenie: Ďalším {0} # {1} existuje proti akciovej vstupu {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Místní
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Veľký
@@ -2064,7 +2073,6 @@
 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/stock/doctype/item/item.py +422,Please set reorder quantity,Prosím nastavte množstvo objednávacie
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,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
@@ -2151,7 +2159,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Získat příslušné zápisy
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Účetní položka na skladě
 DocType: Sales Invoice,Sales Team1,Sales Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Bod {0} neexistuje
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Bod {0} neexistuje
 DocType: Sales Invoice,Customer Address,Zákazník Address
 DocType: Payment Request,Recipient and Message,Príjemca a správ
 DocType: Purchase Invoice,Apply Additional Discount On,Použiť dodatočné Zľava na
@@ -2193,7 +2201,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Ocenění Rate
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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,Premenovať Log
@@ -2231,7 +2239,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Zadejte zmírnění datum.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Nechte pouze aplikace s status ""schváleno"" může být předloženy"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Adresa Název je povinný.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Adresa Název je povinný.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Zadejte název kampaně, pokud zdroj šetření je kampaň"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Vydavatelia novín
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vyberte Fiskální rok
@@ -2255,6 +2263,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: Sales Invoice Item,Customer Warehouse (Optional),Zákazník Warehouse (voliteľne)
 DocType: Pricing Rule,Discount Percentage,Sleva v procentech
 DocType: Payment Reconciliation Invoice,Invoice Number,Číslo faktúry
 apps/erpnext/erpnext/hooks.py +55,Orders,Objednávky
@@ -2364,7 +2373,7 @@
 DocType: Appraisal,Appraisal,Ocenění
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum se opakuje
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Prokurista
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,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 +184,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: Workstation Working Hour,Start Time,Start Time
@@ -2533,7 +2542,7 @@
 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
 DocType: Sales Order Item,Supplier delivers to Customer,Dodávateľ doručí zákazníkovi
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Show daň break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Show daň break-up
 apps/erpnext/erpnext/accounts/party.py +283,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í"""
@@ -2583,7 +2592,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,Prosím re-typ názov spoločnosti na potvrdenie
@@ -2610,9 +2619,6 @@
 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í
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Plat struktura
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Multiple Cena existuje pravidlo se stejnými kritérii, prosím vyřešit \
- konflikt přiřazením prioritu. Cena Pravidla: {0}"
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Letecká linka
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Vydání Material
@@ -2637,7 +2643,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Cenné papíry a komoditních burzách
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Východzí merná jednotka varianty &#39;{0}&#39; musí byť rovnaký ako v Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Východzí merná jednotka varianty &#39;{0}&#39; musí byť rovnaký ako v Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Vypočítat založené na
 DocType: Delivery Note Item,From Warehouse,Zo skladu
 DocType: Purchase Taxes and Charges,Valuation and Total,Oceňování a Total
@@ -2646,7 +2652,7 @@
 DocType: Account,Purchase User,Nákup Uživatel
 DocType: Notification Control,Customize the Notification,Přizpůsobit oznámení
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Cash flow z prevádzkových činností
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Výchozí šablony adresy nemůže být smazán
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Výchozí šablony adresy nemůže být smazán
 DocType: Sales Invoice,Shipping Rule,Přepravní Pravidlo
 DocType: Manufacturer,Limited to 12 characters,Obmedzené na 12 znakov
 DocType: Journal Entry,Print Heading,Tisk záhlaví
@@ -2740,7 +2746,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,Obchodní
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Skvelé služby
@@ -2759,7 +2765,7 @@
 DocType: Customer,Default Receivable Accounts,Výchozí pohledávka účty
 DocType: Tax Rule,Billing State,Fakturácia State
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Převod
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,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 +642,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 +95,Due Date is mandatory,Dátum splatnosti je povinné
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Prírastok pre atribút {0} nemôže byť 0
@@ -2792,7 +2798,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Prozatímní Zisk / ztráta (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Prozatímní Zisk / ztráta (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Návrat proti predajnej faktúre
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Bod 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Prosím nastavte výchozí hodnotu {0} ve společnosti {1}
@@ -2823,6 +2829,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Přidat dítě
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Role povoleno nastavit zmrazené účty a upravit Mražené Příspěvky
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Nelze převést nákladového střediska na knihy, protože má podřízené uzly"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,otvorenie Value
 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,Provize z prodeje
 DocType: Offer Letter Term,Value / Description,Hodnota / Popis
@@ -2856,7 +2863,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Úspešne vypúšťa všetky transakcie súvisiace s týmto spoločnosti!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Rovnako ako u Date
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Zkouška
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Výchozí Sklad je povinný pro živočišnou položky.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Platba platu za měsíc {0} a rok {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto vložka Cenník miera, ak chýba"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Celkem uhrazené částky
@@ -2892,7 +2898,7 @@
 DocType: Payment Tool,Set Matching Amounts,Nastaviť Zodpovedajúce Sumy
 DocType: Purchase Invoice,Taxes and Charges Added,Daně a poplatky přidané
 ,Sales Funnel,Prodej Nálevka
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Skratka je povinné
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Skratka je povinné
 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.,Ponuka z Obchodnej Iniciatívy alebo pre Zákazníka
@@ -2920,7 +2926,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} je zastavený
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Pripravované akcie
@@ -2943,7 +2949,7 @@
 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 +458,POS Profile required to make POS Entry,"POS Profile požadované, aby POS Vstup"
 DocType: Hub Settings,Name Token,Názov Tokenu
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Standardní prodejní
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Standardní prodejní
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -3066,7 +3072,7 @@
 DocType: Sales Invoice,Paid Amount,Uhrazené částky
 ,Available Stock for Packing Items,K dispozici skladem pro balení položek
 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/utilities/doctype/address_template/address_template.py +16,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 +113,"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/setup_wizard/install_fixtures.py +76,Quality Management,Řízení kvality
 DocType: Production Planning Tool,Filter based on customer,Filtr dle zákazníka
@@ -3167,7 +3173,7 @@
 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),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 +578,Item variant {0} exists with same attributes,Variant Položky {0} existuje s rovnakými vlastnosťami
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Datum Do"" je povinný"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generování balení pásky pro obaly mají být dodány. Používá se k oznámit číslo balíku, obsah balení a jeho hmotnost."
@@ -3178,7 +3184,7 @@
 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álne nastavenia
 DocType: Employee Education,Employee Education,Vzdělávání zaměstnanců
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,"Je potrebné, aby priniesla Detaily položky."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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
@@ -3204,6 +3210,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úce Print Format
+DocType: C-Form,Series,Série
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,Položka Klasifikace
@@ -3290,7 +3297,7 @@
 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 +434,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 +420,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."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nákup Hlavní manažer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Výrobní zakázka {0} musí být předloženy
@@ -3298,7 +3305,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Hlavné správy
 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
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Pridať / Upraviť ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,Pridať / Upraviť 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 +315,My Orders,Moje objednávky
@@ -3346,7 +3353,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Riadok # {0}: Nastavte Dodávateľ pre položku {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Webové stránky Image {0} pripája k bodu {1} nemožno nájsť
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Webové stránky Image {0} pripája k bodu {1} nemožno nájsť
 DocType: Issue,Content Type,Typ obsahu
 apps/erpnext/erpnext/setup/setup_wizard/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.
@@ -3360,7 +3367,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemôže byť ""áno"" pre neskladový tovar"
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemôže byť ""áno"" pre neskladový tovar"
 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
@@ -3386,7 +3393,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Záverečný účet {0} musí byť typu zodpovednosti / Equity
 DocType: Authorization Rule,Based On,Založeno na
 DocType: Sales Order Item,Ordered Qty,Objednáno Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Položka {0} je zakázaná
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +168,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.
@@ -3394,7 +3401,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Nákup musí být zkontrolováno, v případě potřeby pro vybrán jako {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Sleva musí být menší než 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Odpísať Suma (Company meny)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Riadok # {0}: Prosím nastavte množstvo objednávacie
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Riadok # {0}: Prosím nastavte množstvo objednávacie
 DocType: Landed Cost Voucher,Landed Cost Voucher,Přistálo Náklady Voucher
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Prosím nastavte {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Opakujte na den v měsíci
@@ -3467,7 +3474,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Zobrazit nyní
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Vyberte období, kdy faktura budou generovány automaticky"
 DocType: BOM,Raw Material Cost,Cena surovin
-DocType: Item,Re-Order Level,Re-Order Level
+DocType: Item Reorder,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."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Použitelný Seznam Svátků
@@ -3522,7 +3529,7 @@
 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 +573,Please specify Attribute Value for attribute {0},Uveďte atribútu Hodnota atribútu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3601,7 +3608,7 @@
 DocType: Address,Office,Kancelář
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Zápisy v účetním deníku.
 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 +226,Please select Employee Record first.,"Prosím, vyberte zamestnanca záznam prvý."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,"Prosím, vyberte zamestnanca záznam prvý."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
@@ -3676,7 +3683,7 @@
 DocType: Item Attribute,Numeric Values,Číselné hodnoty
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Pripojiť Logo
 DocType: Customer,Commission Rate,Výše provize
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Vytvoriť Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Vytvoriť Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Aplikace Block dovolené podle oddělení.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Košík je prázdny
 DocType: Production Order,Actual Operating Cost,Skutečné provozní náklady
@@ -3693,15 +3700,14 @@
 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 +380,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 +419,"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 +408,"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.,Neukazovať žiadny symbol ako $ atď vedľa meny.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Pol dňa)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(Pol dňa)
 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 +566,Get Items from BOM,Získat předměty z BOM
diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv
index dff30d7..b542672 100644
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv
@@ -33,7 +33,7 @@
 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
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Bančni račun ne more biti imenovan kot {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Bančni račun ne more biti imenovan kot {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Izjemna za {0} ne more biti manjša od nič ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,New Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,New Leave Application
 apps/erpnext/erpnext/setup/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
@@ -82,7 +82,7 @@
 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 +129,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/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Kratica ne more imeti več kot 5 znakov
 DocType: Payment Request,Payment Request,Plačilo Zahteva
 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.
@@ -195,6 +195,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,Izberite Pogoji
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,iz Vrednost
 DocType: Production Planning Tool,Sales Orders,Prodajni Naročila
 DocType: Purchase Taxes and Charges,Valuation,Vrednotenje
 ,Purchase Order Trends,Naročilnica Trendi
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizija
 DocType: Production Order Operation,Updated via 'Time Log',Posodobljeno preko &quot;Čas Logu&quot;
 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}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Advance znesek ne sme biti večja od {0} {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"
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Ustvari plačilni list za zgoraj omenjenih kriterijev.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Opis ni dana
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Zaprosi za nakup.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/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&gt; Nastavitve&gt; za poimenovanje Series"
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Skladišče {0} ne pripada podjetju {1}
 DocType: Item Website Specification,Item Website Specification,Element Spletna stran Specifikacija
 DocType: Payment Tool,Reference No,Referenčna številka
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Pustite blokiranih
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Pustite blokiranih
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Postavka {0} je konec življenja na {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Letno
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Sprava Postavka
 DocType: Stock Entry,Sales Invoice No,Prodaja Račun Ne
@@ -248,7 +250,7 @@
 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 +606,Item {0} is cancelled,Postavka {0} je odpovedan
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Postavka {0} je odpovedan
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Material Zahteva
 DocType: Bank Reconciliation,Update Clearance Date,Posodobitev Potrditev Datum
 DocType: Item,Purchase Details,Nakup Podrobnosti
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Poročilo o dostavi
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Postavitev Davki
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} dvakrat vpisana v postavki davku
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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"
@@ -327,7 +329,7 @@
 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 +215,Please see attachment,Glej prilogo
 DocType: Purchase Order,% Received,% Prejeto
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Setup Že Complete !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Setup Že Complete !!
 ,Finished Goods,"Končnih izdelkov,"
 DocType: Delivery Note,Instructions,Navodila
 DocType: Quality Inspection,Inspected By,Pregledajo
@@ -352,14 +354,13 @@
 ,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 +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mora imeti vlogo &quot;Leave odobritelj&quot;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mora imeti vlogo &quot;Leave odobritelj&quot;
 DocType: Purchase Receipt,Vehicle Date,Datum vozilo
 apps/erpnext/erpnext/setup/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/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}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Priložnosti
 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
@@ -388,7 +389,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli
 DocType: HR Settings,Employee record is created using selected field. ,Evidenco o zaposlenih delavcih je ustvarjena s pomočjo izbrano polje.
 DocType: Sales Order,Not Applicable,Se ne uporablja
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Holiday gospodar.
@@ -427,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Kozmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"To merge, following properties must be same for both items","Za pripojitev, mora naslednje lastnosti biti enaka za oba predmetov"
 DocType: Shipping Rule,Net Weight,Neto teža
 DocType: Employee,Emergency Phone,Zasilna Telefon
 ,Serial No Warranty Expiry,Zaporedna številka Garancija preteka
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Upravljanje Podizvajalci
 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}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Račun {0} ne pripada podjetju: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Kratica že uporabljajo za druge družbe
 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 &quot;zaokrožena Skupaj &#39;ne bo viden v vsakem poslu"
 DocType: BOM,Operating Cost,Obratovalni stroški
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +89,Financial / accounting year.,Finančni / računovodstvo leto.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,nakopičene Vrednosti
 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"
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Svinec Id
@@ -492,7 +495,7 @@
 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/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Privzeto mersko enoto za postavko {0} ni mogoče neposredno spremeniti, ker ste že naredili nekaj transakcije (-e) z drugo UOM. Boste morali ustvariti nov element, da uporabi drugačno Privzeti UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Privzeto mersko enoto za postavko {0} ni mogoče neposredno spremeniti, ker ste že naredili nekaj transakcije (-e) z drugo UOM. Boste morali ustvariti nov element, da uporabi drugačno Privzeti UOM."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Dodeljen znesek ne more biti negativna
 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."
@@ -570,7 +573,7 @@
 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 +543,Item has variants.,Element ima variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -583,6 +586,7 @@
 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 +33,Goods received from Suppliers.,"Blago, prejetih od dobaviteljev."
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,v vrednosti
 DocType: Lead,Campaign Name,Ime kampanje
 ,Reserved,Rezervirano
 DocType: Purchase Order,Supply Raw Materials,Oskrba z Surovine
@@ -597,16 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,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/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Material Zahteve Izdelano
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Auto Material Zahteve Izdelano
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Lost
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,"Ne, ne more vstopiti trenutno bon v &quot;Proti listu vstopa&quot; stolpcu"
 apps/erpnext/erpnext/setup/setup_wizard/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/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Prišlo je do napake v vašem Naslov predlogo {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,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 +274,Row {0}: Conversion Factor is mandatory,Vrstica {0}: Factor Pretvorba je obvezna
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Več Cena Pravila obstaja z enakimi merili, se rešujejo spore z dodelitvijo prednost. Cena Pravila: {0}"
 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.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,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
@@ -649,7 +655,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,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/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Opozorilo: Invalid Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Opozorilo: Invalid Attachment {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ne Dovoljenje
 DocType: Company,Default Bank Account,Privzeti bančni račun
 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"
@@ -679,13 +685,13 @@
 DocType: Production Planning Tool,Select Items,Izberite Items
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} proti Bill {1} dne {2}
 DocType: Maintenance Visit,Completion Status,Zaključek Status
-DocType: Sales Invoice Item,Target Warehouse,Ciljna Skladišče
+DocType: Production Order,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 +50,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/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/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status {2}
@@ -693,7 +699,7 @@
 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 +247,Item Variant {0} already exists with same attributes,Postavka Variant {0} že obstaja z enakimi atributi
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,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',&quot;Odpiranje&quot;
 DocType: Notification Control,Delivery Note Message,Dostava Opomba Sporočilo
 DocType: Expense Claim,Expenses,Stroški
@@ -703,7 +709,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Raziskave in razvoj
 ,Amount to Bill,Znesek za Bill
 DocType: Company,Registration Details,Registracija Podrobnosti
-DocType: Item,Re-Order Qty,Ponovno naročila Kol
+DocType: Item Reorder,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
@@ -746,7 +752,7 @@
 DocType: Bank Reconciliation,Total Amount,Skupni znesek
 apps/erpnext/erpnext/setup/setup_wizard/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/stock_balance/stock_balance.py +53,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: Bank Reconciliation,Account Currency,Valuta računa
@@ -755,7 +761,7 @@
 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 +538,Item Variants {0} updated,Postavka Variante {0} posodobljen
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -832,7 +838,7 @@
 DocType: POS Profile,Cash/Bank Account,Gotovina / bančni račun
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Lastnost miza je obvezna
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Popust
@@ -860,7 +866,7 @@
 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 &quot;dobili predmetov iz nakupu prejemki&quot; 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/setup_wizard/setup_wizard.py +134,Standard Buying,Standardna Nakup
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,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
@@ -902,7 +908,7 @@
 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 +210,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/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Prosim nastavite &quot;Uporabi dodatni popust na &#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Prosim nastavite &quot;Uporabi dodatni popust na &#39;
 ,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.
@@ -970,9 +976,9 @@
 DocType: Contact,User ID,Uporabniško ime
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Ogled Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najzgodnejša
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Izdelava zoper Sales Order
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Ostali svet
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1002,7 +1008,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Oprostite, podjetja ne morejo biti združeni"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Oprostite, podjetja ne morejo biti združeni"
 apps/erpnext/erpnext/setup/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}
@@ -1021,7 +1027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Kmetijstvo
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Svoje izdelke ali storitve
 DocType: Mode of Payment,Mode of Payment,Način plačila
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Spletna stran Slika bi morala biti javna datoteka ali spletna stran URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Spletna stran Slika bi morala biti javna datoteka ali spletna stran URL
 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
@@ -1093,6 +1099,7 @@
 DocType: Address,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,Računovodstvo
 DocType: Features Setup,Features Setup,Značilnosti Setup
+DocType: Item,Is Service Item,Je Service Postavka
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Prijavni rok ne more biti obdobje dodelitve izven dopusta
 DocType: Activity Cost,Projects,Projekti
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Prosimo, izberite poslovno leto"
@@ -1123,7 +1130,7 @@
 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 +465,cannot be greater than 100,ne more biti večja kot 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Postavka {0} ni zaloge Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1182,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Vlada
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Artikel Variante
 DocType: Company,Services,Storitve
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Skupaj ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,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
@@ -1255,17 +1262,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ponovno pošlji plačila Email
 DocType: Dependent Task,Dependent Task,Odvisna Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Pogled
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Neto sprememba v gotovini
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Neto sprememba v gotovini
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plača Struktura Odbitek
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Plačilo Zahteva že obstaja {0}
 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 +182,Quantity must not be more than {0},Količina ne sme biti več kot {0}
@@ -1327,7 +1334,7 @@
 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: Packed 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
@@ -1336,7 +1343,7 @@
 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 +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Teža je omenjeno, \ nProsim omenja &quot;Teža UOM&quot; preveč"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Teža je omenjeno, \ nProsim omenja &quot;Teža UOM&quot; 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 +217,Time Log Batch {0} must be 'Submitted',Čas Log Serija {0} je treba &quot;Submitted&quot;
@@ -1347,6 +1354,7 @@
 DocType: Employee,Date Of Retirement,Datum upokojitve
 DocType: Upload Attendance,Get Template,Get predlogo
 DocType: Address,Postal,Postal
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 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"
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,"Prosimo, izberite {0} prvi."
@@ -1375,12 +1383,12 @@
 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 +139,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Main
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavite predpona za številčenje serij na vaše transakcije
 DocType: Employee Attendance Tool,Employees HTML,zaposleni HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,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 +367,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/stock/doctype/item/item.py +361,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
@@ -1405,7 +1413,6 @@
 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 +425,BOM {0} must be submitted,BOM {0} je treba predložiti
 DocType: Authorization Control,Authorization Control,Pooblastilo za nadzor
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Vrstica # {0}: zavrnitev Skladišče je obvezno proti zavrnil postavki {1}
@@ -1503,6 +1510,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,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/hr/doctype/leave_type/leave_type.js +3,Allocations,dodelitve
 DocType: Quality Inspection Reading,Acceptance Criteria,Merila sprejemljivosti
 DocType: Item Attribute,Attribute Name,Ime atributa
 DocType: Item Group,Show In Website,Pokaži V Website
@@ -1553,7 +1561,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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
 DocType: Leave Block List Allow,Leave Block List Allow,Pustite Block List Dovoli
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr ne more biti prazen ali prostor
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr ne more biti prazen ali prostor
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Skupina Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Šport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Skupaj Actual
@@ -1594,7 +1602,7 @@
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Opozorilo: Neveljavno potrdilo SSL za pritrditev {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Opozorilo: Neveljavno potrdilo SSL za pritrditev {0}
 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
@@ -1743,7 +1751,8 @@
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Trgovine
+DocType: Item,"Allow in Sales Order of type ""Service""",Dovoli na Sales Order tipa &quot;službe&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,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"
@@ -1768,7 +1777,7 @@
 ,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."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"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: Process Payroll,Create Salary Slip,Ustvarite plačilnega lista
@@ -1816,7 +1825,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Surovine ne more biti prazno.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Ni mogel posodobiti vozni park, faktura vsebuje padec element ladijskega prometa."
 DocType: Newsletter,Test,Testna
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 &quot;Ima Zaporedna številka&quot;, &quot;Ima serija ni &#39;,&quot; je Stock Postavka &quot;in&quot; metoda vrednotenja &quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Hitro Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Vi stopnje ni mogoče spremeniti, če BOM omenjeno agianst vsako postavko"
@@ -1905,7 +1914,7 @@
 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/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Potrditev Datum ni omenjena
 apps/erpnext/erpnext/setup/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
@@ -1915,7 +1924,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 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 +118,My Addresses,Moji Naslovi
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Moji Naslovi
 DocType: Stock Ledger Entry,Outgoing Rate,Odhodni Rate
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Organizacija podružnica gospodar.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,ali
@@ -1984,7 +1993,7 @@
 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 +302,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 +95,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&gt; Printing in Branding&gt; Naslov predlogo."
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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&gt; Printing in Branding&gt; 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 +36,Issues,Vprašanja
@@ -2001,7 +2010,7 @@
 ,Sales Browser,Prodaja Browser
 DocType: Journal Entry,Total Credit,Skupaj Credit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Opozorilo: Drug {0} # {1} obstaja pred vstopom parka {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Lokalno
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Velika
@@ -2020,7 +2029,6 @@
 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/stock/doctype/item/item.py +422,Please set reorder quantity,"Prosim, nastavite naročniško količino"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,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
@@ -2095,7 +2103,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Pridobite ustreznimi vnosi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Računovodstvo Vstop za zalogi
 DocType: Sales Invoice,Sales Team1,Prodaja TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Element {0} ne obstaja
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Element {0} ne obstaja
 DocType: Sales Invoice,Customer Address,Stranka Naslov
 DocType: Payment Request,Recipient and Message,Prejemnika in sporočilo
 DocType: Purchase Invoice,Apply Additional Discount On,Uporabi dodatni popust na
@@ -2137,7 +2145,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Oceni Vrednotenje
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 &quot;nakup prejemki&quot;
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,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 +155,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
@@ -2175,7 +2183,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Vnesite lajšanje datum.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Pustite samo aplikacije s statusom &quot;Approved&quot; mogoče predložiti
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Naslov Naslov je obvezen.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,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/setup_wizard/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
@@ -2199,6 +2207,7 @@
 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: Sales Invoice Item,Customer Warehouse (Optional),Skladišče stranka (po želji)
 DocType: Pricing Rule,Discount Percentage,Popust Odstotek
 DocType: Payment Reconciliation Invoice,Invoice Number,Številka računa
 apps/erpnext/erpnext/hooks.py +55,Orders,Naročila
@@ -2308,7 +2317,7 @@
 DocType: Appraisal,Appraisal,Cenitev
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum se ponovi
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Pooblaščeni podpisnik
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},Pustite odobritelj mora biti eden od {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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
@@ -2477,7 +2486,7 @@
 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
 DocType: Sales Order Item,Supplier delivers to Customer,Dobavitelj zagotavlja naročniku
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Prikaži davek break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Prikaži davek break-up
 apps/erpnext/erpnext/accounts/party.py +283,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,Uvoz in izvoz podatkov
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Če se vključujejo v proizvodne dejavnosti. Omogoča Postavka &quot;izdeluje&quot;
@@ -2526,7 +2535,7 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Pred uskladitvijo
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,"Prosimo, ponovno tip firma za potrditev"
@@ -2553,8 +2562,6 @@
 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žitva mora biti večji od datuma rojstva
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Plača Struktura
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"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,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Airline
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Vprašanje Material
@@ -2579,7 +2586,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vrednostnih papirjev in blagovne borze
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Privzeto mersko enoto za Variant &#39;{0}&#39; mora biti enaka kot v predlogo &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Privzeto mersko enoto za Variant &#39;{0}&#39; mora biti enaka kot v predlogo &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun temelji na
 DocType: Delivery Note Item,From Warehouse,Iz skladišča
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednotenje in Total
@@ -2588,7 +2595,7 @@
 DocType: Account,Purchase User,Nakup Uporabnik
 DocType: Notification Control,Customize the Notification,Prilagodite Obvestilo
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Denarni tok iz poslovanja
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Privzete predloge naslova ni mogoče brisati
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Privzete predloge naslova ni mogoče brisati
 DocType: Sales Invoice,Shipping Rule,Dostava Pravilo
 DocType: Manufacturer,Limited to 12 characters,Omejena na 12 znakov
 DocType: Journal Entry,Print Heading,Print Postavka
@@ -2681,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,Commercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Super Storitve
@@ -2700,7 +2707,7 @@
 DocType: Customer,Default Receivable Accounts,Privzeto Terjatev računov
 DocType: Tax Rule,Billing State,Država za zaračunavanje
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Prenos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Fetch eksplodiral BOM (vključno podsklopov)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,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 +95,Due Date is mandatory,Datum zapadlosti je obvezno
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Prirastek za Attribute {0} ne more biti 0
@@ -2733,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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 +33,Provisional Profit / Loss (Credit),Začasna dobiček / izguba (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,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 +278,Please set default value {0} in Company {1},"Prosim, nastavite privzeto vrednost {0} v družbi {1}"
@@ -2764,6 +2771,7 @@
 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/report/stock_balance/stock_balance.py +47,Opening Value,Otvoritev Vrednost
 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
@@ -2797,7 +2805,6 @@
 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/setup_wizard/install_fixtures.py +58,Probation,Poskusno delo
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Privzeto Skladišče je obvezna za borzo točki.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,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
@@ -2833,7 +2840,7 @@
 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/setup/doctype/company/company.py +41,Abbreviation is mandatory,Kratica je obvezna
 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.
@@ -2861,7 +2868,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} je ustavila
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Barcode {0} že uporabljajo v postavki {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Prihajajoči dogodki
@@ -2883,7 +2890,7 @@
 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 +458,POS Profile required to make POS Entry,"POS Profil zahteva, da POS Entry"
 DocType: Hub Settings,Name Token,Ime Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Standardna Prodaja
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Standardna Prodaja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -3006,7 +3013,7 @@
 DocType: Sales Invoice,Paid Amount,Plačan znesek
 ,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/utilities/doctype/address_template/address_template.py +16,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 +113,"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 &quot;Stanje mora biti&quot; kot &quot;kredit&quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Upravljanje kakovosti
 DocType: Production Planning Tool,Filter based on customer,"Filter, ki temelji na kupca"
@@ -3107,7 +3114,7 @@
 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 &quot;Set as Default&quot;"
 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 +19,Shortage Qty,Pomanjkanje Kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Da Datum&quot; 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."
@@ -3118,7 +3125,7 @@
 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 &quot;Objavil&quot;, e-pop-up samodejno odpre, da pošljete e-pošto s pripadajočim &quot;stik&quot; 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 +749,It is needed to fetch Item Details.,"To je potrebno, da prinese Element Podrobnosti."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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
@@ -3144,6 +3151,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: C-Form,Series,Series
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,Postavka Razvrstitev
@@ -3219,7 +3227,7 @@
 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 +434,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 +420,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."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nakup Master Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Proizvodnja naročite {0} je treba predložiti
@@ -3227,7 +3235,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Glavni Poročila
 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 +194,Add / Edit Prices,Dodaj / Uredi Cene
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Moja naročila
@@ -3275,7 +3283,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Vrstica # {0}: Nastavite Dobavitelj za postavko {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Spletna stran slike {0} pritrjena na postavki {1} ni mogoče najti
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Spletna stran slike {0} pritrjena na postavki {1} ni mogoče najti
 DocType: Issue,Content Type,Vrsta vsebine
 apps/erpnext/erpnext/setup/setup_wizard/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.
@@ -3289,7 +3297,7 @@
 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 vpisan več kot enkrat za fiskalno leto {1}
 ,Average Commission Rate,Povprečen Komisija Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Ima Serial ne&quot; ne more biti &#39;Da&#39; za ne-parka postavko
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Ima Serial ne&quot; ne more biti &#39;Da&#39; 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
@@ -3315,7 +3323,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Zapiranje račun {0} mora biti tipa odgovornosti / kapital
 DocType: Authorization Rule,Based On,Temelji na
 DocType: Sales Order Item,Ordered Qty,Naročeno Kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Postavka {0} je onemogočena
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +168,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.
@@ -3323,7 +3331,7 @@
 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: Purchase Invoice,Write Off Amount (Company Currency),Napišite enkratni znesek (družba Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Vrstica # {0}: Prosim nastavite naročniško količino
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Vrstica # {0}: Prosim nastavite naročniško količino
 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
@@ -3395,7 +3403,7 @@
 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: Item Reorder,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."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Krajši delovni čas
 DocType: Employee,Applicable Holiday List,Velja Holiday Seznam
@@ -3450,7 +3458,7 @@
 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 +573,Please specify Attribute Value for attribute {0},"Prosimo, navedite Lastnost vrednost za atribut {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3529,7 +3537,7 @@
 DocType: Address,Office,Pisarna
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Vpisi računovodstvo lista.
 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 +226,Please select Employee Record first.,"Prosimo, izberite Employee Snemaj prvi."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,"Prosimo, izberite Employee Snemaj prvi."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,Vnesite Expense račun
@@ -3604,7 +3612,7 @@
 DocType: Item Attribute,Numeric Values,Numerične vrednosti
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Priložite Logo
 DocType: Customer,Commission Rate,Komisija Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Naredite Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Naredite Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Aplikacije blok dopustu oddelka.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Košarica je Prazna
 DocType: Production Order,Actual Operating Cost,Dejanski operacijski stroškov
@@ -3621,15 +3629,14 @@
 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 +380,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 +419,"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 +408,"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 +380, (Half Day),(Poldnevni)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Dobili predmetov iz BOM
diff --git a/erpnext/translations/sq.csv b/erpnext/translations/sq.csv
index 5f0cbe1..de07bb4 100644
--- a/erpnext/translations/sq.csv
+++ b/erpnext/translations/sq.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% Faturuar
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Exchange Rate duhet të jetë i njëjtë si {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Emri i Klientit
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Llogari bankare nuk mund të quhet si {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Llogari bankare nuk mund të quhet si {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Shquar për {0} nuk mund të jetë më pak se zero ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,New Pushimi Aplikimi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,New Pushimi Aplikimi
 apps/erpnext/erpnext/setup/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&#39;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
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log të aktiviteteve të kryera nga përdoruesit ndaj detyrave që mund të përdoret për ndjekjen kohë, faturimit."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},New {0}: # {1}
 ,Sales Partners Commission,Shitjet Partnerët Komisioni
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Shkurtesa nuk mund të ketë më shumë se 5 karaktere
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Shkurtesa nuk mund të ketë më shumë se 5 karaktere
 DocType: Payment Request,Payment Request,Kërkesë Pagesa
 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.",Atribut Vlera {0} nuk mund të hiqet nga {1} si pika Variante \ ekzistojnë me këtë atribut.
@@ -195,6 +195,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,Zgjidhni Termat dhe Kushtet
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,Vlera out
 DocType: Production Planning Tool,Sales Orders,Sales Urdhërat
 DocType: Purchase Taxes and Charges,Valuation,Vlerësim
 ,Purchase Order Trends,Rendit Blerje Trendet
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizion
 DocType: Production Order Operation,Updated via 'Time Log',Përditësuar nëpërmjet &#39;Koha Identifikohu &quot;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Llogaria {0} nuk i përket kompanisë {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},shuma paraprakisht nuk mund të jetë më i madh se {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista Seria për këtë transaksion
 DocType: Sales Invoice,Is Opening Entry,Është Hapja Hyrja
 DocType: Customer Group,Mention if non-standard receivable account applicable,Përmend në qoftë se jo-standarde llogari të arkëtueshme të zbatueshme
@@ -226,7 +228,7 @@
 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/templates/generators/item.html +30,No description given,Nuk ka përshkrim dhënë
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Kërkesë për blerje.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/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&gt; Cilësimet&gt; Emërtimi Series
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Magazina {0} nuk i përkasin kompanisë {1}
 DocType: Item Website Specification,Item Website Specification,Item Faqja Specifikimi
 DocType: Payment Tool,Reference No,Referenca Asnjë
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Lini Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Lini Blocked
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,Annual,Vjetor
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Pajtimi Item
 DocType: Stock Entry,Sales Invoice No,Shitjet Faturë Asnjë
@@ -248,7 +250,7 @@
 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 +606,Item {0} is cancelled,Item {0} është anuluar
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Item {0} është anuluar
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Kërkesë materiale
 DocType: Bank Reconciliation,Update Clearance Date,Update Pastrimi Data
 DocType: Item,Purchase Details,Detajet Blerje
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Ofrimit Shënim
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Ngritja Tatimet
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} hyrë dy herë në Tatimin Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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"
@@ -327,7 +329,7 @@
 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 +215,Please see attachment,Ju lutem shikoni shtojcën
 DocType: Purchase Order,% Received,% Marra
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Setup Tashmë komplet !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Setup Tashmë komplet !!
 ,Finished Goods,Mallrat përfunduar
 DocType: Delivery Note,Instructions,Udhëzime
 DocType: Quality Inspection,Inspected By,Inspektohen nga
@@ -352,14 +354,13 @@
 ,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 +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) duhet të ketë rol &#39;Leave aprovuesi&#39;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) duhet të ketë rol &#39;Leave aprovuesi&#39;
 DocType: Purchase Receipt,Vehicle Date,Data e Automjeteve
 apps/erpnext/erpnext/setup/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
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation është i mbyllur në datat e mëposhtme sipas Holiday Lista: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Mundësitë
 DocType: Employee,Single,I vetëm
-DocType: Issue,Attachment,Attachment
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Buxheti nuk mund të vendosen për Qendrën Kosto Group
 DocType: Account,Cost of Goods Sold,Kostoja e mallrave të shitura
 DocType: Purchase Invoice,Yearly,Vjetor
@@ -388,7 +389,7 @@
 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 +564,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 +550,Attribute {0} selected multiple times in Attributes Table,Atribut {0} zgjedhur disa herë në atributet Tabelën
 DocType: HR Settings,Employee record is created using selected field. ,Rekord punonjës është krijuar duke përdorur fushën e zgjedhur.
 DocType: Sales Order,Not Applicable,Nuk aplikohet
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Mjeshtër pushime.
@@ -427,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Kozmetikë
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"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: Shipping Rule,Net Weight,Net Weight
 DocType: Employee,Emergency Phone,Urgjencës Telefon
 ,Serial No Warranty Expiry,Serial No Garanci Expiry
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Menaxhimi Nënkontraktimi
 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ë
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Llogaria {0} nuk i përkasin kompanisë: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Llogaria {0} nuk i përkasin kompanisë: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Shkurtesa e përdorur tashmë për një kompani tjetër
 DocType: Selling Settings,Default Customer Group,Gabim Grupi Klientit
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Nëse disable, fushë &quot;rrumbullakosura Totali i &#39;nuk do të jenë të dukshme në çdo transaksion"
 DocType: BOM,Operating Cost,Kosto Operative
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Nuk u gjetën në tabelën Faturë të dhënat
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Ju lutem, përzgjidhni kompanisë dhe Partisë Lloji i parë"
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Financiare / vit kontabilitetit.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Vlerat e akumuluara
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Na vjen keq, Serial Nos nuk mund të bashkohen"
 DocType: Project Task,Project Task,Projekti Task
 ,Lead Id,Lead Id
@@ -492,7 +495,7 @@
 DocType: Quotation,Quotation To,Citat Për
 DocType: Lead,Middle Income,Të ardhurat e Mesme
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Hapja (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default njësinë e matjes për artikullit {0} nuk mund të ndryshohet drejtpërdrejt sepse ju keni bërë tashmë një transaksioni (et) me një tjetër UOM. Ju do të duhet për të krijuar një artikull të ri për të përdorur një Default ndryshme UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default njësinë e matjes për artikullit {0} nuk mund të ndryshohet drejtpërdrejt sepse ju keni bërë tashmë një transaksioni (et) me një tjetër UOM. Ju do të duhet për të krijuar një artikull të ri për të përdorur një Default ndryshme UOM.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Shuma e ndarë nuk mund të jetë negative
 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.
@@ -570,7 +573,7 @@
 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 +543,Item has variants.,Item ka variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -583,6 +586,7 @@
 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 +33,Goods received from Suppliers.,Mallrat e marra nga furnizuesit.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,në Vlera
 DocType: Lead,Campaign Name,Emri fushatë
 ,Reserved,I rezervuar
 DocType: Purchase Order,Supply Raw Materials,Furnizimit të lëndëve të para
@@ -597,16 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Llogaria me transaksion ekzistues nuk mund të konvertohet në Ledger
 DocType: Delivery Note,Customer's Purchase Order No,Konsumatorit Blerje Rendit Jo
 DocType: Employee,Cell Number,Numri Cell
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Kërkesat Auto Materiale Generated
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Kërkesat Auto Materiale Generated
 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 +126,You can not enter current voucher in 'Against Journal Entry' column,Ju nuk mund të hyjë kupon aktual në &quot;Kundër Journal hyrjes &#39;kolonë
 apps/erpnext/erpnext/setup/setup_wizard/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.
 DocType: Item Group,Website Specifications,Specifikimet Website
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Ka një gabim në Stampa tuaj Adresa {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Llogaria e Re
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Nga {0} nga lloji {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Konvertimi Faktori është e detyrueshme
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Rregullat e çmimeve të shumta ekziston me kritere të njëjta, ju lutemi të zgjidhur konfliktin duke caktuar prioritet. Rregullat Çmimi: {0}"
 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.,Hyrjet e kontabilitetit mund të bëhet kundër nyjet fletë. Entries kundër grupeve nuk janë të lejuara.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nuk mund të çaktivizuar ose të anulojë bom si ajo është e lidhur me BOM-in e tjera
 DocType: Opportunity,Maintenance,Mirëmbajtje
@@ -649,7 +655,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,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/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Warning: Attachment Invalid {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Warning: Attachment Invalid {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nuk ka leje
 DocType: Company,Default Bank Account,Gabim Llogarisë Bankare
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Për të filtruar në bazë të Partisë, Partia zgjidhni llojin e parë"
@@ -679,13 +685,13 @@
 DocType: Production Planning Tool,Select Items,Zgjidhni Items
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},"{0} kundër Bill {1} {2}, datë"
 DocType: Maintenance Visit,Completion Status,Përfundimi Statusi
-DocType: Sales Invoice Item,Target Warehouse,Target Magazina
+DocType: Production Order,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 +50,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/setup_wizard/install_fixtures.py +17,All Item Groups,Të gjitha Item Grupet
 DocType: Process Payroll,Activity Log,Aktiviteti Identifikohu
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Fitimi neto / Humbja
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Fitimi neto / Humbja
 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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} statusi është {2}
@@ -693,7 +699,7 @@
 DocType: Sales Order Item,Projected Qty,Projektuar Qty
 DocType: Sales Invoice,Payment Due Date,Afati i pageses
 DocType: Newsletter,Newsletter Manager,Newsletter Menaxher
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Item Varianti {0} tashmë ekziston me atributet e njëjta
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Item Varianti {0} tashmë ekziston me atributet e njëjta
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Hapja&quot;
 DocType: Notification Control,Delivery Note Message,Ofrimit Shënim Mesazh
 DocType: Expense Claim,Expenses,Shpenzim
@@ -703,7 +709,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Hulumtim dhe Zhvillim
 ,Amount to Bill,Shuma për Bill
 DocType: Company,Registration Details,Detajet e regjistrimit
-DocType: Item,Re-Order Qty,Re-Rendit Qty
+DocType: Item Reorder,Re-Order Qty,Re-Rendit Qty
 DocType: Leave Block List Date,Leave Block List Date,Dërgo Block Lista Data
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planifikuar për të dërguar për {0}
 DocType: Pricing Rule,Price or Discount,Çmimi ose Discount
@@ -746,7 +752,7 @@
 DocType: Bank Reconciliation,Total Amount,Shuma totale
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Botime Internet
 DocType: Production Planning Tool,Production Orders,Urdhërat e prodhimit
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Vlera e bilancit
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Vlera e bilancit
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista Sales Çmimi
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikimi i të sync artikuj
 DocType: Bank Reconciliation,Account Currency,Llogaria Valuta
@@ -755,7 +761,7 @@
 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 +538,Item Variants {0} updated,Item Variantet {0} përditësuar
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -832,7 +838,7 @@
 DocType: POS Profile,Cash/Bank Account,Cash / Llogarisë Bankare
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Tabela atribut është i detyrueshëm
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Zbritje
@@ -860,7 +866,7 @@
 DocType: Tax Rule,Shipping State,Shteti Shipping
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Item duhet të shtohen duke përdorur &#39;të marrë sendet nga blerjen Pranimet&#39; button
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Shitjet Shpenzimet
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Blerja Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Blerja Standard
 DocType: GL Entry,Against,Kundër
 DocType: Item,Default Selling Cost Center,Gabim Qendra Shitja Kosto
 DocType: Sales Partner,Implementation Partner,Partner Zbatimi
@@ -902,7 +908,7 @@
 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 +210,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/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Ju lutemi të vendosur &#39;Aplikoni Discount shtesë në&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Ju lutemi të vendosur &#39;Aplikoni Discount shtesë në&#39;
 ,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ë.
@@ -970,9 +976,9 @@
 DocType: Contact,User ID,User ID
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Shiko Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Hershme
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Prodhimi kundër Sales Rendit
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Pjesa tjetër e botës
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1002,7 +1008,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Na vjen keq, kompanitë nuk mund të bashkohen"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Na vjen keq, kompanitë nuk mund të bashkohen"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,I vogël
 DocType: Employee,Employee Number,Numri punonjës
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Rast No (s) në përdorim. Provoni nga Rasti Nr {0}
@@ -1021,7 +1027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Bujqësi
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Produktet ose shërbimet tuaja
 DocType: Mode of Payment,Mode of Payment,Mënyra e pagesës
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Faqja Image duhet të jetë një file publik ose URL website
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Faqja Image duhet të jetë një file publik ose URL website
 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
@@ -1093,6 +1099,7 @@
 DocType: Address,Utilities,Shërbime komunale
 DocType: Purchase Invoice Item,Accounting,Llogaritje
 DocType: Features Setup,Features Setup,Features Setup
+DocType: Item,Is Service Item,Është Shërbimi i artikullit
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Periudha e aplikimit nuk mund të jetë periudhë ndarja leje jashtë
 DocType: Activity Cost,Projects,Projektet
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Ju lutem, përzgjidhni Viti Fiskal"
@@ -1123,7 +1130,7 @@
 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 +465,cannot be greater than 100,nuk mund të jetë më i madh se 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Item {0} nuk është një gjendje Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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ë
@@ -1182,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Qeveri
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Variantet pika
 DocType: Company,Services,Sherbime
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Qendra prind Kosto
 DocType: Sales Invoice,Source,Burim
 DocType: Leave Type,Is Leave Without Pay,Lini është pa pagesë
@@ -1255,17 +1262,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ridergo Pagesa Email
 DocType: Dependent Task,Dependent Task,Detyra e varur
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Shiko
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Ndryshimi neto në para të gatshme
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Ndryshimi neto në para të gatshme
 DocType: Salary Structure Deduction,Salary Structure Deduction,Struktura e pagave Zbritje
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Kërkesa pagesa tashmë ekziston {0}
 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 +182,Quantity must not be more than {0},Sasia nuk duhet të jetë më shumë se {0}
@@ -1327,7 +1334,7 @@
 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: Packed 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
@@ -1336,7 +1343,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Kompani, muaji dhe viti fiskal është i detyrueshëm"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Shpenzimet e marketingut
 ,Item Shortage Report,Item Mungesa Raport
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Pesha është përmendur, \ nJu lutemi të përmendim &quot;Weight UOM&quot; shumë"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Pesha është përmendur, \ nJu lutemi të përmendim &quot;Weight UOM&quot; shumë"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Kërkesa material përdoret për të bërë këtë Stock Hyrja
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Njësi e vetme e një artikulli.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Koha Identifikohu Batch {0} duhet të jetë &#39;Dërguar&#39;
@@ -1347,6 +1354,7 @@
 DocType: Employee,Date Of Retirement,Data e daljes në pension
 DocType: Upload Attendance,Get Template,Get Template
 DocType: Address,Postal,Postar
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 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"
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,"Ju lutem, përzgjidhni {0} parë."
@@ -1375,12 +1383,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Shumë kolona. Eksportit raportin dhe të shtypura duke përdorur një aplikim spreadsheet.
 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 +139,Main,Kryesor
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Kryesor
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Prefiksi vendosur për numëron seri mbi transaksionet tuaja
 DocType: Employee Attendance Tool,Employees HTML,punonjësit HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,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 +367,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/stock/doctype/item/item.py +361,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
@@ -1405,7 +1413,6 @@
 DocType: Sales Order,To Deliver and Bill,Për të ofruar dhe Bill
 DocType: GL Entry,Credit Amount in Account Currency,Shuma e kredisë në llogari në monedhë të
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Koha Shkrime për prodhimin.
-DocType: Item,Apply Warehouse-wise Reorder Level,Aplikoni Magazina-i mençur Reorder Niveli
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} duhet të dorëzohet
 DocType: Authorization Control,Authorization Control,Kontrolli Autorizimi
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Rejected Magazina është e detyrueshme kundër Item refuzuar {1}
@@ -1503,6 +1510,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,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}: Operacioni {1} nuk është përfunduar për {2} Qty e mallrave të kryer në prodhimin Order # {3}. Ju lutem Përditëso statusin operacion anë Koha Shkrime
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investimet
 DocType: Issue,Resolution Details,Rezoluta Detajet
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alokimet
 DocType: Quality Inspection Reading,Acceptance Criteria,Kriteret e pranimit
 DocType: Item Attribute,Attribute Name,Atribut Emri
 DocType: Item Group,Show In Website,Shfaq Në Website
@@ -1553,7 +1561,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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
 DocType: Leave Block List Allow,Leave Block List Allow,Dërgo Block Lista Lejoni
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr nuk mund të jetë bosh ose hapësirë
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr nuk mund të jetë bosh ose hapësirë
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grup për jo-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportiv
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Gjithsej aktuale
@@ -1594,7 +1602,7 @@
 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 ** **.
 DocType: Opportunity,Customer / Lead Address,Customer / Adresa Lead
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Warning: certifikatë SSL Invalid në shtojcën {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Warning: certifikatë SSL Invalid në shtojcën {0}
 DocType: Production Order Operation,Actual Operation Time,Aktuale Operacioni Koha
 DocType: Authorization Rule,Applicable To (User),Për të zbatueshme (User)
 DocType: Purchase Taxes and Charges,Deduct,Zbres
@@ -1743,7 +1751,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Rast No. nuk mund të jetë 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,"Nëse keni shitjet e ekipit dhe shitje Partnerët (Channel Partnerët), ato mund të jenë të etiketuar dhe të mbajnë kontributin e tyre në aktivitetin e shitjes"
 DocType: Item,Show a slideshow at the top of the page,Tregojnë një Slideshow në krye të faqes
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Dyqane
+DocType: Item,"Allow in Sales Order of type ""Service""",Lejo në Sales Rendit të tipit &quot;Shërbimi&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Dyqane
 DocType: Time Log,Projects Manager,Projektet Menaxher
 DocType: Serial No,Delivery Time,Koha e dorëzimit
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Plakjen Bazuar Në
@@ -1768,7 +1777,7 @@
 ,Financial Analytics,Analytics Financiare
 DocType: Quality Inspection,Verified By,Verifikuar nga
 DocType: Address,Subsidiary,Ndihmës
-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.","Nuk mund të ndryshojë monedhën parazgjedhje kompanisë, sepse ka transaksione ekzistuese. Transaksionet duhet të anulohet për të ndryshuar monedhën default."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nuk mund të ndryshojë monedhën parazgjedhje kompanisë, sepse ka transaksione ekzistuese. Transaksionet duhet të anulohet për të ndryshuar monedhën default."
 DocType: Quality Inspection,Purchase Receipt No,Pranimi Blerje Asnjë
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kaparosje
 DocType: Process Payroll,Create Salary Slip,Krijo Kuponi pagave
@@ -1816,7 +1825,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Lëndëve të para nuk mund të jetë bosh.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Nuk mund të rinovuar aksioneve, fatura përmban anijeve rënie artikull."
 DocType: Newsletter,Test,Provë
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 &#39;ka Serial&#39;, &#39;Has Serisë Jo&#39;, &#39;A Stock Item&#39; dhe &#39;Metoda Vlerësimi&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick Journal Hyrja
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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
@@ -1905,7 +1914,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Ju lutem dorëzimit Shënim parë
 DocType: Purchase Invoice,Currency and Price List,Valuta dhe Lista e Çmimeve
 DocType: Opportunity,Customer / Lead Name,Customer / Emri Lead
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Pastrimi Data nuk përmendet
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Pastrimi Data nuk përmendet
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Prodhim
 DocType: Item,Allow Production Order,Lejo Rendit Prodhimit
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Filloni Data duhet të jetë përpara End Date
@@ -1915,7 +1924,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 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 +118,My Addresses,Adresat e mia
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Adresat e mia
 DocType: Stock Ledger Entry,Outgoing Rate,Largohet Rate
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Mjeshtër degë organizatë.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,ose
@@ -1984,7 +1993,7 @@
 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 +302,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 +95,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&gt; Printime dhe quajtur&gt; Adresa Stampa.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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&gt; Printime dhe quajtur&gt; Adresa Stampa.
 DocType: Appraisal,HR User,HR User
 DocType: Purchase Invoice,Taxes and Charges Deducted,Taksat dhe Tarifat zbritet
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Çështjet
@@ -2001,7 +2010,7 @@
 ,Sales Browser,Shitjet Browser
 DocType: Journal Entry,Total Credit,Gjithsej Credit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,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/setup_wizard/setup_wizard.py +392,Local,Lokal
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,I madh
@@ -2020,7 +2029,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Gjitha Shitjet Transaksionet mund të tagged kundër shumta ** Personat Sales ** në mënyrë që ju mund të vendosni dhe monitoruar objektivat.
 ,S.O. No.,SO Nr
 DocType: Production Order Operation,Make Time Log,Bëni kohë Kyçu
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Ju lutemi të vendosur sasinë Reorder
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Ju lutem të krijuar Customer nga Lead {0}
 DocType: Price List,Applicable for Countries,Të zbatueshme për vendet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Kompjuter
@@ -2095,7 +2103,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Get gjitha relevante
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Hyrja kontabilitetit për magazinë
 DocType: Sales Invoice,Sales Team1,Shitjet Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Item {0} nuk ekziston
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Item {0} nuk ekziston
 DocType: Sales Invoice,Customer Address,Customer Adresa
 DocType: Payment Request,Recipient and Message,Marrësi dhe Mesazh
 DocType: Purchase Invoice,Apply Additional Discount On,Aplikoni shtesë zbritje në
@@ -2137,7 +2145,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Vlerësimi Rate
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 &quot;Blerje Pranimet &#39;
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,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 +155,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
@@ -2175,7 +2183,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Ju lutemi të hyrë në lehtësimin datën.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Sasia
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Vetëm Dërgo Aplikacione me status &#39;miratuar&#39; mund të dorëzohet
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Adresa Titulli është i detyrueshëm.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Adresa Titulli është i detyrueshëm.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Shkruani emrin e fushatës nëse burimi i hetimit është fushatë
 apps/erpnext/erpnext/setup/setup_wizard/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
@@ -2199,6 +2207,7 @@
 DocType: UOM,Must be Whole Number,Duhet të jetë numër i plotë
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Lë të reja alokuara (në ditë)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial Asnjë {0} nuk ekziston
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Magazina Customer (Fakultativ)
 DocType: Pricing Rule,Discount Percentage,Përqindja Discount
 DocType: Payment Reconciliation Invoice,Invoice Number,Numri i faturës
 apps/erpnext/erpnext/hooks.py +55,Orders,Urdhërat
@@ -2308,7 +2317,7 @@
 DocType: Appraisal,Appraisal,Vlerësim
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data përsëritet
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Nënshkrues i autorizuar
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,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 +184,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
@@ -2477,7 +2486,7 @@
 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
 DocType: Sales Order Item,Supplier delivers to Customer,Furnizuesi jep Klientit
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Trego taksave break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Trego taksave break-up
 apps/erpnext/erpnext/accounts/party.py +283,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 &quot;është prodhuar &#39;
@@ -2526,7 +2535,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,Ju lutem ri-lloj emri i kompanisë për të konfirmuar
@@ -2553,8 +2562,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Struktura e pagave
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"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/setup_wizard/industry_type.py +9,Airline,Linjë ajrore
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Materiali çështje
@@ -2579,7 +2586,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Letrave me Vlerë dhe Shkëmbimeve të Mallrave
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default njësinë e matjes për Varianti &#39;{0}&#39; duhet të jetë i njëjtë si në Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default njësinë e matjes për Varianti &#39;{0}&#39; duhet të jetë i njëjtë si në Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Llogaritur bazuar në
 DocType: Delivery Note Item,From Warehouse,Nga Magazina
 DocType: Purchase Taxes and Charges,Valuation and Total,Vlerësimi dhe Total
@@ -2588,7 +2595,7 @@
 DocType: Account,Purchase User,Blerje User
 DocType: Notification Control,Customize the Notification,Customize Njoftimin
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Cash Flow nga operacionet
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Default Adresa Template nuk mund të fshihet
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Default Adresa Template nuk mund të fshihet
 DocType: Sales Invoice,Shipping Rule,Rregulla anijeve
 DocType: Manufacturer,Limited to 12 characters,Kufizuar në 12 karaktere
 DocType: Journal Entry,Print Heading,Printo Kreu
@@ -2681,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,Komercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Sherbime tmerrshëm
@@ -2700,7 +2707,7 @@
 DocType: Customer,Default Receivable Accounts,Default llogarive të arkëtueshme
 DocType: Tax Rule,Billing State,Shteti Faturimi
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Transferim
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,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 +642,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 +95,Due Date is mandatory,Për shkak Data është e detyrueshme
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Rritja për Atributit {0} nuk mund të jetë 0
@@ -2733,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Fitimi / Humbja e Përkohshme (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Fitimi / Humbja e Përkohshme (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Kthehu kundër Sales Faturë
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Pika 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Ju lutemi të vendosur vlera e parazgjedhur {0} në Kompaninë {1}
@@ -2764,6 +2771,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Shto Fëmija
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Roli i lejohet të Accounts ngrirë dhe Edit ngrira gjitha
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Nuk mund të konvertohet Qendra Kosto të librit si ajo ka nyje fëmijë
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Vlera e hapjes
 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,Komisioni për Shitje
 DocType: Offer Letter Term,Value / Description,Vlera / Përshkrim
@@ -2797,7 +2805,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Sukses të fshihen të gjitha transaksionet që lidhen me këtë kompani!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Si në Data
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Provë
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Gabim Magazina është e detyrueshme për aksioneve Item.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pagesa e pagës për muajin {0} dhe vitin {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert Shkalla Lista e Çmimeve nëse mungon
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Gjithsej shuma e paguar
@@ -2833,7 +2840,7 @@
 DocType: Payment Tool,Set Matching Amounts,Set Shumat Matching
 DocType: Purchase Invoice,Taxes and Charges Added,Taksat dhe Tarifat Shtuar
 ,Sales Funnel,Gyp Sales
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Shkurtim është i detyrueshëm
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Shkurtim është i detyrueshëm
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Faleminderit për interesimin tuaj në nënshkrimit për përditësime tonë
 ,Qty to Transfer,Qty të transferojë
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Kuotat për kryeson apo klientët.
@@ -2861,7 +2868,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} është ndalur
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Barkodi {0} përdorur tashmë në pikën {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Ngjarje të ardhshme
@@ -2883,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Zgjidh Vitin Fiskal ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS Profilin nevojshme për të bërë POS Hyrja
 DocType: Hub Settings,Name Token,Emri Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Shitja Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Shitja Standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -3006,7 +3013,7 @@
 DocType: Sales Invoice,Paid Amount,Paid Shuma
 ,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
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Bilanci i llogarisë tashmë në Debitimit, ju nuk jeni i lejuar për të vendosur &quot;Bilanci Must Be &#39;si&#39; Credit&quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Menaxhimit të Cilësisë
 DocType: Production Planning Tool,Filter based on customer,Filter bazuar në klient
@@ -3107,7 +3114,7 @@
 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 &#39;Bëje si Default&#39;"
 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 +19,Shortage Qty,Mungesa Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Deri më sot&quot; është e nevojshme
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generate paketim rrëshqet për paketat që do të dërgohen. Përdoret për të njoftuar numrin paketë, paketë përmbajtjen dhe peshën e saj."
@@ -3118,7 +3125,7 @@
 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ë &quot;Dërguar&quot;, një email pop-up u hap automatikisht për të dërguar një email tek të lidhur &quot;Kontakt&quot; 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 +749,It is needed to fetch Item Details.,Është e nevojshme për të shkoj të marr dhëna të artikullit.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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ë
@@ -3144,6 +3151,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: C-Form,Series,Seri
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,Klasifikimi i artikullit
@@ -3219,7 +3227,7 @@
 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 +434,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 +420,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ë."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Blerje Master Menaxher
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Prodhimi Rendit {0} duhet të dorëzohet
@@ -3227,7 +3235,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Raportet kryesore
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Deri më sot nuk mund të jetë e para nga data e
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Add / Edit Çmimet
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Urdhërat e mia
@@ -3275,7 +3283,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Row # {0}: Furnizuesi Set për pika {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Faqja Image {0} bashkangjitur në pikën {1} nuk mund të gjendet
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Faqja Image {0} bashkangjitur në pikën {1} nuk mund të gjendet
 DocType: Issue,Content Type,Përmbajtja Type
 apps/erpnext/erpnext/setup/setup_wizard/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.
@@ -3289,7 +3297,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Nuk ka Serial&#39; nuk mund të jetë &#39;Po&#39; për jo-aksioneve artikull
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Nuk ka Serial&#39; nuk mund të jetë &#39;Po&#39; 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
@@ -3315,7 +3323,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Llogarisë {0} Mbyllja duhet të jetë e tipit me Përgjegjësi / ekuitetit
 DocType: Authorization Rule,Based On,Bazuar në
 DocType: Sales Order Item,Ordered Qty,Urdhërohet Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Item {0} është me aftësi të kufizuara
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +168,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.
@@ -3323,7 +3331,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Blerja duhet të kontrollohet, nëse është e aplikueshme për të është zgjedhur si {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Discount duhet të jetë më pak se 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Shkruaj Off Shuma (Kompania Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Row # {0}: Ju lutemi të vendosur sasinë Reorder
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Row # {0}: Ju lutemi të vendosur sasinë Reorder
 DocType: Landed Cost Voucher,Landed Cost Voucher,Zbarkoi Voucher Kosto
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Ju lutemi të vendosur {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Përsëriteni në Ditën e Muajit
@@ -3395,7 +3403,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Shiko Tani
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Zgjidhni periudhën kur fatura do të gjenerohet automatikisht
 DocType: BOM,Raw Material Cost,Raw Material Kosto
-DocType: Item,Re-Order Level,Re-Rendit nivel
+DocType: Item Reorder,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ë.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Me kohë të pjesshme
 DocType: Employee,Applicable Holiday List,Zbatueshme Lista Holiday
@@ -3450,7 +3458,7 @@
 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 +573,Please specify Attribute Value for attribute {0},Ju lutem specifikoni atribut Vlera për atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3529,7 +3537,7 @@
 DocType: Address,Office,Zyrë
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Rregjistrimet në ditar të kontabilitetit.
 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 +226,Please select Employee Record first.,"Ju lutem, përzgjidhni Record punonjës parë."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,"Ju lutem, përzgjidhni Record punonjës parë."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,Ju lutemi shkruani Llogari kurriz
@@ -3604,7 +3612,7 @@
 DocType: Item Attribute,Numeric Values,Vlerat numerike
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Bashkangjit Logo
 DocType: Customer,Commission Rate,Rate Komisioni
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Bëni Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Bëni Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Aplikacionet pushimit bllok nga departamenti.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Shporta është bosh
 DocType: Production Order,Actual Operating Cost,Aktuale Kosto Operative
@@ -3621,15 +3629,14 @@
 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 +380,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 +419,"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 +408,"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 +380, (Half Day),(Gjysme Dite)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Të marrë sendet nga bom
diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv
index 00f66e1..5ece668 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,Фактурисано %
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Курс курс мора да буде исти као {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Име клијента
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Жиро рачун не може бити именован као {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Жиро рачун не може бити именован као {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Выдающийся для {0} не может быть меньше нуля ( {1} )
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Нова апликација одсуство
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Нова апликација одсуство
 apps/erpnext/erpnext/setup/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,Начин плаћања налог
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Лог активности обављају корисници против Задаци који се могу користити за праћење времена, наплату."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Нови {0}: # {1}
 ,Sales Partners Commission,Продаја Партнери Комисија
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Аббревиатура не может иметь более 5 символов
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Аббревиатура не может иметь более 5 символов
 DocType: Payment Request,Payment Request,Плаћање Упит
 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.",Атрибут Вредност {0} не може бити уклоњен из {1} као тачка Варијанте \ постоје у овај атрибут.
@@ -196,6 +196,7 @@
 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 (%),Попуст на цену Лист стопа (%)
 DocType: Offer Letter,Select Terms and Conditions,Изаберите Услови
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,od Вредност
 DocType: Production Planning Tool,Sales Orders,Салес Ордерс
 DocType: Purchase Taxes and Charges,Valuation,Вредновање
 ,Purchase Order Trends,Куповина Трендови Ордер
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,телевизија
 DocType: Production Order Operation,Updated via 'Time Log',Упдатед преко 'Време Приступи'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Счет {0} не принадлежит компании {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Унапред износ не може бити већи од {0} {1}
 DocType: Naming Series,Series List for this Transaction,Серија Листа за ову трансакције
 DocType: Sales Invoice,Is Opening Entry,Отвара Ентри
 DocType: Customer Group,Mention if non-standard receivable account applicable,Спомените ако нестандардни потраживања рачуна примењује
@@ -227,7 +229,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Ствара плата листић за горе наведених критеријума.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Не введено описание
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Захтев за куповину.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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} подешавањем&gt; Сеттингс&gt; именовања серије
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Магацин {0} не припада фирми {1}
 DocType: Item Website Specification,Item Website Specification,Ставка Сајт Спецификација
 DocType: Payment Tool,Reference No,Референца број
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Оставите Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,Оставите Блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,годовой
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Стоцк Помирење артикла
 DocType: Stock Entry,Sales Invoice No,Продаја Рачун Нема
@@ -249,7 +251,7 @@
 DocType: Pricing Rule,Supplier Type,Снабдевач Тип
 DocType: Item,Publish in Hub,Објављивање у Хуб
 ,Terretory,Терретори
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Пункт {0} отменяется
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Материјал Захтев
 DocType: Bank Reconciliation,Update Clearance Date,Упдате Дате клиренс
 DocType: Item,Purchase Details,Куповина Детаљи
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Обавештење о пријему пошиљке
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Подешавање Порези
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Плаћање Ступање је модификована након што га извукао. Молимо вас да га опет повуците.
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} вводится дважды в пункт налоге
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,Изаберите месец и годину
@@ -329,7 +331,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Ваша имејл адреса
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,Молимо погледајте прилог
 DocType: Purchase Order,% Received,% Примљено
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Подешавање Већ Комплетна !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Подешавање Већ Комплетна !
 ,Finished Goods,готове робе
 DocType: Delivery Note,Instructions,Инструкције
 DocType: Quality Inspection,Inspected By,Контролисано Би
@@ -354,14 +356,13 @@
 ,Purchase Register,Куповина Регистрација
 DocType: Landed Cost Item,Applicable Charges,Накнаде применљиво
 DocType: Workstation,Consumable Cost,Потрошни трошкова
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора имати улогу 'Напусти Аппровер
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора имати улогу 'Напусти Аппровер
 DocType: Purchase Receipt,Vehicle Date,Датум возила
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,медицинский
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Разлог за губљење
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Радна станица је затворена на следеће датуме по Холидаи Лист: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Могућности
 DocType: Employee,Single,Самац
-DocType: Issue,Attachment,Прилог
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Буџет не може да се подеси за групу трошкова Центар
 DocType: Account,Cost of Goods Sold,Себестоимость реализованных товаров
 DocType: Purchase Invoice,Yearly,Годишње
@@ -390,7 +391,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
 DocType: HR Settings,Employee record is created using selected field. ,Запослени Запис се креира коришћењем изабрано поље.
 DocType: Sales Order,Not Applicable,Није применљиво
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Мастер отдыха .
@@ -429,7 +430,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,козметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items","Да бисте објединили , следеће особине морају бити исти за обе ставке"
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Да бисте објединили , следеће особине морају бити исти за обе ставке"
 DocType: Shipping Rule,Net Weight,Нето тежина
 DocType: Employee,Emergency Phone,Хитна Телефон
 ,Serial No Warranty Expiry,Серијски Нема гаранције истека
@@ -440,7 +441,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Управљање Подуговарање
 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,Стопа по којој се Ценовник валута претвара у основну валуту компаније
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Рачун {0} не припада компанији: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Рачун {0} не припада компанији: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Скраћеница већ користи за другу компанију
 DocType: Selling Settings,Default Customer Group,Уобичајено групу потрошача
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ако онемогућите, &quot;заобљени&quot; Тотал поље неће бити видљив у свакој трансакцији"
 DocType: BOM,Operating Cost,Оперативни трошкови
@@ -476,6 +478,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Нема резултата у фактури табели записи
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Молимо Вас да изаберете Цомпани и Партије Типе прво
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Финансовый / отчетного года .
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,акумулиране вредности
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Извини , Серијски Нос не може да се споје"
 DocType: Project Task,Project Task,Пројектни задатак
 ,Lead Id,Олово Ид
@@ -497,7 +500,7 @@
 DocType: Quotation,Quotation To,Цитат
 DocType: Lead,Middle Income,Средњи приход
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Открытие (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Уобичајено јединица мере за тачке {0} не може директно мењати, јер сте већ направили неке трансакције (с) са другим УЦГ. Мораћете да креирате нову ставку да користи другачији Дефаулт УЦГ."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Уобичајено јединица мере за тачке {0} не може директно мењати, јер сте већ направили неке трансакције (с) са другим УЦГ. Мораћете да креирате нову ставку да користи другачији Дефаулт УЦГ."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Додељена сума не може бити негативан
 DocType: Purchase Order Item,Billed Amt,Фактурисане Амт
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Логичан Магацин против које уноси хартије су направљени.
@@ -575,7 +578,7 @@
 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 +543,Item has variants.,Тачка има варијанте.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,Дрво Тип
@@ -588,6 +591,7 @@
 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 +33,Goods received from Suppliers.,Роба примљена од добављача.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,у вредности
 DocType: Lead,Campaign Name,Назив кампање
 ,Reserved,Резервисано
 DocType: Purchase Order,Supply Raw Materials,Суппли Сировине
@@ -602,16 +606,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Счет с существующей сделки не могут быть преобразованы в книге
 DocType: Delivery Note,Customer's Purchase Order No,Наруџбенице купца Нема
 DocType: Employee,Cell Number,Мобилни број
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Аутоматско Материјал Захтеви Генератед
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Аутоматско Материјал Захтеви Генератед
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,изгубљен
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Не можете ући у тренутну ваучер 'против' Јоурнал Ентри колону
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,енергија
 DocType: Opportunity,Opportunity From,Прилика Од
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Месечна плата изјава.
 DocType: Item Group,Website Specifications,Сајт Спецификације
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Постоји грешка у вашем Адреса Темплате {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Нови налог
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Од {0} типа {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор конверзије је обавезно
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Вишеструки Цена Правила постоји са истим критеријумима, молимо вас да решавају конфликте са приоритетом. Цена Правила: {0}"
 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.,Аццоунтинг прилога може се против листа чворова. Записи против групе нису дозвољени.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не можете деактивирати или отказати БОМ јер је повезан са другим саставница
 DocType: Opportunity,Maintenance,Одржавање
@@ -673,7 +679,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,Прайс-лист не выбран
 DocType: Employee,Family Background,Породица Позадина
 DocType: Process Payroll,Send Email,Сенд Емаил
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Упозорење: Неважећи Прилог {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Упозорење: Неважећи Прилог {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Без дозвола
 DocType: Company,Default Bank Account,Уобичајено банковног рачуна
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Филтрирање на основу партије, изаберите партија Типе први"
@@ -703,13 +709,13 @@
 DocType: Production Planning Tool,Select Items,Изаберите ставке
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} против Предлога закона {1} {2} од
 DocType: Maintenance Visit,Completion Status,Завршетак статус
-DocType: Sales Invoice Item,Target Warehouse,Циљна Магацин
+DocType: Production Order,Target Warehouse,Циљна Магацин
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволите преко испоруку или пријем упто овом одсто
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,Ожидаемая дата поставки не может быть до даты заказа на продажу
 DocType: Upload Attendance,Import Attendance,Увоз Гледалаца
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Все Группы товаров
 DocType: Process Payroll,Activity Log,Активност Пријава
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Нето добит / губитак
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Нето добит / губитак
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматически создавать сообщение о подаче сделок .
 DocType: Production Order,Item To Manufacture,Ставка за производњу
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статус {2}
@@ -717,7 +723,7 @@
 DocType: Sales Order Item,Projected Qty,Пројектовани Кол
 DocType: Sales Invoice,Payment Due Date,Плаћање Дуе Дате
 DocType: Newsletter,Newsletter Manager,Билтен директор
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Тачка Варијанта {0} већ постоји са истим атрибутима
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Тачка Варијанта {0} већ постоји са истим атрибутима
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Отварање&#39;
 DocType: Notification Control,Delivery Note Message,Испорука Напомена порука
 DocType: Expense Claim,Expenses,расходы
@@ -727,7 +733,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Истраживање и развој
 ,Amount to Bill,Износ на Предлог закона
 DocType: Company,Registration Details,Регистрација Детаљи
-DocType: Item,Re-Order Qty,Поново поручивање
+DocType: Item Reorder,Re-Order Qty,Поново поручивање
 DocType: Leave Block List Date,Leave Block List Date,Оставите Датум листу блокираних
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Планируется отправить {0}
 DocType: Pricing Rule,Price or Discount,Цена или Скидка
@@ -770,7 +776,7 @@
 DocType: Bank Reconciliation,Total Amount,Укупан износ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Интернет издаваштво
 DocType: Production Planning Tool,Production Orders,Налога за производњу
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Биланс Вредност
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Биланс Вредност
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Продаја Ценовник
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Објављивање за синхронизацију ставки
 DocType: Bank Reconciliation,Account Currency,Рачун Валута
@@ -779,7 +785,7 @@
 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 +538,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
 DocType: Quality Inspection Reading,Reading 6,Читање 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Фактури Адванце
 DocType: Address,Shop,Продавница
@@ -856,7 +862,7 @@
 DocType: POS Profile,Cash/Bank Account,Готовина / банковног рачуна
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Уклоњене ствари без промене у количини или вриједности.
 DocType: Delivery Note,Delivery To,Достава Да
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,Атрибут сто је обавезно
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Попуст
@@ -884,7 +890,7 @@
 DocType: Tax Rule,Shipping State,Достава Држава
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Ставка мора се додати користећи 'Гет ставки из пурцхасе примитака' дугме
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Коммерческие расходы
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Стандардна Куповина
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Стандардна Куповина
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,По умолчанию Продажа Стоимость центр
 DocType: Sales Partner,Implementation Partner,Имплементација Партнер
@@ -926,7 +932,7 @@
 DocType: Sales Partner,Distributor,Дистрибутер
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корпа Достава Правило
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Молимо поставите &#39;Аппли додатни попуст на&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Молимо поставите &#39;Аппли додатни попуст на&#39;
 ,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.,Изаберите Протоколи време и слање да створи нову продајну фактуру.
@@ -994,9 +1000,9 @@
 DocType: Contact,User ID,Кориснички ИД
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Погледај Леџер
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Најраније
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем , пожалуйста, измените имя элемента или переименовать группу товаров"
 DocType: Production Order,Manufacture against Sales Order,Производња против налога за продају
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Остальной мир
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,Бруто Паи
@@ -1026,7 +1032,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Жао нам је , компаније не могу да се споје"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Жао нам је , компаније не могу да се споје"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Мали
 DocType: Employee,Employee Number,Запослени Број
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Случай Нет (ы) уже используется. Попробуйте из дела № {0}
@@ -1045,7 +1051,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,пољопривреда
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Ваши производи или услуге
 DocType: Mode of Payment,Mode of Payment,Начин плаћања
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Сајт Слика треба да буде јавни фајл или УРЛ веб-сајта
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Сајт Слика треба да буде јавни фајл или УРЛ веб-сајта
 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,Магацин Контакт Инфо
@@ -1117,6 +1123,7 @@
 DocType: Address,Utilities,Комуналне услуге
 DocType: Purchase Invoice Item,Accounting,Рачуноводство
 DocType: Features Setup,Features Setup,Функције за подешавање
+DocType: Item,Is Service Item,Да ли је услуга шифра
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Период примене не може бити изван одсуство расподела Период
 DocType: Activity Cost,Projects,Пројекти
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Пожалуйста, выберите финансовый год"
@@ -1147,7 +1154,7 @@
 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 +465,cannot be greater than 100,не може бити већи од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Неплански
 DocType: Employee,Owned,Овнед
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Зависи оставити без Паи
@@ -1207,7 +1214,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,правительство
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Ставка Варијанте
 DocType: Company,Services,Услуге
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Укупно ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Укупно ({0})
 DocType: Cost Center,Parent Cost Center,Родитељ Трошкови центар
 DocType: Sales Invoice,Source,Извор
 DocType: Leave Type,Is Leave Without Pay,Да ли је Оставите без плате
@@ -1280,17 +1287,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Поново плаћања Емаил
 DocType: Dependent Task,Dependent Task,Зависна Задатак
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,Цонсумед Износ
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Погледај
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Нето промена на пари
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Нето промена на пари
 DocType: Salary Structure Deduction,Salary Structure Deduction,Плата Структура Одбитак
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Плаћање Захтјев већ постоји {0}
 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 +182,Quantity must not be more than {0},Количина не сме бити више од {0}
@@ -1352,7 +1359,7 @@
 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: Packed Item,To Warehouse (Optional),До складишта (опционо)
 DocType: Sales Invoice,Paid Amount (Company Currency),Уплаћеног износа (Фирма валута)
 DocType: Purchase Invoice,Additional Discount,Додатни попуст
 DocType: Selling Settings,Selling Settings,Продаја Сеттингс
@@ -1361,7 +1368,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Компанија , месец и Фискална година је обавезно"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Маркетинговые расходы
 ,Item Shortage Report,Ставка о несташици извештај
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се спомиње, \n Молимо вас да се позовете на ""Тежина УОМ"" превише"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се спомиње, \n Молимо вас да се позовете на ""Тежина УОМ"" превише"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Материјал Захтев се користи да би овај унос Стоцк
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Једна јединица једне тачке.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Время входа Пакетная {0} должен быть ' Представленные '
@@ -1372,6 +1379,7 @@
 DocType: Employee,Date Of Retirement,Датум одласка у пензију
 DocType: Upload Attendance,Get Template,Гет шаблона
 DocType: Address,Postal,Поштански
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ЕРПНект Подешавање Комплетна!
 DocType: Item,Weightage,Веигхтаге
 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,"Группа клиентов существует с тем же именем , пожалуйста изменить имя клиентов или переименовать группу клиентов"
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Изаберите {0} прво.
@@ -1400,12 +1408,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Превише колоне. Извоз извештај и одштампајте га помоћу тих апликација.
 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 +139,Main,основной
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,основной
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Варијанта
 DocType: Naming Series,Set prefix for numbering series on your transactions,Сет префикс за нумерисање серију на својим трансакцијама
 DocType: Employee Attendance Tool,Employees HTML,zaposleni ХТМЛ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,Остановился заказ не может быть отменен. Unstop отменить .
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,Уобичајено БОМ ({0}) мора бити активан за ову ставку или његовог шаблон
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,Варијанте
@@ -1430,7 +1438,6 @@
 DocType: Sales Order,To Deliver and Bill,Да достави и Билл
 DocType: GL Entry,Credit Amount in Account Currency,Износ кредита на рачуну валути
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Тиме Протоколи за производњу.
-DocType: Item,Apply Warehouse-wise Reorder Level,Нанесите Варехоусе-Висе Реордер Левел
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,БОМ {0} мора да се поднесе
 DocType: Authorization Control,Authorization Control,Овлашћење за контролу
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ред # {0}: Одбијен Складиште је обавезна против одбијен тачком {1}
@@ -1528,6 +1535,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Ров # {0}: Операција {1} није завршен за {2} кти готових производа у производњи заказа # {3}. Плеасе упдате статус операције преко временском дневнику
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,инвестиции
 DocType: Issue,Resolution Details,Резолуција Детаљи
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,издвајања
 DocType: Quality Inspection Reading,Acceptance Criteria,Критеријуми за пријем
 DocType: Item Attribute,Attribute Name,Назив атрибута
 DocType: Item Group,Show In Website,Схов у сајт
@@ -1578,7 +1586,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,Расходи Тужба се чека на одобрење . СамоРасходи одобраватељ да ажурирате статус .
 DocType: Purchase Invoice,Additional Discount Amount,Додатне Износ попуста
 DocType: Leave Block List Allow,Leave Block List Allow,Оставите листу блокираних Аллов
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Аббр не може бити празно или простор
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Аббр не може бити празно или простор
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Група не-Гроуп
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,спортски
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Укупно Стварна
@@ -1619,7 +1627,7 @@
 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**.,**Фискална година** представља Финансијску годину. Све рачуноводствене уносе и остале главне трансакције се прате наспрам **Фискалне фодине**.
 DocType: Opportunity,Customer / Lead Address,Кориснички / Олово Адреса
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Упозорење: Неважећи сертификат ССЛ на везаности {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Упозорење: Неважећи сертификат ССЛ на везаности {0}
 DocType: Production Order Operation,Actual Operation Time,Стварна Операција време
 DocType: Authorization Rule,Applicable To (User),Важећи Да (Корисник)
 DocType: Purchase Taxes and Charges,Deduct,Одбити
@@ -1645,6 +1653,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Прочие расходы
 DocType: Global Defaults,Default Company,Уобичајено Компанија
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Расходи или Разлика рачун је обавезно за пункт {0} , јер утиче укупна вредност залиха"
+apps/erpnext/erpnext/controllers/accounts_controller.py +370,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не могу да овербилл за тачком {0} у реду {1} више од {2}. Да би се омогућило прекомјерних, поставите на лагеру Сеттингс"
 DocType: Employee,Bank Name,Име банке
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Изнад
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Пользователь {0} отключена
@@ -1767,7 +1776,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Предмет бр не може бити 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,Уколико имате продајни тим и продаја партнерима (Цханнел Партнерс) они могу бити означене и одржава свој допринос у активностима продаје
 DocType: Item,Show a slideshow at the top of the page,Приказивање слајдова на врху странице
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Магазины
+DocType: Item,"Allow in Sales Order of type ""Service""",Дозволите у Салес Ордер типа &quot;службе&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Магазины
 DocType: Time Log,Projects Manager,Пројекти менаџер
 DocType: Serial No,Delivery Time,Време испоруке
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Старење Басед Он
@@ -1792,7 +1802,7 @@
 ,Financial Analytics,Финансијски Аналитика
 DocType: Quality Inspection,Verified By,Верифиед би
 DocType: Address,Subsidiary,Подружница
-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.","Невозможно изменить Базовая валюта компании , потому что есть существующие операции . Сделки должны быть отменены , чтобы поменять валюту ."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Невозможно изменить Базовая валюта компании , потому что есть существующие операции . Сделки должны быть отменены , чтобы поменять валюту ."
 DocType: Quality Inspection,Purchase Receipt No,Куповина Пријем Нема
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,задаток
 DocType: Process Payroll,Create Salary Slip,Направи Слип платама
@@ -1840,7 +1850,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Сировине не може бити празан.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Није могуће ажурирати залихе, фактура садржи испоруку ставку дроп."
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'","Као што постоје постојеће трансакције стоцк за ову ставку, \ не можете променити вредности &#39;има серијски Не&#39;, &#39;Има серијски бр&#39;, &#39;Да ли лагеру предмета&#39; и &#39;Процена Метод&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Брзо Јоурнал Ентри
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Не можете променити стопу ако бом помиње агианст било које ставке
@@ -1949,7 +1959,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Молимо вас да Достава Напомена прво
 DocType: Purchase Invoice,Currency and Price List,Валута и Ценовник
 DocType: Opportunity,Customer / Lead Name,Заказчик / Ведущий Имя
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Клиренс Дата не упоминается
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Клиренс Дата не упоминается
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,производња
 DocType: Item,Allow Production Order,Дозволи Ордер Производња
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Ред {0} : Датум почетка мора да буде пре крајњег датума
@@ -1959,7 +1969,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Паренттипе
 DocType: Salary Structure,Total Earning,Укупна Зарада
 DocType: Purchase Receipt,Time at which materials were received,Време у коме су примљене материјали
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,Моје адресе
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Моје адресе
 DocType: Stock Ledger Entry,Outgoing Rate,Одлазећи курс
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Организация филиал мастер .
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,или
@@ -2028,7 +2038,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Управление групповой клиентов дерево .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Нови Трошкови Центар Име
 DocType: Leave Control Panel,Leave Control Panel,Оставите Цонтрол Панел
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Не стандардна Адреса шаблона пронађен. Молимо креирајте нови из Подешавања> Штампа и брендирања> Адреса шаблон.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Не стандардна Адреса шаблона пронађен. Молимо креирајте нови из Подешавања> Штампа и брендирања> Адреса шаблон.
 DocType: Appraisal,HR User,ХР Корисник
 DocType: Purchase Invoice,Taxes and Charges Deducted,Порези и накнаде одузима
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Питања
@@ -2045,7 +2055,7 @@
 ,Sales Browser,Браузер по продажам
 DocType: Journal Entry,Total Credit,Укупна кредитна
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Упозорење: Још једна {0} # {1} постоји против уласка залиха {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,местный
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Велики
@@ -2064,7 +2074,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Све продаје Трансакције се могу означена против више лица ** ** Продаја тако да можете подесити и пратити циљеве.
 ,S.O. No.,С.О. Не.
 DocType: Production Order Operation,Make Time Log,Маке Тиме Пријави
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Молимо поставите количину преусмеравање
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},"Пожалуйста, создайте Клиента от свинца {0}"
 DocType: Price List,Applicable for Countries,Важи за земље
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Компьютеры
@@ -2151,7 +2160,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Гет Релевантне уносе
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Рачуноводство Ентри за Деонице
 DocType: Sales Invoice,Sales Team1,Продаја Теам1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Пункт {0} не существует
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Пункт {0} не существует
 DocType: Sales Invoice,Customer Address,Кориснички Адреса
 DocType: Payment Request,Recipient and Message,Прималац и порука
 DocType: Purchase Invoice,Apply Additional Discount On,Нанесите додатни попуст Он
@@ -2193,7 +2202,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Процена Стопа
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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,Преименовање Лог
@@ -2231,7 +2240,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Пожалуйста, введите даты снятия ."
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Амт
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Только Оставьте приложений с статуса ""Одобрено"" могут быть представлены"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Адрес Название является обязательным.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Адрес Название является обязательным.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Унесите назив кампање, ако извор истраге је кампања"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Новински издавачи
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Изаберите Фискална година
@@ -2255,6 +2264,7 @@
 DocType: UOM,Must be Whole Number,Мора да буде цео број
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нове Лишће Издвојена (у данима)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Серийный номер {0} не существует
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Купац Магацин (опционо)
 DocType: Pricing Rule,Discount Percentage,Скидка в процентах
 DocType: Payment Reconciliation Invoice,Invoice Number,Фактура број
 apps/erpnext/erpnext/hooks.py +55,Orders,Поруџбине
@@ -2364,7 +2374,7 @@
 DocType: Appraisal,Appraisal,Процена
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Датум се понавља
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Овлашћени потписник
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},Оставьте утверждающий должен быть одним из {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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,7 +2543,7 @@
 DocType: BOM Replace Tool,BOM Replace Tool,БОМ Замена алата
 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 +733,Show tax break-up,Покажи пореза распада
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Покажи пореза распада
 apps/erpnext/erpnext/accounts/party.py +283,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',Если вы привлечь в производственной деятельности. Включает элемент ' производится '
@@ -2566,6 +2576,8 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +216,{0} '{1}' is disabled,{0} '{1}' је онемогућен
 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/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+					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: Sales Team,Contribution (%),Учешће (%)
@@ -2580,7 +2592,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,Молимо Вас да поново тип цомпани наме да потврди
@@ -2607,9 +2619,6 @@
 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,Дата Присоединение должно быть больше Дата рождения
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Плата Структура
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Вишеструки Цена Правило постоји са истим критеријумима, молимо реши конфликт \
-, са приоритетом. Цена Правила: {0}"
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ваздушна линија
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Питање Материјал
@@ -2634,7 +2643,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Хартије од вредности и робним берзама
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Уобичајено Јединица мере за варијанту &#39;{0}&#39; мора бити исти као у темплате &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Уобичајено Јединица мере за варијанту &#39;{0}&#39; мора бити исти као у темплате &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Израчунајте Басед Он
 DocType: Delivery Note Item,From Warehouse,Од Варехоусе
 DocType: Purchase Taxes and Charges,Valuation and Total,Вредновање и Тотал
@@ -2643,7 +2652,7 @@
 DocType: Account,Purchase User,Куповина Корисник
 DocType: Notification Control,Customize the Notification,Прилагођавање обавештења
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Новчани ток из пословања
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Уобичајено Адреса Шаблон не може бити обрисан
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Уобичајено Адреса Шаблон не може бити обрисан
 DocType: Sales Invoice,Shipping Rule,Достава Правило
 DocType: Manufacturer,Limited to 12 characters,Ограничена до 12 карактера
 DocType: Journal Entry,Print Heading,Штампање наслова
@@ -2737,7 +2746,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,Проект мудрый данные не доступны для коммерческого предложения
 DocType: Project,Expected End Date,Очекивани датум завршетка
 DocType: Appraisal Template,Appraisal Template Title,Процена Шаблон Наслов
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,коммерческий
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Потрясающие услуги
@@ -2756,7 +2765,7 @@
 DocType: Customer,Default Receivable Accounts,Уобичајено Рецеивабле Аццоунтс
 DocType: Tax Rule,Billing State,Тецх Стате
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Пренос
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Фетцх експлодирала бом ( укључујући подсклопова )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),Фетцх експлодирала бом ( укључујући подсклопова )
 DocType: Authorization Rule,Applicable To (Employee),Важећи Да (запослених)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,Дуе Дате обавезна
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Повећање за Аттрибуте {0} не може бити 0
@@ -2789,7 +2798,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Негативно Вредновање курс није дозвољен
 DocType: Holiday List,Weekly Off,Недељни Искључено
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","За нпр 2012, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Привремени Добитак / Губитак (кредит)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Привремени Добитак / Губитак (кредит)
 DocType: Sales Invoice,Return Against Sales Invoice,Повратак против продаје фактуру
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Тачка 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Молимо поставите подразумевану вредност {0} у компанији {1}
@@ -2820,6 +2829,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Додај Цхилд
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Улога дозвољено да постављају блокада трансакцијских рачуна & Едит Фрозен записи
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Невозможно преобразовать МВЗ в книге , как это имеет дочерние узлы"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Отварање Вредност
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Сериал #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Комиссия по продажам
 DocType: Offer Letter Term,Value / Description,Вредност / Опис
@@ -2853,7 +2863,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Успешно избрисали све трансакције везане за ову компанију!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Као и на датум
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,пробни рад
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,По умолчанию Склад является обязательным для складе Пункт .
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Выплата заработной платы за месяц {0} и год {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Аутоматско уметак Ценовник стопа ако недостаје
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Укупно Плаћени износ
@@ -2889,7 +2898,7 @@
 DocType: Payment Tool,Set Matching Amounts,Сет Матцхинг Износи
 DocType: Purchase Invoice,Taxes and Charges Added,Порези и накнаде додавања
 ,Sales Funnel,Продаја Левак
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Држава је обавезна
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Држава је обавезна
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Хвала вам на интересовању за претплате на нашим новостима
 ,Qty to Transfer,Количина за трансфер
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Цитати на води или клијената.
@@ -2917,7 +2926,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,Снабдевач Понуда
 DocType: Quotation,In Words will be visible once you save the Quotation.,У речи ће бити видљив када сачувате цитат.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} је заустављена
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Штрих {0} уже используется в пункте {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Предстојећи догађаји
@@ -2940,7 +2949,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Изаберите Фискална година ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,ПОС Профил потребно да ПОС Ентри
 DocType: Hub Settings,Name Token,Име токен
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Стандардна Продаја
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Стандардна Продаја
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Атлеаст једно складиште је обавезно
 DocType: Serial No,Out of Warranty,Од гаранције
 DocType: BOM Replace Tool,Replace,Заменити
@@ -3063,7 +3072,7 @@
 DocType: Sales Invoice,Paid Amount,Плаћени Износ
 ,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,"Постављање Ова адреса шаблон као подразумевани, јер не постоји други подразумевани"
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,"Постављање Ова адреса шаблон као подразумевани, јер не постоји други подразумевани"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Стање рачуна већ у задуживање, није вам дозвољено да поставите 'Стање Муст Бе' као 'Кредит'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Управљање квалитетом
 DocType: Production Planning Tool,Filter based on customer,Филтер на бази купца
@@ -3164,7 +3173,7 @@
 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 +19,Shortage Qty,Мањак Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
 DocType: Salary Slip,Salary Slip,Плата Слип
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' To Date ' требуется
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Генерисати паковање признанице за да буде испоручена пакети. Користи се за обавијести пакет број, Садржај пакета и његову тежину."
@@ -3175,7 +3184,7 @@
 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.","Када неки од селектираних трансакција &quot;Послао&quot;, е поп-уп аутоматски отворила послати емаил на вези &quot;Контакт&quot; у тој трансакцији, са трансакцијом као прилог. Корисник може или не може да пошаље поруку."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Глобальные настройки
 DocType: Employee Education,Employee Education,Запослени Образовање
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,Потребно је да се донесе Сведениа.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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} уже получил
@@ -3201,6 +3210,7 @@
 DocType: BOM,Manufacturing User,Производња Корисник
 DocType: Purchase Order,Raw Materials Supplied,Сировине комплету
 DocType: Purchase Invoice,Recurring Print Format,Поновни Принт Формат
+DocType: C-Form,Series,серија
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,Ожидаемая дата поставки не может быть до заказа на Дата
 DocType: Appraisal,Appraisal Template,Процена Шаблон
 DocType: Item Group,Item Classification,Итем Класификација
@@ -3287,7 +3297,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},Ров {0}: Унос Прераспоређивање већ постоји у овој магацин {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.","Не могу прогласити као изгубљен , јер Понуда је учињен ."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Куповина Мастер менаџер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Производственный заказ {0} должны быть представлены
@@ -3295,7 +3305,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Главни Извештаји
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,До данас не може бити раније од датума
 DocType: Purchase Receipt Item,Prevdoc DocType,Превдоц ДОЦТИПЕ
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Додај / измени Прицес
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Ми Ордерс
@@ -3343,6 +3353,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Ред # {0}: Сет добављача за ставку {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Сајт Слика {0} везани са тачком {1} не могу наћи
 DocType: Issue,Content Type,Тип садржаја
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,рачунар
 DocType: Item,List this Item in multiple groups on the website.,Наведи ову ставку у више група на сајту.
@@ -3356,7 +3367,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,"""Има серијски број"" не може бити ""Да"" за артикл који није на залихама"
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'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,Рачун шеф
@@ -3382,7 +3393,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Затварање рачуна {0} мора бити типа одговорности / Екуити
 DocType: Authorization Rule,Based On,На Дана
 DocType: Sales Order Item,Ordered Qty,Ж Кол
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Ставка {0} је онемогућен
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Ставка {0} је онемогућен
 DocType: Stock Settings,Stock Frozen Upto,Берза Фрозен Упто
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},Период од периода до датума и обавезних се понављају {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Пројекат активност / задатак.
@@ -3390,7 +3401,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Куповина се мора проверити, ако је применљиво Јер је изабрана као {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Скидка должна быть меньше 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Отпис Износ (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Ред # {0}: Молим вас сет количину преусмеравање
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Ред # {0}: Молим вас сет количину преусмеравање
 DocType: Landed Cost Voucher,Landed Cost Voucher,Слетео Трошкови Ваучер
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Пожалуйста, установите {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Поновите на дан у месецу
@@ -3463,7 +3474,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Погледај Сада
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Изаберите период када ће рачун бити аутоматски генерисан
 DocType: BOM,Raw Material Cost,Сировина Трошак
-DocType: Item,Re-Order Level,Поново би Левел
+DocType: Item Reorder,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.,Унесите ставке и планирани Кол за које желите да подигне наређења производне или преузети сировине за анализу.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Скраћено
 DocType: Employee,Applicable Holiday List,Важећи Холидаи Листа
@@ -3518,7 +3529,7 @@
 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 +573,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3597,7 +3608,7 @@
 DocType: Address,Office,Канцеларија
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Рачуноводствене ставке дневника.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно на ком Од Варехоусе
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Молимо изаберите Емплоиее Рецорд први.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,Молимо изаберите Емплоиее Рецорд први.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,Унесите налог Екпенсе
@@ -3672,7 +3683,7 @@
 DocType: Item Attribute,Numeric Values,Нумеричке вредности
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Прикрепите логотип
 DocType: Customer,Commission Rate,Комисија Оцени
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Маке Вариант
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Маке Вариант
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Блок оставите апликације по одељењу.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Корпа је празна
 DocType: Production Order,Actual Operating Cost,Стварни Оперативни трошкови
@@ -3689,15 +3700,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Да бисте поставили ниво преусмеравање тачка мора бити Куповина јединица или Производња артикла
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),(Пола дана)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(Пола дана)
 DocType: Supplier,Credit Days,Кредитни Дана
 DocType: Leave Type,Is Carry Forward,Је напред Царри
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Се ставке из БОМ
diff --git a/erpnext/translations/sv.csv b/erpnext/translations/sv.csv
index a900039..a3ab149 100644
--- a/erpnext/translations/sv.csv
+++ b/erpnext/translations/sv.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% Fakturerad
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Växelkurs måste vara samma som {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Kundnamn
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Bankkontot kan inte namnges som {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Bankkontot kan inte namnges som {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Utstående för {0} kan inte vara mindre än noll ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Ny Ledighets ansökningan
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Ny Ledighets ansökningan
 apps/erpnext/erpnext/setup/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
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Loggar av aktiviteter som utförs av användare mot uppgifter som kan användas för att spåra tid, fakturering."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Ny {0}: # {1}
 ,Sales Partners Commission,Försäljning Partners kommissionen
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Förkortning kan inte ha mer än 5 tecken
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Förkortning kan inte ha mer än 5 tecken
 DocType: Payment Request,Payment Request,Betalningsbegäran
 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.",Attribut Värde {0} kan inte tas bort från {1} som punkt Varianter \ finns med detta attribut.
@@ -195,6 +195,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,Välj Villkor
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,ut Värde
 DocType: Production Planning Tool,Sales Orders,Kundorder
 DocType: Purchase Taxes and Charges,Valuation,Värdering
 ,Purchase Order Trends,Inköpsorder Trender
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Tv
 DocType: Production Order Operation,Updated via 'Time Log',Uppdaterad via &quot;Time Log&quot;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Kontot {0} tillhör inte ett företag {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Advance beloppet kan inte vara större än {0} {1}
 DocType: Naming Series,Series List for this Transaction,Serie Lista för denna transaktion
 DocType: Sales Invoice,Is Opening Entry,Är öppen anteckning
 DocType: Customer Group,Mention if non-standard receivable account applicable,Nämn om icke-standard mottagningskonto tillämpat
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Skapar lönebesked för ovan nämnda kriterier.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Ingen beskrivning ges
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Begäran om köp.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/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
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Lager {0} tillhör inte företaget {1}
 DocType: Item Website Specification,Item Website Specification,Produkt hemsidespecifikation
 DocType: Payment Tool,Reference No,Referensnummer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Lämna Blockerad
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Lämna Blockerad
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,Annual,Årlig
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Lager Avstämning Punkt
 DocType: Stock Entry,Sales Invoice No,Försäljning Faktura nr
@@ -248,7 +250,7 @@
 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 +606,Item {0} is cancelled,Punkt {0} avbryts
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Punkt {0} avbryts
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Materialförfrågan
 DocType: Bank Reconciliation,Update Clearance Date,Uppdatera Clearance Datum
 DocType: Item,Purchase Details,Inköpsdetaljer
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Följesedel
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Ställa in skatter
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} inlagd två gånger under punkten Skatt
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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
@@ -327,7 +329,7 @@
 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 +215,Please see attachment,Se bifogad fil
 DocType: Purchase Order,% Received,% Emot
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Inställning Redan Komplett !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Inställning Redan Komplett !!
 ,Finished Goods,Färdiga Varor
 DocType: Delivery Note,Instructions,Instruktioner
 DocType: Quality Inspection,Inspected By,Inspekteras av
@@ -352,14 +354,13 @@
 ,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 +169,{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 +189,{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/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
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Arbetsstation är stängd på följande datum enligt kalender: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Möjligheter
 DocType: Employee,Single,Singel
-DocType: Issue,Attachment,Bifogning
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budget kan inte ställas in för koncernens kostnadsställe
 DocType: Account,Cost of Goods Sold,Kostnad för sålda varor
 DocType: Purchase Invoice,Yearly,Årlig
@@ -388,7 +389,7 @@
 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 +564,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 +550,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valda flera gånger i attribut Tabell
 DocType: HR Settings,Employee record is created using selected field. ,Personal register skapas med hjälp av valda fältet.
 DocType: Sales Order,Not Applicable,Inte Tillämpbar
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Semester topp.
@@ -427,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"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: Shipping Rule,Net Weight,Nettovikt
 DocType: Employee,Emergency Phone,Nödtelefon
 ,Serial No Warranty Expiry,Serial Ingen garanti löper ut
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Hantera Underleverantörer
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Kontot {0} tillhör inte företaget: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Kontot {0} tillhör inte företaget: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Förkortning redan används för ett annat företag
 DocType: Selling Settings,Default Customer Group,Standard Kundgrupp
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Om inaktiverad ""Rundad Totalt fältet inte syns i någon transaktion"
 DocType: BOM,Operating Cost,Rörelse Kostnad
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Inga träffar i Faktura tabellen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Välj Företag och parti typ först
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Budget / räkenskapsåret.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,ackumulerade värden
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Tyvärr, kan serienumren inte slås samman"
 DocType: Project Task,Project Task,Projektuppgift
 ,Lead Id,Prospekt Id
@@ -492,7 +495,7 @@
 DocType: Quotation,Quotation To,Offert Till
 DocType: Lead,Middle Income,Medelinkomst
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Öppning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standard mätenhet för punkt {0} kan inte ändras direkt eftersom du redan har gjort vissa transaktioner (s) med en annan UOM. Du måste skapa en ny punkt för att använda en annan standard UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standard mätenhet för punkt {0} kan inte ändras direkt eftersom du redan har gjort vissa transaktioner (s) med en annan UOM. Du måste skapa en ny punkt för att använda en annan standard UOM.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Avsatt belopp kan inte vara negativ
 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.
@@ -570,7 +573,7 @@
 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 +543,Item has variants.,Produkten har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -583,6 +586,7 @@
 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 +33,Goods received from Suppliers.,Varor som erhållits från leverantörer.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,Värde
 DocType: Lead,Campaign Name,Kampanjens namn
 ,Reserved,Reserverat
 DocType: Purchase Order,Supply Raw Materials,Supply Råvaror
@@ -597,16 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Konto med befintlig transaktioner kan inte omvandlas till liggaren
 DocType: Delivery Note,Customer's Purchase Order No,Kundens inköpsorder Nr
 DocType: Employee,Cell Number,Mobilnummer
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Automaterial Framställningar Generated
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Automaterial Framställningar Generated
 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 +126,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/setup_wizard/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.
 DocType: Item Group,Website Specifications,Webbplats Specifikationer
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Det finns ett fel i adressmallen {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Nytt Konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Från {0} av typen {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rad {0}: Omvandlingsfaktor är obligatoriskt
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flera Pris Regler finns med samma kriterier, vänligen lösa konflikter genom att tilldela prioritet. Pris Regler: {0}"
 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.,Bokföringsposter kan göras mot huvudnoder. Inlägg mot grupper är inte tillåtna.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,Det går inte att inaktivera eller avbryta BOM eftersom det är kopplat till andra stycklistor
 DocType: Opportunity,Maintenance,Underhåll
@@ -649,7 +655,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,Prislista inte valt
 DocType: Employee,Family Background,Familjebakgrund
 DocType: Process Payroll,Send Email,Skicka Epost
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Varning: Ogiltig Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Varning: Ogiltig Attachment {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Inget Tillstånd
 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","För att filtrera baserat på partiet, väljer Party Typ först"
@@ -679,13 +685,13 @@
 DocType: Production Planning Tool,Select Items,Välj objekt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} mot räkning {1} daterad {2}
 DocType: Maintenance Visit,Completion Status,Slutförande Status
-DocType: Sales Invoice Item,Target Warehouse,Target Lager
+DocType: Production Order,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 +50,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/setup_wizard/install_fixtures.py +17,All Item Groups,Alla artikelgrupper
 DocType: Process Payroll,Activity Log,Aktivitets Logg
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Netto Vinst / Förlust
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Netto Vinst / Förlust
 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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status är {2}
@@ -693,7 +699,7 @@
 DocType: Sales Order Item,Projected Qty,Projicerad Antal
 DocType: Sales Invoice,Payment Due Date,Förfallodag
 DocType: Newsletter,Newsletter Manager,Nyhetsbrevsansvarig
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Punkt Variant {0} finns redan med samma attribut
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Punkt Variant {0} finns redan med samma attribut
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Öppna&quot;
 DocType: Notification Control,Delivery Note Message,Följesedel Meddelande
 DocType: Expense Claim,Expenses,Kostnader
@@ -703,7 +709,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Forskning &amp; Utveckling
 ,Amount to Bill,Belopp till fakturera
 DocType: Company,Registration Details,Registreringsdetaljer
-DocType: Item,Re-Order Qty,Återuppta Antal
+DocType: Item Reorder,Re-Order Qty,Återuppta Antal
 DocType: Leave Block List Date,Leave Block List Date,Lämna Blockeringslista Datum
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planerad att skicka till {0}
 DocType: Pricing Rule,Price or Discount,Pris eller rabatt
@@ -746,7 +752,7 @@
 DocType: Bank Reconciliation,Total Amount,Totala Summan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Produktionsorder
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balans Värde
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Balans Värde
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Försäljning Prislista
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicera till synkroniseringsobjekt
 DocType: Bank Reconciliation,Account Currency,Konto Valuta
@@ -755,7 +761,7 @@
 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 +538,Item Variants {0} updated,Produkt Varianter {0} uppdaterad
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -832,7 +838,7 @@
 DocType: POS Profile,Cash/Bank Account,Kontant / Bankkonto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Attributtabell är obligatoriskt
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,Rabatt
@@ -860,7 +866,7 @@
 DocType: Tax Rule,Shipping State,Frakt State
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Produkt måste tillsättas med hjälp av ""få produkter  från kvitton"" -knappen"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Försäljnings Kostnader
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Standard handla
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Standard handla
 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
@@ -902,7 +908,7 @@
 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 +210,Production Order {0} must be cancelled before cancelling this Sales Order,Produktionsorder {0} måste avbrytas innan du kan avbryta kundorder
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Ställ in &quot;tillämpa ytterligare rabatt på&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Ställ in &quot;tillämpa ytterligare rabatt på&quot;
 ,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.
@@ -970,9 +976,9 @@
 DocType: Contact,User ID,Användar ID
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Se journal
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidigast
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Tillverkning mot kundorder
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Resten av världen
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1002,7 +1008,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Tyvärr, kan företagen inte slås samman"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Tyvärr, kan företagen inte slås samman"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Liten
 DocType: Employee,Employee Number,Anställningsnummer
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Ärendenr är redani bruk. Försök från ärende nr {0}
@@ -1021,7 +1027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Jordbruk
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Dina produkter eller tjänster
 DocType: Mode of Payment,Mode of Payment,Betalningssätt
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Website Bild bör vara en offentlig fil eller webbadress
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Website Bild bör vara en offentlig fil eller webbadress
 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
@@ -1093,6 +1099,7 @@
 DocType: Address,Utilities,Verktyg
 DocType: Purchase Invoice Item,Accounting,Redovisning
 DocType: Features Setup,Features Setup,Funktioner Inställning
+DocType: Item,Is Service Item,Är Serviceobjekt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Ansökningstiden kan inte vara utanför ledighet fördelningsperioden
 DocType: Activity Cost,Projects,Projekt
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Välj Räkenskapsårets
@@ -1123,7 +1130,7 @@
 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 +465,cannot be greater than 100,kan inte vara större än 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Produkt  {0} är inte en lagervara
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1182,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Regeringen
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Produkt Varianter
 DocType: Company,Services,Tjänster
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Totalt ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Totalt ({0})
 DocType: Cost Center,Parent Cost Center,Överordnat kostnadsställe
 DocType: Sales Invoice,Source,Källa
 DocType: Leave Type,Is Leave Without Pay,Är ledighet utan lön
@@ -1255,17 +1262,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Skicka om Betalning E
 DocType: Dependent Task,Dependent Task,Beroende Uppgift
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Visa
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Nettoförändring i Cash
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Nettoförändring i Cash
 DocType: Salary Structure Deduction,Salary Structure Deduction,Lönestruktur Avdrag
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Betalning förfrågan finns redan {0}
 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 +182,Quantity must not be more than {0},Antal får inte vara mer än {0}
@@ -1327,7 +1334,7 @@
 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: Packed 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
@@ -1336,7 +1343,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Företag, månad och räkenskapsår är obligatorisk"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Marknadsföringskostnader
 ,Item Shortage Report,Produkt Brist Rapportera
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vikt nämns \ Vänligen ange ""Vikt UOM"" också"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vikt nämns \ Vänligen ange ""Vikt UOM"" också"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Material Begäran används för att göra detta Lagerinlägg
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enda enhet av ett objekt.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Tid Log Batch {0} måste &quot;Avsändare&quot;
@@ -1347,6 +1354,7 @@
 DocType: Employee,Date Of Retirement,Datum för pensionering
 DocType: Upload Attendance,Get Template,Hämta mall
 DocType: Address,Postal,Post
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Vikt
 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"
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Välj {0} först.
@@ -1375,12 +1383,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Alltför många kolumner. Exportera rapporten och skriva ut det med hjälp av ett kalkylprogram.
 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 +139,Main,Huvud
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Huvud
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ställ prefix för nummerserie på dina transaktioner
 DocType: Employee Attendance Tool,Employees HTML,Anställda HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,Stoppad ordning kan inte avbrytas. Unstop att avbryta.
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,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/stock/doctype/item/item.py +361,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
@@ -1405,7 +1413,6 @@
 DocType: Sales Order,To Deliver and Bill,Att leverera och Bill
 DocType: GL Entry,Credit Amount in Account Currency,Credit Belopp i konto Valuta
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Time Loggar för tillverkning.
-DocType: Item,Apply Warehouse-wise Reorder Level,Applicera Lagermässiga förändringar på annan nivå
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} måste lämnas in
 DocType: Authorization Control,Authorization Control,Behörighetskontroll
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rad # {0}: Avslag Warehouse är obligatoriskt mot förkastade Punkt {1}
@@ -1503,6 +1510,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Rad # {0}: Operation {1} är inte klar för {2} st av färdiga varor i produktionsorder # {3}. Uppdatera driftstatus via Tidsloggar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investeringarna
 DocType: Issue,Resolution Details,Åtgärds Detaljer
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,anslag
 DocType: Quality Inspection Reading,Acceptance Criteria,Acceptanskriterier
 DocType: Item Attribute,Attribute Name,Attribut Namn
 DocType: Item Group,Show In Website,Visa i Webbsida
@@ -1553,7 +1561,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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
 DocType: Leave Block List Allow,Leave Block List Allow,Lämna Block List Tillåt
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Förkortning kan inte vara tomt
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Förkortning kan inte vara tomt
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grupp till icke-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Totalt Faktisk
@@ -1594,7 +1602,7 @@
 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 **.
 DocType: Opportunity,Customer / Lead Address,Kund / Huvudadress
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Varning: Ogiltig SSL-certifikat på fäst {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Varning: Ogiltig SSL-certifikat på fäst {0}
 DocType: Production Order Operation,Actual Operation Time,Faktisk driftstid
 DocType: Authorization Rule,Applicable To (User),Är tillämpligt för (Användare)
 DocType: Purchase Taxes and Charges,Deduct,Dra av
@@ -1743,7 +1751,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Ärendenr kan inte vara 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,Om du har säljteam och Försäljning Partners (Channel Partners) kan märkas och behålla sitt bidrag i försäljningsaktiviteten
 DocType: Item,Show a slideshow at the top of the page,Visa ett bildspel på toppen av sidan
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Butiker
+DocType: Item,"Allow in Sales Order of type ""Service""",Tillåt i kundorder av typen &quot;Service&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Butiker
 DocType: Time Log,Projects Manager,Projekt Chef
 DocType: Serial No,Delivery Time,Leveranstid
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Åldring Baserad på
@@ -1768,7 +1777,7 @@
 ,Financial Analytics,Finansiella Analyser
 DocType: Quality Inspection,Verified By,Verifierad Av
 DocType: Address,Subsidiary,Dotterbolag
-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.","Det går inte att ändra bolagets standardvaluta, eftersom det redan finns transaktioner. Transaktioner måste avbokas att ändra valuta."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Det går inte att ändra bolagets standardvaluta, eftersom det redan finns transaktioner. Transaktioner måste avbokas att ändra valuta."
 DocType: Quality Inspection,Purchase Receipt No,Inköpskvitto Nr
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Handpenning
 DocType: Process Payroll,Create Salary Slip,Skapa lönebeskedet
@@ -1816,7 +1825,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Råvaror kan inte vara tomt.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Det gick inte att uppdatera lager, faktura innehåller släppa sjöfarten objekt."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 +459,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Du kan inte ändra kurs om BOM nämnts mot någon artikel
@@ -1905,7 +1914,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Vänligen Följesedel först
 DocType: Purchase Invoice,Currency and Price List,Valuta och prislista
 DocType: Opportunity,Customer / Lead Name,Kund / Huvudnamn
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Utförsäljningsdatum inte nämnt
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Utförsäljningsdatum inte nämnt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Produktion
 DocType: Item,Allow Production Order,Tillåt produktionsorder
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Rad {0}: Startdatum måste vara före slutdatum
@@ -1915,7 +1924,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 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 +118,My Addresses,Mina adresser
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Mina adresser
 DocType: Stock Ledger Entry,Outgoing Rate,Utgående betyg
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Organisation gren ledare.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,eller
@@ -1984,7 +1993,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Hantera Kundgruppsträd.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,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 +95,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&gt; Tryck och Branding&gt; Adress mall.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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&gt; Tryck och Branding&gt; Adress mall.
 DocType: Appraisal,HR User,HR-Konto
 DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter och avgifter Avdragen
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Frågor
@@ -2001,7 +2010,7 @@
 ,Sales Browser,Försäljnings Webbläsare
 DocType: Journal Entry,Total Credit,Total Credit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,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/setup_wizard/setup_wizard.py +392,Local,Lokal
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Stor
@@ -2020,7 +2029,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Alla försäljningstransaktioner kan märkas mot flera ** säljare ** så att du kan ställa in och övervaka mål.
 ,S.O. No.,SÅ Nej
 DocType: Production Order Operation,Make Time Log,Skapa tidslogg
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Ställ beställnings kvantitet
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Skapa Kunden från Prospekt {0}
 DocType: Price List,Applicable for Countries,Gäller Länder
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Datorer
@@ -2095,7 +2103,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Hämta relevanta uppgifter
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Kontering för lager
 DocType: Sales Invoice,Sales Team1,Försäljnings Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Punkt {0} inte existerar
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Punkt {0} inte existerar
 DocType: Sales Invoice,Customer Address,Kundadress
 DocType: Payment Request,Recipient and Message,Mottagare och Meddelande
 DocType: Purchase Invoice,Apply Additional Discount On,Applicera ytterligare rabatt på
@@ -2137,7 +2145,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Värderings betyg
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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
@@ -2175,7 +2183,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Ange avlösningsdatum.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Ant
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Endast ledighets applikationer med status ""Godkänd"" kan lämnas in"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Adress titel är obligatorisk.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Adress titel är obligatorisk.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Ange namnet på kampanjen om källförfrågan är kampanjen
 apps/erpnext/erpnext/setup/setup_wizard/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
@@ -2199,6 +2207,7 @@
 DocType: UOM,Must be Whole Number,Måste vara heltal
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nya Ledigheter Tilldelade (i dagar)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serienummer {0} inte existerar
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Kund Warehouse (tillval)
 DocType: Pricing Rule,Discount Percentage,Rabatt Procent
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
 apps/erpnext/erpnext/hooks.py +55,Orders,Beställningar
@@ -2308,7 +2317,7 @@
 DocType: Appraisal,Appraisal,Värdering
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum upprepas
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Firmatecknare
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,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 +184,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
@@ -2477,7 +2486,7 @@
 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
 DocType: Sales Order Item,Supplier delivers to Customer,Leverantören levererar till kunden
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Visa skatte uppbrott
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Visa skatte uppbrott
 apps/erpnext/erpnext/accounts/party.py +283,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"""
@@ -2526,7 +2535,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,Vänligen ange företagsnamn igen för att bekräfta
@@ -2553,8 +2562,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Lönestruktur
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"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/setup_wizard/industry_type.py +9,Airline,Flygbolag
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Problem Material
@@ -2579,7 +2586,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Värdepapper och råvarubörserna
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard mätenhet för Variant &quot;{0}&quot; måste vara samma som i Mall &quot;{1}&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard mätenhet för Variant &quot;{0}&quot; måste vara samma som i Mall &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,Beräkna baserad på
 DocType: Delivery Note Item,From Warehouse,Från Warehouse
 DocType: Purchase Taxes and Charges,Valuation and Total,Värdering och Total
@@ -2588,7 +2595,7 @@
 DocType: Account,Purchase User,Inköpsanvändare
 DocType: Notification Control,Customize the Notification,Anpassa Anmälan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Kassaflöde från rörelsen
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard Adress mall kan inte tas bort
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Standard Adress mall kan inte tas bort
 DocType: Sales Invoice,Shipping Rule,Frakt Regel
 DocType: Manufacturer,Limited to 12 characters,Begränsat till 12 tecken
 DocType: Journal Entry,Print Heading,Utskrifts Rubrik
@@ -2681,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,Kommersiell
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Grymma Tjänster
@@ -2700,7 +2707,7 @@
 DocType: Customer,Default Receivable Accounts,Standard Mottagarkonton
 DocType: Tax Rule,Billing State,Faktureringsstaten
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Överföring
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Fetch expanderande BOM (inklusive underenheter)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,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 +95,Due Date is mandatory,Förfallodatum är obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Påslag för Attribut {0} inte kan vara 0
@@ -2733,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Preliminär vinst / förlust (Kredit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Preliminär vinst / förlust (Kredit)
 DocType: Sales Invoice,Return Against Sales Invoice,Återgå mot fakturan
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Produkt  5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Ställ in standardvärdet {0} i bolaget {1}
@@ -2764,6 +2771,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Lägg till underval
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Roll tillåtas att fastställa frysta konton och Redigera Frysta Inlägg
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Det går inte att konvertera kostnadsställe till huvudbok då den har underordnade noder
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,öppnings Värde
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Seriell #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Försäljningsprovision
 DocType: Offer Letter Term,Value / Description,Värde / Beskrivning
@@ -2797,7 +2805,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Framgångsrikt bort alla transaktioner i samband med detta företag!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Som på Date
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Skyddstillsyn
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Standard Lager är obligatoriskt för lagervara.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Utbetalning av lön för månaden {0} och år {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Diskinmatning Prislista ränta om saknas
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Sammanlagda belopp som betalats
@@ -2833,7 +2840,7 @@
 DocType: Payment Tool,Set Matching Amounts,Ställ matchande Belopp
 DocType: Purchase Invoice,Taxes and Charges Added,Skatter och avgifter Added
 ,Sales Funnel,Försäljning tratt
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Förkortning är obligatoriskt
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Förkortning är obligatoriskt
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Tack för ditt intresse för att prenumerera på våra nyheter
 ,Qty to Transfer,Antal Transfer
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Offerter till prospekt eller kunder
@@ -2861,7 +2868,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} är stoppad
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Streckkod {0} används redan i punkt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,uppkommande händelser
@@ -2883,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Välj räkenskapsår ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS profil som krävs för att göra POS inlägg
 DocType: Hub Settings,Name Token,Namn token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Standardförsäljnings
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Standardförsäljnings
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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
@@ -3006,7 +3013,7 @@
 DocType: Sales Invoice,Paid Amount,Betalt belopp
 ,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
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Kontosaldo redan i Debit, du är inte tillåten att ställa ""Balans måste vara"" som ""Kredit"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Kvalitetshantering
 DocType: Production Planning Tool,Filter based on customer,Filter utifrån kundernas
@@ -3107,7 +3114,7 @@
 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å &quot;Ange som standard&quot;"
 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 +19,Shortage Qty,Brist Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Till datum&quot; krävs
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Skapa följesedlar efter paket som skall levereras. Används för att meddela kollinummer, paketets innehåll och dess vikt."
@@ -3118,7 +3125,7 @@
 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 +749,It is needed to fetch Item Details.,Det behövs för att hämta produktdetaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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
@@ -3144,6 +3151,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: C-Form,Series,Serie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,Produkt Klassificering
@@ -3219,7 +3227,7 @@
 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 +434,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 +420,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."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Inköpschef
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Produktionsorder {0} måste lämnas in
@@ -3227,7 +3235,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Huvud Rapporter
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Hittills inte kan vara före startdatum
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Lägg till / redigera priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Mina beställningar
@@ -3275,7 +3283,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Rad # {0}: Ställ Leverantör för punkt {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Website Bild {0} fäst till punkt {1} kan inte hittas
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Website Bild {0} fäst till punkt {1} kan inte hittas
 DocType: Issue,Content Type,Typ av innehåll
 apps/erpnext/erpnext/setup/setup_wizard/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.
@@ -3289,7 +3297,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Har Löpnummer&quot; kan inte vara &quot;ja&quot; för icke Beställningsvara
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Har Löpnummer&quot; kan inte vara &quot;ja&quot; 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
@@ -3315,7 +3323,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Utgående konto {0} måste vara av typen Ansvar / Equity
 DocType: Authorization Rule,Based On,Baserat På
 DocType: Sales Order Item,Ordered Qty,Beställde Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Punkt {0} är inaktiverad
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Punkt {0} är inaktiverad
 DocType: Stock Settings,Stock Frozen Upto,Lager Fryst Upp
 apps/erpnext/erpnext/controllers/recurring_document.py +168,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.
@@ -3323,7 +3331,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Köp måste anges, i förekommande fall väljs som {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabatt måste vara mindre än 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv engångsavgift (Company valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Rad # {0}: Ställ in beställningsmängd
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Rad # {0}: Ställ in beställningsmängd
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landad Kostnad rabatt
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Ställ in {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Upprepa på Månadsdag
@@ -3395,7 +3403,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Visa nu
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Välj den period när fakturan kommer att genereras automatiskt
 DocType: BOM,Raw Material Cost,Råvarukostnad
-DocType: Item,Re-Order Level,Återuppta nivå
+DocType: Item Reorder,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.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Deltid
 DocType: Employee,Applicable Holiday List,Tillämplig kalender
@@ -3450,7 +3458,7 @@
 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 +573,Please specify Attribute Value for attribute {0},Ange Attribut Värde för attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3529,7 +3537,7 @@
 DocType: Address,Office,Kontors
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Redovisning journalanteckningar.
 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 +226,Please select Employee Record first.,Välj Anställningsregister först.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,Välj Anställningsregister först.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,Ange utgiftskonto
@@ -3604,7 +3612,7 @@
 DocType: Item Attribute,Numeric Values,Numeriska värden
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Fäst Logo
 DocType: Customer,Commission Rate,Provisionbetyg
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Gör Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Gör Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Block ledighet applikationer avdelningsvis.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Kundvagnen är tom
 DocType: Production Order,Actual Operating Cost,Faktisk driftkostnad
@@ -3621,15 +3629,14 @@
 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 +380,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 +419,"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 +408,"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 +380, (Half Day),(Halv Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Hämta artiklar från BOM
diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv
index fd03aa1..957f5f6 100644
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% வசூலிக்கப்படும்
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),மாற்று வீதம் அதே இருக்க வேண்டும் {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,வாடிக்கையாளர் பெயர்
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},வங்கி கணக்கு என பெயரிடப்பட்டது {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},வங்கி கணக்கு என பெயரிடப்பட்டது {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),சிறந்த {0} பூஜ்யம் விட குறைவாக இருக்க முடியாது ( {1} )
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,புதிய விடுப்பு விண்ணப்பம்
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,புதிய விடுப்பு விண்ணப்பம்
 apps/erpnext/erpnext/setup/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,கொடுப்பனவு கணக்கு முறை
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","செயல்பாடுகள் பரிசீலனை, பில்லிங் நேரம் கண்காணிப்பு பயன்படுத்த முடியும் என்று பணிகளை எதிராக செய்த செய்யப்படுகிறது."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},புதிய {0}: # {1}
 ,Sales Partners Commission,விற்பனை பங்குதாரர்கள் ஆணையம்
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,சுருக்கமான விட 5 எழுத்துக்கள் முடியாது
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,சுருக்கமான விட 5 எழுத்துக்கள் முடியாது
 DocType: Payment Request,Payment Request,பணம் கோரிக்கை
 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.",மதிப்பு {0} {1} பொருள் என மாறிகள் \ இருந்து அகற்ற முடியாது பண்பு இந்த கற்பிதம் கொண்டு இருக்கிறது.
@@ -196,6 +196,7 @@
 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 (%),விலை பட்டியல் விகிதம் தள்ளுபடி (%)
 DocType: Offer Letter,Select Terms and Conditions,தேர்வு விதிமுறைகள் மற்றும் நிபந்தனைகள்
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,அவுட் மதிப்பு
 DocType: Production Planning Tool,Sales Orders,விற்பனை ஆணைகள்
 DocType: Purchase Taxes and Charges,Valuation,மதிப்பு மிக்க
 ,Purchase Order Trends,ஆர்டர் போக்குகள் வாங்குவதற்கு
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,தொலை காட்சி
 DocType: Production Order Operation,Updated via 'Time Log','டைம் பரிசீலனை' வழியாக புதுப்பிக்கப்பட்டது
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},கணக்கு {0} நிறுவனத்திற்கு சொந்தமானது இல்லை {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},அட்வான்ஸ் தொகை விட அதிகமாக இருக்க முடியாது {0} {1}
 DocType: Naming Series,Series List for this Transaction,இந்த பரிவர்த்தனை தொடர் பட்டியல்
 DocType: Sales Invoice,Is Opening Entry,நுழைவு திறக்கிறது
 DocType: Customer Group,Mention if non-standard receivable account applicable,குறிப்பிட தரமற்ற பெறத்தக்க கணக்கு பொருந்தினால்
@@ -227,7 +229,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,மேலே குறிப்பிட்டுள்ள அடிப்படை சம்பளம் சீட்டு உருவாக்குகிறது.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,கொடுக்கப்பட்ட விளக்கம் இல்லை
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,வாங்குவதற்கு கோரிக்கை.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,"தேர்வு விடுமுறை வீடு, இந்த விடுமுறை விண்ணப்பத்தை"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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} அமைப்பு&gt; அமைப்புகள் வழியாக&gt; பெயரிடும் தொடர் தொடர் பெயரிடும் அமைக்க தயவு செய்து
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},கிடங்கு {0} அல்ல நிறுவனம் {1}
 DocType: Item Website Specification,Item Website Specification,உருப்படியை வலைத்தளம் குறிப்புகள்
 DocType: Payment Tool,Reference No,குறிப்பு இல்லை
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,தடுக்கப்பட்ட விட்டு
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,தடுக்கப்பட்ட விட்டு
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,வருடாந்திர
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,பங்கு நல்லிணக்க பொருள்
 DocType: Stock Entry,Sales Invoice No,விற்பனை விலைப்பட்டியல் இல்லை
@@ -249,7 +251,7 @@
 DocType: Pricing Rule,Supplier Type,வழங்குபவர் வகை
 DocType: Item,Publish in Hub,மையம் உள்ள வெளியிடு
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,பொருள் {0} ரத்து
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,பொருள் {0} ரத்து
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,பொருள் கோரிக்கை
 DocType: Bank Reconciliation,Update Clearance Date,இசைவு தேதி புதுப்பிக்க
 DocType: Item,Purchase Details,கொள்முதல் விவரம்
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,டெலிவரி குறிப்பு
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,வரி அமைத்தல்
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,நீங்கள் அதை இழுத்து பின்னர் கொடுப்பனவு நுழைவு மாற்றப்பட்டுள்ளது. மீண்டும் அதை இழுக்க கொள்ளவும்.
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} பொருள் வரி இரண்டு முறை
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,மாதம் மற்றும் ஆண்டு தேர்ந்தெடுக்கவும்
@@ -329,7 +331,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,உங்கள் மின்னஞ்சல் முகவரியை
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,இணைப்பு பார்க்கவும்
 DocType: Purchase Order,% Received,% பெறப்பட்டது
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,அமைப்பு ஏற்கனவே முடிந்து !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,அமைப்பு ஏற்கனவே முடிந்து !
 ,Finished Goods,முடிக்கப்பட்ட பொருட்கள்
 DocType: Delivery Note,Instructions,அறிவுறுத்தல்கள்
 DocType: Quality Inspection,Inspected By,மூலம் ஆய்வு
@@ -354,14 +356,13 @@
 ,Purchase Register,பதிவு வாங்குவதற்கு
 DocType: Landed Cost Item,Applicable Charges,பிரயோகிக்கப்படும் கட்டணங்கள்
 DocType: Workstation,Consumable Cost,நுகர்வோர் விலை
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) பங்கு வேண்டும் 'விடுப்பு தரப்பில் சாட்சி'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) பங்கு வேண்டும் 'விடுப்பு தரப்பில் சாட்சி'
 DocType: Purchase Receipt,Vehicle Date,வாகன தேதி
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,மருத்துவம்
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,இழந்து காரணம்
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},பணிநிலையம் விடுமுறை பட்டியல் படி பின்வரும் தேதிகளில் மூடப்பட்டுள்ளது {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,வாய்ப்புகள்
 DocType: Employee,Single,ஒற்றை
-DocType: Issue,Attachment,இணைப்பு
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,பட்ஜெட் குழு செலவு மையம் அமைக்க
 DocType: Account,Cost of Goods Sold,விற்கப்படும் பொருட்களின் விலை
 DocType: Purchase Invoice,Yearly,வருடாந்திர
@@ -390,7 +391,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,கற்பிதம் {0} காரணிகள் அட்டவணை பல முறை தேர்வு
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,கற்பிதம் {0} காரணிகள் அட்டவணை பல முறை தேர்வு
 DocType: HR Settings,Employee record is created using selected field. ,பணியாளர் பதிவு தேர்ந்தெடுக்கப்பட்ட துறையில் பயன்படுத்தி உருவாக்கப்பட்டது.
 DocType: Sales Order,Not Applicable,பொருந்தாது
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,விடுமுறை மாஸ்டர் .
@@ -429,7 +430,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,ஒப்பனை
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items","ஒன்றாக்க , பின்வரும் பண்புகளை இரு பொருட்களை சமமாக இருக்க வேண்டும்"
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","ஒன்றாக்க , பின்வரும் பண்புகளை இரு பொருட்களை சமமாக இருக்க வேண்டும்"
 DocType: Shipping Rule,Net Weight,நிகர எடை
 DocType: Employee,Emergency Phone,அவசர தொலைபேசி
 ,Serial No Warranty Expiry,தொடர் இல்லை உத்தரவாதத்தை காலாவதியாகும்
@@ -440,7 +441,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,நிர்வாக உப ஒப்பந்தமிடல்
 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,விலை பட்டியல் நாணய நிறுவனத்தின் அடிப்படை நாணய மாற்றப்படும் விகிதத்தை
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},கணக்கு {0} நிறுவனத்திற்கு சொந்தமானது இல்லை: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},கணக்கு {0} நிறுவனத்திற்கு சொந்தமானது இல்லை: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,சுருக்கமான ஏற்கனவே மற்றொரு நிறுவனம் பயன்படுத்தப்படும்
 DocType: Selling Settings,Default Customer Group,முன்னிருப்பு வாடிக்கையாளர் பிரிவு
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","முடக்கவும், &#39;வட்டமான மொத்த&#39; என்றால் துறையில் எந்த பரிமாற்றத்தில் பார்க்க முடியாது"
 DocType: BOM,Operating Cost,இயக்க செலவு
@@ -476,6 +478,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,விலைப்பட்டியல் அட்டவணை காணப்படவில்லை பதிவுகள்
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,முதல் நிறுவனம் மற்றும் கட்சி வகை தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,நிதி / கணக்கு ஆண்டு .
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,திரட்டப்பட்ட கலாச்சாரம்
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","மன்னிக்கவும், சீரியல் இலக்கங்கள் ஒன்றாக்க முடியாது"
 DocType: Project Task,Project Task,திட்ட பணி
 ,Lead Id,முன்னணி ஐடி
@@ -497,7 +500,7 @@
 DocType: Quotation,Quotation To,என்று மேற்கோள்
 DocType: Lead,Middle Income,நடுத்தர வருமானம்
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),துவாரம் ( CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"நீங்கள் ஏற்கனவே மற்றொரு UOM சில பரிவர்த்தனை (ங்கள்) செய்துவிட்டேன் ஏனெனில் பொருள் நடவடிக்கையாக, இயல்புநிலை பிரிவு {0} நேரடியாக மாற்ற முடியாது. நீங்கள் வேறு ஒரு இயல்புநிலை UOM பயன்படுத்த ஒரு புதிய பொருள் உருவாக்க வேண்டும்."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"நீங்கள் ஏற்கனவே மற்றொரு UOM சில பரிவர்த்தனை (ங்கள்) செய்துவிட்டேன் ஏனெனில் பொருள் நடவடிக்கையாக, இயல்புநிலை பிரிவு {0} நேரடியாக மாற்ற முடியாது. நீங்கள் வேறு ஒரு இயல்புநிலை UOM பயன்படுத்த ஒரு புதிய பொருள் உருவாக்க வேண்டும்."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,ஒதுக்கப்பட்ட தொகை எதிர்மறை இருக்க முடியாது
 DocType: Purchase Order Item,Billed Amt,கணக்கில் AMT
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"பங்கு உள்ளீடுகளை செய்யப்படுகின்றன எதிராக, ஒரு தருக்க கிடங்கு."
@@ -575,7 +578,7 @@
 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 +543,Item has variants.,பொருள் வகைகள் உண்டு.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,மரம் வகை
@@ -588,6 +591,7 @@
 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 +33,Goods received from Suppliers.,பொருட்கள் விநியோகஸ்தர்கள் இருந்து பெற்றார்.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,மதிப்பு
 DocType: Lead,Campaign Name,பிரச்சாரம் பெயர்
 ,Reserved,முன்பதிவு
 DocType: Purchase Order,Supply Raw Materials,வழங்கல் மூலப்பொருட்கள்
@@ -602,16 +606,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,ஏற்கனவே பரிவர்த்தனை கணக்கு பேரேடு மாற்றப்பட முடியாது
 DocType: Delivery Note,Customer's Purchase Order No,வாடிக்கையாளர் கொள்முதல் ஆர்டர் இல்லை
 DocType: Employee,Cell Number,செல் எண்
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,ஆட்டோ பொருள் கோரிக்கைகள் உருவாக்கிய
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,ஆட்டோ பொருள் கோரிக்கைகள் உருவாக்கிய
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,லாஸ்ட்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,"நீங்கள் பத்தியில், 'ஜர்னல் ஆஃப் நுழைவு எதிராக' தற்போதைய ரசீது நுழைய முடியாது"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,சக்தி
 DocType: Opportunity,Opportunity From,வாய்ப்பு வரம்பு
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,மாத சம்பளம் அறிக்கை.
 DocType: Item Group,Website Specifications,இணையத்தளம் விருப்பம்
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},உங்கள் முகவரி டெம்ப்ளேட் பிழை உள்ளது {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,புதிய கணக்கு
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0} இருந்து: {0} வகை {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,ரோ {0}: மாற்று காரணி கட்டாய ஆகிறது
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","பல விலை விதிகள் அளவுகோல் கொண்டு உள்ளது, முன்னுரிமை ஒதுக்க மூலம் மோதலை தீர்க்க தயவு செய்து. விலை விதிகள்: {0}"
 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.,கணக்கியல் உள்ளீடுகள் இலை முனைகளில் எதிராகவும். குழுக்களுக்கு எதிராக பதிவுகள் அனுமதி இல்லை.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,செயலிழக்க அல்லது அது மற்ற BOM கள் தொடர்பு உள்ளது என BOM ரத்துசெய்ய முடியாது
 DocType: Opportunity,Maintenance,பராமரிப்பு
@@ -673,7 +679,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,விலை பட்டியல் தேர்வு
 DocType: Employee,Family Background,குடும்ப பின்னணி
 DocType: Process Payroll,Send Email,மின்னஞ்சல் அனுப்ப
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},எச்சரிக்கை: தவறான இணைப்பு {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},எச்சரிக்கை: தவறான இணைப்பு {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,இல்லை அனுமதி
 DocType: Company,Default Bank Account,முன்னிருப்பு வங்கி கணக்கு
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",கட்சி அடிப்படையில் வடிகட்ட தேர்ந்தெடுக்கவும் கட்சி முதல் வகை
@@ -703,13 +709,13 @@
 DocType: Production Planning Tool,Select Items,தேர்ந்தெடு
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} பில் எதிராக {1} தேதியிட்ட {2}
 DocType: Maintenance Visit,Completion Status,நிறைவு நிலைமை
-DocType: Sales Invoice Item,Target Warehouse,இலக்கு கிடங்கு
+DocType: Production Order,Target Warehouse,இலக்கு கிடங்கு
 DocType: Item,Allow over delivery or receipt upto this percent,இந்த சதவிகிதம் வரை விநியோக அல்லது ரசீது மீது அனுமதிக்கவும்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,எதிர்பார்க்கப்படுகிறது பிரசவ தேதி முன் விற்பனை ஆணை தேதி இருக்க முடியாது
 DocType: Upload Attendance,Import Attendance,இறக்குமதி பங்கேற்கும்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,அனைத்து பொருள் குழுக்கள்
 DocType: Process Payroll,Activity Log,நடவடிக்கை புகுபதிகை
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,நிகர லாபம் / இழப்பு
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,நிகர லாபம் / இழப்பு
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,தானாக நடவடிக்கைகள் சமர்ப்பிப்பு செய்தி உருவாக்கும் .
 DocType: Production Order,Item To Manufacture,உற்பத்தி பொருள்
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} நிலையை {2} ஆகிறது
@@ -717,7 +723,7 @@
 DocType: Sales Order Item,Projected Qty,திட்டமிட்டிருந்தது அளவு
 DocType: Sales Invoice,Payment Due Date,கொடுப்பனவு காரணமாக தேதி
 DocType: Newsletter,Newsletter Manager,செய்திமடல் மேலாளர்
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,பொருள் மாற்று {0} ஏற்கனவே அதே பண்புகளை கொண்ட உள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,பொருள் மாற்று {0} ஏற்கனவே அதே பண்புகளை கொண்ட உள்ளது
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;திறந்து&#39;
 DocType: Notification Control,Delivery Note Message,டெலிவரி குறிப்பு செய்தி
 DocType: Expense Claim,Expenses,செலவுகள்
@@ -727,7 +733,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,ஆராய்ச்சி மற்றும் அபிவிருத்தி
 ,Amount to Bill,பில் தொகை
 DocType: Company,Registration Details,பதிவு விவரங்கள்
-DocType: Item,Re-Order Qty,மீண்டும் ஒழுங்கு அளவு
+DocType: Item Reorder,Re-Order Qty,மீண்டும் ஒழுங்கு அளவு
 DocType: Leave Block List Date,Leave Block List Date,பிளாக் பட்டியல் தேதி விட்டு
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},அனுப்ப திட்டமிடப்பட்டுள்ளது {0}
 DocType: Pricing Rule,Price or Discount,விலை அல்லது தள்ளுபடி
@@ -770,7 +776,7 @@
 DocType: Bank Reconciliation,Total Amount,மொத்த தொகை
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,இணைய பப்ளிஷிங்
 DocType: Production Planning Tool,Production Orders,தயாரிப்பு ஆணைகள்
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,இருப்பு மதிப்பு
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,இருப்பு மதிப்பு
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,விற்பனை விலை பட்டியல்
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,பொருட்களை ஒத்திசைக்க வெளியிடு
 DocType: Bank Reconciliation,Account Currency,கணக்கு நாணய
@@ -779,7 +785,7 @@
 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 +538,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
 DocType: Quality Inspection Reading,Reading 6,6 படித்தல்
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,விலைப்பட்டியல் அட்வான்ஸ் வாங்குவதற்கு
 DocType: Address,Shop,ஷாப்பிங்
@@ -856,7 +862,7 @@
 DocType: POS Profile,Cash/Bank Account,பண / வங்கி கணக்கு
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,அளவு அல்லது மதிப்பு எந்த மாற்றமும் நீக்கப்பட்ட விடயங்கள்.
 DocType: Delivery Note,Delivery To,வழங்கும்
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,தள்ளுபடி
@@ -884,7 +890,7 @@
 DocType: Tax Rule,Shipping State,கப்பல் மாநிலம்
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,பொருள் பொத்தானை 'வாங்குதல் ரசீதுகள் இருந்து விடயங்கள் பெறவும்' பயன்படுத்தி சேர்க்க
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,விற்பனை செலவு
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,ஸ்டாண்டர்ட் வாங்குதல்
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,ஸ்டாண்டர்ட் வாங்குதல்
 DocType: GL Entry,Against,எதிராக
 DocType: Item,Default Selling Cost Center,இயல்புநிலை விற்பனை செலவு மையம்
 DocType: Sales Partner,Implementation Partner,செயல்படுத்தல் வரன்வாழ்க்கை துணை
@@ -926,7 +932,7 @@
 DocType: Sales Partner,Distributor,பகிர்கருவி
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,வண்டியில் கப்பல் விதி
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,உத்தரவு {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',அமைக்க மேலும் கூடுதல் தள்ளுபடி விண்ணப்பிக்கவும் &#39;தயவு செய்து
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',அமைக்க மேலும் கூடுதல் தள்ளுபடி விண்ணப்பிக்கவும் &#39;தயவு செய்து
 ,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.,நேரம் பதிவுகள் தேர்ந்தெடுத்து ஒரு புதிய விற்பனை விலைப்பட்டியல் உருவாக்க சமர்ப்பிக்கவும்.
@@ -994,9 +1000,9 @@
 DocType: Contact,User ID,பயனர் ஐடி
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,காட்சி லெட்ஜர்
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,மிகமுந்திய
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group","ஒரு உருப்படி குழு அதே பெயரில் , உருப்படி பெயர் மாற்ற அல்லது உருப்படியை குழு பெயர்மாற்றம் செய்க"
 DocType: Production Order,Manufacture against Sales Order,விற்பனை அமைப்புக்கு எதிராக உற்பத்தி
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,உலகம் முழுவதும்
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,ஒட்டு மொத்த ஊதியம் / சம்பளம்
@@ -1026,7 +1032,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","மன்னிக்கவும், நிறுவனங்கள் ஒன்றாக்க முடியாது"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","மன்னிக்கவும், நிறுவனங்கள் ஒன்றாக்க முடியாது"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,சிறிய
 DocType: Employee,Employee Number,பணியாளர் எண்
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},வழக்கு எண் (கள்) ஏற்கனவே பயன்பாட்டில் உள்ளது. வழக்கு எண் இருந்து முயற்சி {0}
@@ -1045,7 +1051,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,விவசாயம்
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,உங்கள் தயாரிப்புகள் அல்லது சேவைகள்
 DocType: Mode of Payment,Mode of Payment,கட்டணம் செலுத்தும் முறை
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,இணைய பட ஒரு பொது கோப்பு அல்லது வலைத்தளத்தின் URL இருக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,இணைய பட ஒரு பொது கோப்பு அல்லது வலைத்தளத்தின் URL இருக்க வேண்டும்
 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,சேமிப்பு கிடங்கு தொடர்பு தகவல்
@@ -1117,6 +1123,7 @@
 DocType: Address,Utilities,பயன்பாடுகள்
 DocType: Purchase Invoice Item,Accounting,கணக்கு வைப்பு
 DocType: Features Setup,Features Setup,அம்சங்கள் அமைப்பு
+DocType: Item,Is Service Item,சேவை பொருள் ஆகும்
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,விண்ணப்ப காலம் வெளியே விடுப்பு ஒதுக்கீடு காலம் இருக்க முடியாது
 DocType: Activity Cost,Projects,திட்டங்கள்
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,நிதியாண்டு தேர்வு செய்க
@@ -1147,7 +1154,7 @@
 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 +465,cannot be greater than 100,100 க்கும் அதிகமாக இருக்க முடியாது
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
 DocType: Maintenance Visit,Unscheduled,திட்டமிடப்படாத
 DocType: Employee,Owned,சொந்தமானது
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,சம்பளமில்லா விடுப்பு பொறுத்தது
@@ -1207,7 +1214,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,அரசாங்கம்
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,பொருள் மாறிகள்
 DocType: Company,Services,சேவைகள்
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),மொத்த ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),மொத்த ({0})
 DocType: Cost Center,Parent Cost Center,பெற்றோர் செலவு மையம்
 DocType: Sales Invoice,Source,மூல
 DocType: Leave Type,Is Leave Without Pay,சம்பளமில்லா விடுப்பு
@@ -1280,17 +1287,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,கொடுப்பனவு மின்னஞ்சலை மீண்டும் அனுப்புக
 DocType: Dependent Task,Dependent Task,தங்கிவாழும் பணி
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},வகை விடுப்பு {0} மேலாக இருக்க முடியாது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,உட்கொள்ளுகிறது தொகை
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} காண்க
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,பண நிகர மாற்றம்
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,பண நிகர மாற்றம்
 DocType: Salary Structure Deduction,Salary Structure Deduction,சம்பளம் அமைப்பு பொருத்தியறிதல்
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,நடவடிக்கை அலகு {0} மேலும் மாற்று காரணி அட்டவணை முறை விட உள்ளிட்ட
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,நடவடிக்கை அலகு {0} மேலும் மாற்று காரணி அட்டவணை முறை விட உள்ளிட்ட
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},பணம் கோரிக்கை ஏற்கனவே உள்ளது {0}
 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 +182,Quantity must not be more than {0},அளவு அதிகமாக இருக்க கூடாது {0}
@@ -1352,7 +1359,7 @@
 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: Packed Item,To Warehouse (Optional),கிடங்கில் (கட்டாயமில்லை)
 DocType: Sales Invoice,Paid Amount (Company Currency),செலுத்தப்பட்ட தொகை எவ்வளவு (நிறுவனத்தின் நாணய)
 DocType: Purchase Invoice,Additional Discount,கூடுதல் தள்ளுபடி
 DocType: Selling Settings,Selling Settings,அமைப்புகள் விற்பனை
@@ -1361,7 +1368,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","நிறுவனத்தின் , மாதம் மற்றும் நிதியாண்டு கட்டாயமாகும்"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,மார்க்கெட்டிங் செலவுகள்
 ,Item Shortage Report,பொருள் பற்றாக்குறை அறிக்கை
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","எடை கூட ""எடை UOM"" குறிப்பிட தயவு செய்து \n குறிப்பிடப்பட்டுள்ளது"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","எடை கூட ""எடை UOM"" குறிப்பிட தயவு செய்து \n குறிப்பிடப்பட்டுள்ளது"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,இந்த பங்கு நுழைவு செய்ய பயன்படுத்தப்படும் பொருள் கோரிக்கை
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,ஒரு பொருள் ஒரே யூனிட்.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',நேரம் பதிவு தொகுப்பு {0} ' Submitted'
@@ -1372,6 +1379,7 @@
 DocType: Employee,Date Of Retirement,ஓய்வு தேதி
 DocType: Upload Attendance,Get Template,வார்ப்புரு கிடைக்கும்
 DocType: Address,Postal,தபால் அலுவலகம் சார்ந்த
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext அமைவு முடிந்தது!
 DocType: Item,Weightage,Weightage
 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,ஒரு வாடிக்கையாளர் குழு அதே பெயரில் வாடிக்கையாளர் பெயர் மாற்ற அல்லது வாடிக்கையாளர் குழு பெயர்மாற்றம் செய்க
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,முதல் {0} தேர்ந்தெடுக்கவும்.
@@ -1400,12 +1408,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,பல பத்திகள். அறிக்கை ஏற்றுமதி மற்றும் ஒரு விரிதாள் பயன்பாட்டை பயன்படுத்தி அச்சிட.
 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 +139,Main,முதன்மை
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,முதன்மை
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,மாற்று
 DocType: Naming Series,Set prefix for numbering series on your transactions,உங்கள் நடவடிக்கைகள் மீது தொடர் எண்ணுவதற்கான முன்னொட்டு அமைக்க
 DocType: Employee Attendance Tool,Employees HTML,"ஊழியர், HTML"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,நிறுத்தி பொருட்டு ரத்து செய்ய முடியாது . ரத்து செய்ய தடை இல்லாத .
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,"இயல்புநிலை BOM, ({0}) இந்த உருப்படியை அல்லது அதன் டெம்ப்ளேட் தீவிரமாக இருக்க வேண்டும்"
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,மாறிகள்
@@ -1430,7 +1438,6 @@
 DocType: Sales Order,To Deliver and Bill,வழங்க மசோதா
 DocType: GL Entry,Credit Amount in Account Currency,கணக்கு நாணய கடன் தொகை
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,உற்பத்தி நேரம் மற்றும் பதிவுகள்.
-DocType: Item,Apply Warehouse-wise Reorder Level,கிடங்கு வாரியான மறுவரிசைப்படுத்துக நிலை விண்ணப்பிக்கவும்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} சமர்ப்பிக்க வேண்டும்
 DocType: Authorization Control,Authorization Control,அங்கீகாரம் கட்டுப்பாடு
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ரோ # {0}: கிடங்கு நிராகரிக்கப்பட்டது நிராகரித்தது பொருள் எதிராக கட்டாயமாகும் {1}
@@ -1529,6 +1536,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,ரோ # {0}: ஆபரேஷன் {1} உற்பத்தி முடிந்ததும் பொருட்களின் {2} கொத்தமல்லி நிறைவு இல்லை ஒழுங்கு # {3}. நேரம் பதிவுகள் வழியாக அறுவை சிகிச்சை நிலையை மேம்படுத்த தயவு செய்து
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,முதலீடுகள்
 DocType: Issue,Resolution Details,தீர்மானம் விவரம்
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,ஒதுக்கீடுகள்
 DocType: Quality Inspection Reading,Acceptance Criteria,ஏற்று வரையறைகள்
 DocType: Item Attribute,Attribute Name,பெயர் பண்பு
 DocType: Item Group,Show In Website,இணையத்தளம் காண்பி
@@ -1579,7 +1587,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,செலவு கோரும் அனுமதிக்காக நிலுவையில் உள்ளது . மட்டுமே செலவு அப்ரூவரான நிலையை மேம்படுத்த முடியும் .
 DocType: Purchase Invoice,Additional Discount Amount,கூடுதல் தள்ளுபடி தொகை
 DocType: Leave Block List Allow,Leave Block List Allow,பிளாக் பட்டியல் அனுமதி விட்டு
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr வெற்று இடைவெளி அல்லது இருக்க முடியாது
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr வெற்று இடைவெளி அல்லது இருக்க முடியாது
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,அல்லாத குழு குழு
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,விளையாட்டு
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,உண்மையான மொத்த
@@ -1620,7 +1628,7 @@
 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**.,** நிதியாண்டு ** ஒரு நிதி ஆண்டு பிரதிபலிக்கிறது. அனைத்து உள்ளீடுகளை மற்றும் பிற முக்கிய பரிமாற்றங்கள் ** ** நிதியாண்டு எதிரான கண்காணிக்கப்படும்.
 DocType: Opportunity,Customer / Lead Address,வாடிக்கையாளர் / முன்னணி முகவரி
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},எச்சரிக்கை: இணைப்பு தவறான SSL சான்றிதழ் {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},எச்சரிக்கை: இணைப்பு தவறான SSL சான்றிதழ் {0}
 DocType: Production Order Operation,Actual Operation Time,உண்மையான நடவடிக்கையை நேரம்
 DocType: Authorization Rule,Applicable To (User),பொருந்தும் (பயனர்)
 DocType: Purchase Taxes and Charges,Deduct,தள்ளு
@@ -1769,7 +1777,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,வழக்கு எண் 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,நீங்கள் விற்பனை குழு மற்றும் விற்பனை பங்குதாரர்கள் (சேனல் பங்குதாரர்கள்) அவர்கள் குறித்துள்ளார் முடியும் மற்றும் விற்பனை நடவடிக்கைகளில் தங்களது பங்களிப்பை பராமரிக்க வேண்டும்
 DocType: Item,Show a slideshow at the top of the page,பக்கம் மேலே ஒரு ஸ்லைடு ஷோ
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,ஸ்டோர்கள்
+DocType: Item,"Allow in Sales Order of type ""Service""",வகை &quot;சேவை&quot; என்ற விற்பனை ஆணை அனுமதி
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,ஸ்டோர்கள்
 DocType: Time Log,Projects Manager,திட்டங்கள் மேலாளர்
 DocType: Serial No,Delivery Time,விநியோக நேரம்
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,அன்று Based
@@ -1794,7 +1803,7 @@
 ,Financial Analytics,நிதி பகுப்பாய்வு
 DocType: Quality Inspection,Verified By,மூலம் சரிபார்க்கப்பட்ட
 DocType: Address,Subsidiary,உப
-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.","ஏற்கனவே நடவடிக்கைகள் உள்ளன, ஏனெனில் , நிறுவனத்தின் இயல்புநிலை நாணய மாற்ற முடியாது. நடவடிக்கைகள் இயல்புநிலை நாணய மாற்ற இரத்து செய்யப்பட வேண்டும்."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","ஏற்கனவே நடவடிக்கைகள் உள்ளன, ஏனெனில் , நிறுவனத்தின் இயல்புநிலை நாணய மாற்ற முடியாது. நடவடிக்கைகள் இயல்புநிலை நாணய மாற்ற இரத்து செய்யப்பட வேண்டும்."
 DocType: Quality Inspection,Purchase Receipt No,இல்லை சீட்டு வாங்க
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,பிணை உறுதி பணம்
 DocType: Process Payroll,Create Salary Slip,சம்பளம் ஸ்லிப் உருவாக்க
@@ -1842,7 +1851,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,மூலப்பொருட்கள் காலியாக இருக்க முடியாது.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","பங்கு புதுப்பிக்க முடியவில்லை, விலைப்பட்டியல் துளி கப்பல் உருப்படி உள்ளது."
 DocType: Newsletter,Test,சோதனை
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'","இருக்கும் பங்கு பரிவர்த்தனைகள் நீங்கள் மதிப்புகள் மாற்ற முடியாது \ இந்த உருப்படி, உள்ளன &#39;என்பதைப் தொ.எ. உள்ளது&#39;, &#39;தொகுதி எவ்வித&#39;, &#39;பங்கு உருப்படியை&#39; மற்றும் &#39;மதிப்பீட்டு முறை&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,விரைவு ஜர்னல் நுழைவு
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,BOM எந்த பொருளை agianst குறிப்பிட்டுள்ள நீங்கள் வீதம் மாற்ற முடியாது
@@ -1951,7 +1960,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,"தயவு செய்து டெலிவரி முதல் குறிப்பு,"
 DocType: Purchase Invoice,Currency and Price List,நாணயம் மற்றும் விலை பட்டியல்
 DocType: Opportunity,Customer / Lead Name,வாடிக்கையாளர் / முன்னணி பெயர்
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,இசைவு தேதி குறிப்பிடப்படவில்லை
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,இசைவு தேதி குறிப்பிடப்படவில்லை
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,உற்பத்தி
 DocType: Item,Allow Production Order,உற்பத்தி ஆர்டர் அனுமதி
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,ரோ {0} : தொடங்கும் நாள் நிறைவு நாள் முன்னதாக இருக்க வேண்டும்
@@ -1961,7 +1970,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,மொத்த வருமானம்
 DocType: Purchase Receipt,Time at which materials were received,பொருட்கள் பெற்றனர் எந்த நேரத்தில்
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,என்னுடைய ஒரு முகவரிக்கு
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,என்னுடைய ஒரு முகவரிக்கு
 DocType: Stock Ledger Entry,Outgoing Rate,வெளிச்செல்லும் விகிதம்
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,அமைப்பு கிளை மாஸ்டர் .
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,அல்லது
@@ -2030,7 +2039,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,வாடிக்கையாளர் குழு மரம் நிர்வகி .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,புதிய செலவு மையம் பெயர்
 DocType: Leave Control Panel,Leave Control Panel,கண்ட்ரோல் பேனல் விட்டு
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,இயல்புநிலை முகவரி டெம்ப்ளேட் காணப்படுகிறது. அமைப்பு> அச்சிடுதல் மற்றும் பிராண்டிங் இருந்து ஒரு புதிய ஒரு> முகவரி டெம்ப்ளேட் உருவாக்க தயவுசெய்து.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,இயல்புநிலை முகவரி டெம்ப்ளேட் காணப்படுகிறது. அமைப்பு> அச்சிடுதல் மற்றும் பிராண்டிங் இருந்து ஒரு புதிய ஒரு> முகவரி டெம்ப்ளேட் உருவாக்க தயவுசெய்து.
 DocType: Appraisal,HR User,அலுவலக பயனர்
 DocType: Purchase Invoice,Taxes and Charges Deducted,கழிக்கப்படும் வரி மற்றும் கட்டணங்கள்
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,சிக்கல்கள்
@@ -2047,7 +2056,7 @@
 ,Sales Browser,விற்னையாளர் உலாவி
 DocType: Journal Entry,Total Credit,மொத்த கடன்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},எச்சரிக்கை: மற்றொரு {0} # {1} பங்கு நுழைவதற்கு எதிராக உள்ளது {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,உள்ளூர்
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,பெரிய
@@ -2066,7 +2075,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,நீங்கள் அமைக்க மற்றும் இலக்குகள் கண்காணிக்க முடியும் என்று அனைத்து விற்பனை நடவடிக்கைகள் பல ** விற்பனை நபர்கள் ** எதிரான குறித்துள்ளார்.
 ,S.O. No.,S.O. இல்லை
 DocType: Production Order Operation,Make Time Log,நேரம் பதிவு செய்ய
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,", ஆர்டர் அளவு அமைக்க, தயவு செய்து"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},முன்னணி இருந்து வாடிக்கையாளர் உருவாக்க தயவுசெய்து {0}
 DocType: Price List,Applicable for Countries,நாடுகள் பொருந்தும்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,கணினி
@@ -2153,7 +2161,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,தொடர்புடைய பதிவுகள் பெற
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,பங்கு பைனான்ஸ் நுழைவு
 DocType: Sales Invoice,Sales Team1,விற்பனை Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,பொருள் {0} இல்லை
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,பொருள் {0} இல்லை
 DocType: Sales Invoice,Customer Address,வாடிக்கையாளர் முகவரி
 DocType: Payment Request,Recipient and Message,பெறுநர் மற்றும் செய்தி
 DocType: Purchase Invoice,Apply Additional Discount On,கூடுதல் தள்ளுபடி விண்ணப்பிக்கவும்
@@ -2195,7 +2203,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,மதிப்பீட்டு விகிதம்
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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,பதிவு மறுபெயர்
@@ -2233,7 +2241,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,தேதி நிவாரணத்தில் உள்ளிடவும்.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,விவரங்கள்
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,மட்டுமே சமர்ப்பிக்க முடியும் ' அங்கீகரிக்கப்பட்ட ' நிலை பயன்பாடுகள் விட்டு
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,முகவரி தலைப்பு கட்டாயமாகும்.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,முகவரி தலைப்பு கட்டாயமாகும்.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,விசாரணை மூலம் பிரச்சாரம் என்று பிரச்சாரம் பெயரை உள்ளிடவும்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,பத்திரிகை வெளியீட்டாளர்கள்
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,நிதியாண்டு வாய்ப்புகள்
@@ -2257,6 +2265,7 @@
 DocType: UOM,Must be Whole Number,முழு எண் இருக்க வேண்டும்
 DocType: Leave Control Panel,New Leaves Allocated (In Days),புதிய இலைகள் (டேஸ்) ஒதுக்கப்பட்ட
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,தொடர் இல {0} இல்லை
+DocType: Sales Invoice Item,Customer Warehouse (Optional),வாடிக்கையாளர் கிடங்கு (விரும்பினால்)
 DocType: Pricing Rule,Discount Percentage,தள்ளுபடி சதவீதம்
 DocType: Payment Reconciliation Invoice,Invoice Number,விலைப்பட்டியல் எண்
 apps/erpnext/erpnext/hooks.py +55,Orders,ஆணைகள்
@@ -2366,7 +2375,7 @@
 DocType: Appraisal,Appraisal,மதிப்பிடுதல்
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,தேதி மீண்டும்
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,அங்கீகரிக்கப்பட்ட கையொப்பதாரரால்
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},"விட்டு வீடு, ஒன்றாக இருக்க வேண்டும் {0}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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,தொடக்க நேரம்
@@ -2535,7 +2544,7 @@
 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 +733,Show tax break-up,காட்டு வரி இடைவெளிக்கு அப்
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,காட்டு வரி இடைவெளிக்கு அப்
 apps/erpnext/erpnext/accounts/party.py +283,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',நீங்கள் உற்பத்தி துறையில் உள்ளடக்கியது என்றால் . பொருள் இயக்கும் ' உற்பத்தி செய்யப்படுகிறது '
@@ -2585,7 +2594,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,மீண்டும் தட்டச்சு நிறுவனத்தின் பெயர் உறுதிப்படுத்த தயவு செய்து
@@ -2612,9 +2621,6 @@
 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,சேர தேதி பிறந்த தேதி விட அதிகமாக இருக்க வேண்டும்
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,சம்பளம் அமைப்பு
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","பல விலை விதி அதே அளவுகோலை கொண்டு உள்ளது, முன்னுரிமை ஒதுக்க மூலம் \
- மோதல் தீர்க்க செய்யவும். விலை விதிகள்: {0}"
 DocType: Account,Bank,வங்கி
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,விமானத்துறை
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,பிரச்சினை பொருள்
@@ -2639,7 +2645,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,செக்யூரிட்டிஸ் & பண்ட பரிமாற்ற
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',மாற்று அளவீடு இயல்புநிலை யூனிட் &#39;{0}&#39; டெம்ப்ளேட் அதே இருக்க வேண்டும் &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',மாற்று அளவீடு இயல்புநிலை யூனிட் &#39;{0}&#39; டெம்ப்ளேட் அதே இருக்க வேண்டும் &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ஆனால் அடிப்படையில் கணக்கிட
 DocType: Delivery Note Item,From Warehouse,கிடங்கில் இருந்து
 DocType: Purchase Taxes and Charges,Valuation and Total,மதிப்பீடு மற்றும் மொத்த
@@ -2648,7 +2654,7 @@
 DocType: Account,Purchase User,கொள்முதல் பயனர்
 DocType: Notification Control,Customize the Notification,அறிவிப்பு தனிப்பயனாக்கு
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,செயல்பாடுகள் இருந்து பண பரிமாற்ற
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,இயல்புநிலை முகவரி டெம்ப்ளேட் நீக்க முடியாது
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,இயல்புநிலை முகவரி டெம்ப்ளேட் நீக்க முடியாது
 DocType: Sales Invoice,Shipping Rule,கப்பல் விதி
 DocType: Manufacturer,Limited to 12 characters,12 எழுத்துக்கள் மட்டுமே
 DocType: Journal Entry,Print Heading,தலைப்பு அச்சிட
@@ -2742,7 +2748,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,திட்ட வாரியான தரவு மேற்கோள் கிடைக்கவில்லை
 DocType: Project,Expected End Date,எதிர்பார்க்கப்படுகிறது முடிவு தேதி
 DocType: Appraisal Template,Appraisal Template Title,மதிப்பீட்டு வார்ப்புரு தலைப்பு
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,வர்த்தகம்
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,வியப்பா சேவைகள்
@@ -2761,7 +2767,7 @@
 DocType: Customer,Default Receivable Accounts,கணக்குகள் இயல்புநிலை
 DocType: Tax Rule,Billing State,பில்லிங் மாநிலம்
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,பரிமாற்றம்
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),( துணை கூட்டங்கள் உட்பட ) வெடித்தது BOM எடு
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),( துணை கூட்டங்கள் உட்பட ) வெடித்தது BOM எடு
 DocType: Authorization Rule,Applicable To (Employee),பொருந்தும் (பணியாளர்)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,தேதி அத்தியாவசியமானதாகும்
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,பண்பு உயர்வு {0} 0 இருக்க முடியாது
@@ -2794,7 +2800,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,எதிர்மறை மதிப்பீட்டு விகிதம் அனுமதி இல்லை
 DocType: Holiday List,Weekly Off,இனிய வாராந்திர
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","உதாரணமாக 2012, 2012-13 க்கான"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),இடைக்கால லாபம் / நஷ்டம் (கடன்)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),இடைக்கால லாபம் / நஷ்டம் (கடன்)
 DocType: Sales Invoice,Return Against Sales Invoice,எதிராக விற்பனை விலைப்பட்டியல் திரும்ப
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,பொருள் 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},நிறுவனத்தின் இயல்புநிலை மதிப்பு {0} அமைக்க தயவு செய்து {1}
@@ -2825,6 +2831,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,குழந்தை சேர்
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,பங்கு உறைந்த கணக்குகள் & திருத்து உறைந்த பதிவுகள் அமைக்க அனுமதி
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,அது குழந்தை முனைகள் என லெட்ஜரிடம் செலவு மையம் மாற்ற முடியாது
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,திறப்பு மதிப்பு
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,தொடர் #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,விற்பனையில் கமிஷன்
 DocType: Offer Letter Term,Value / Description,மதிப்பு / விளக்கம்
@@ -2858,7 +2865,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,வெற்றிகரமாக இந்த நிறுவனம் தொடர்பான அனைத்து நடவடிக்கைகளில் நீக்கப்பட்டது!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,தேதி வரை
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,சோதனை காலம்
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,இயல்புநிலை கிடங்கு பங்கு பொருள் கட்டாயமாகும்.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},மாதம் சம்பளம் கொடுப்பனவு {0} மற்றும் ஆண்டு {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,வாகன நுழைவு விலை பட்டியல் விகிதம் காணாமல் என்றால்
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,மொத்த கட்டண தொகை
@@ -2894,7 +2900,7 @@
 DocType: Payment Tool,Set Matching Amounts,அமைக்கவும் மேட்சிங் தொகை
 DocType: Purchase Invoice,Taxes and Charges Added,வரிகள் மற்றும் கட்டணங்கள் சேர்க்கப்பட்டது
 ,Sales Funnel,விற்பனை நீக்க
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,சுருக்கமான கட்டாயமாகும்
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,சுருக்கமான கட்டாயமாகும்
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,எங்கள் மேம்படுத்தல்கள் சந்தாதாரராக உங்கள் ஆர்வத்திற்கு நன்றி
 ,Qty to Transfer,இடமாற்றம் அளவு
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,தாங்கியவர்கள் விளைவாக அல்லது வாடிக்கையாளர்களுக்கு மேற்கோள்.
@@ -2922,7 +2928,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,வழங்குபவர் விலைப்பட்டியல்
 DocType: Quotation,In Words will be visible once you save the Quotation.,நீங்கள் மேற்கோள் சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} நிறுத்தி உள்ளது
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},பார்கோடு {0} ஏற்கனவே பொருள் பயன்படுத்தப்படுகிறது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,எதிர்வரும் நிகழ்வுகள்
@@ -2945,7 +2951,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,நிதியாண்டு தேர்ந்தெடுக்கவும் ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,பிஓஎஸ் செய்தது பிஓஎஸ் நுழைவு செய்ய வேண்டும்
 DocType: Hub Settings,Name Token,பெயர் டோக்கன்
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,ஸ்டாண்டர்ட் விற்பனை
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,ஸ்டாண்டர்ட் விற்பனை
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,குறைந்தது ஒரு கிடங்கில் அவசியமானதாகும்
 DocType: Serial No,Out of Warranty,உத்தரவாதத்தை வெளியே
 DocType: BOM Replace Tool,Replace,பதிலாக
@@ -3068,7 +3074,7 @@
 DocType: Sales Invoice,Paid Amount,பணம் தொகை
 ,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,வேறு எந்த இயல்புநிலை உள்ளது என இயல்புநிலை முகவரி டெம்ப்ளேட் அமைக்க
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,வேறு எந்த இயல்புநிலை உள்ளது என இயல்புநிலை முகவரி டெம்ப்ளேட் அமைக்க
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ஏற்கனவே பற்று உள்ள கணக்கு நிலுவை, நீங்கள் 'கடன்' இருப்பு வேண்டும் 'அமைக்க அனுமதி இல்லை"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,தர மேலாண்மை
 DocType: Production Planning Tool,Filter based on customer,வாடிக்கையாளர் அடிப்படையில் வடிகட்ட
@@ -3169,7 +3175,7 @@
 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 +19,Shortage Qty,பற்றாக்குறைவே அளவு
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
 DocType: Salary Slip,Salary Slip,சம்பளம் ஸ்லிப்
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' தேதி ' தேவைப்படுகிறது
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","தொகுப்புகள் வழங்க வேண்டும் ஐந்து சீட்டுகள் பொதி உருவாக்குதல். தொகுப்பு எண், தொகுப்பு உள்ளடக்கங்களை மற்றும் அதன் எடை தெரிவிக்க பயன்படுகிறது."
@@ -3180,7 +3186,7 @@
 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.","சரி நடவடிக்கைகள் எந்த &quot;Submitted&quot; போது, ஒரு மின்னஞ்சல் பாப் அப் தானாகவே ஒரு இணைப்பாக பரிவர்த்தனை மூலம், அந்த பரிமாற்றத்தில் தொடர்புடைய &quot;தொடர்பு&quot; ஒரு மின்னஞ்சல் அனுப்ப திறக்கப்பட்டது. பயனர் அல்லது மின்னஞ்சல் அனுப்ப முடியாது."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,உலகளாவிய அமைப்புகள்
 DocType: Employee Education,Employee Education,ஊழியர் கல்வி
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,அது பொருள் விவரம் எடுக்க தேவை.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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} ஏற்கனவே பெற்றுள்ளது
@@ -3206,6 +3212,7 @@
 DocType: BOM,Manufacturing User,உற்பத்தி பயனர்
 DocType: Purchase Order,Raw Materials Supplied,மூலப்பொருட்கள் வழங்கியது
 DocType: Purchase Invoice,Recurring Print Format,பெரும்பாலும் உடன் அச்சு வடிவம்
+DocType: C-Form,Series,தொடர்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,எதிர்பார்க்கப்படுகிறது டெலிவரி தேதி கொள்முதல் ஆணை தேதி முன் இருக்க முடியாது
 DocType: Appraisal,Appraisal Template,மதிப்பீட்டு வார்ப்புரு
 DocType: Item Group,Item Classification,பொருள் பிரிவுகள்
@@ -3292,7 +3299,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},ரோ {0}: ஒரு மறுவரிசைப்படுத்துக நுழைவு ஏற்கனவே இந்த கிடங்கு உள்ளது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.","இழந்தது மேற்கோள் செய்யப்பட்டது ஏனெனில் , அறிவிக்க முடியாது ."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,கொள்முதல் மாஸ்டர் மேலாளர்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,உத்தரவு {0} சமர்ப்பிக்க வேண்டும்
@@ -3300,7 +3307,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,முக்கிய செய்திகள்
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,தேதி தேதி முதல் முன் இருக்க முடியாது
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc டாக்டைப்பின்
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,/ திருத்த விலை சேர்க்கவும்
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,என்னுடைய கட்டளைகள்
@@ -3348,7 +3355,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},ரோ # {0}: உருப்படியை அமைக்க சப்ளையர் {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,பொருள் {1} இணைக்கப்பட்ட வலைத்தளம் பட {0} காணலாம்
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,பொருள் {1} இணைக்கப்பட்ட வலைத்தளம் பட {0} காணலாம்
 DocType: Issue,Content Type,உள்ளடக்க வகை
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,கம்ப்யூட்டர்
 DocType: Item,List this Item in multiple groups on the website.,வலைத்தளத்தில் பல குழுக்கள் இந்த உருப்படி பட்டியல்.
@@ -3362,7 +3369,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,' சீரியல் இல்லை உள்ளது ' அல்லாத பங்கு உருப்படியை 'ஆம்' இருக்க முடியாது
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'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,கணக்கு ஒதுக்கும் தலைப்பு - பிரிவு
@@ -3388,7 +3395,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,கணக்கு {0} நிறைவு வகை பொறுப்பு / ஈக்விட்டி இருக்க வேண்டும்
 DocType: Authorization Rule,Based On,அடிப்படையில்
 DocType: Sales Order Item,Ordered Qty,அளவு உத்தரவிட்டார்
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
 DocType: Stock Settings,Stock Frozen Upto,பங்கு வரை உறை
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},வரம்பு மற்றும் காலம் மீண்டும் மீண்டும் கட்டாய தேதிகள் காலம் {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,திட்ட செயல்பாடு / பணி.
@@ -3396,7 +3403,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","பொருந்துகின்ற என தேர்வு என்றால் வாங்குதல், சரிபார்க்கப்பட வேண்டும் {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,தள்ளுபடி 100 க்கும் குறைவான இருக்க வேண்டும்
 DocType: Purchase Invoice,Write Off Amount (Company Currency),தொகை ஆஃப் எழுத (நிறுவனத்தின் நாணய)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,ரோ # {0}: மீள் கட்டளை அளவு அமைக்க கொள்ளவும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,ரோ # {0}: மீள் கட்டளை அளவு அமைக்க கொள்ளவும்
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed செலவு வவுச்சர்
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},அமைக்கவும் {0}
 DocType: Purchase Invoice,Repeat on Day of Month,மாதம் ஒரு நாள் மீண்டும்
@@ -3469,7 +3476,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,இப்போது காண்க
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,விலைப்பட்டியல் தானாக உருவாக்கப்படும் போது காலம் தேர்வு
 DocType: BOM,Raw Material Cost,மூலப்பொருட்களின் செலவு
-DocType: Item,Re-Order Level,மீண்டும் ஒழுங்கு நிலை
+DocType: Item Reorder,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.,நீங்கள் உற்பத்தி ஆர்டர்கள் உயர்த்த அல்லது ஆய்வில் மூலப்பொருட்கள் பதிவிறக்க வேண்டிய உருப்படிகளை மற்றும் திட்டமிட்ட அளவு உள்ளிடவும்.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,பகுதி நேர
 DocType: Employee,Applicable Holiday List,பொருந்தும் விடுமுறை பட்டியல்
@@ -3524,7 +3531,7 @@
 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 +573,Please specify Attribute Value for attribute {0},பண்பு மதிப்பு பண்பு குறிப்பிடவும் {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3603,7 +3610,7 @@
 DocType: Address,Office,அலுவலகம்
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,பைனான்ஸ் ஜர்னல் பதிவுகள்.
 DocType: Delivery Note Item,Available Qty at From Warehouse,கிடங்கில் இருந்து கிடைக்கும் அளவு
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,முதல் பணியாளர் பதிவு தேர்ந்தெடுத்து கொள்ளவும்.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,முதல் பணியாளர் பதிவு தேர்ந்தெடுத்து கொள்ளவும்.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,செலவு கணக்கு உள்ளிடவும்
@@ -3678,7 +3685,7 @@
 DocType: Item Attribute,Numeric Values,எண்மதிப்பையும்
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,லோகோ இணைக்கவும்
 DocType: Customer,Commission Rate,கமிஷன் விகிதம்
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,மாற்று செய்ய
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,மாற்று செய்ய
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,துறை மூலம் பயன்பாடுகள் விட்டு தடுக்கும்.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,கார்ட் காலியாக உள்ளது
 DocType: Production Order,Actual Operating Cost,உண்மையான இயக்க செலவு
@@ -3695,15 +3702,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item","மீள் கட்டளை நிலை அமைக்க, உருப்படி ஒரு கொள்முதல் பொருள் அல்லது தயாரிப்பு பொருள் இருக்க வேண்டும்"
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),(அரை நாள்)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(அரை நாள்)
 DocType: Supplier,Credit Days,கடன் நாட்கள்
 DocType: Leave Type,Is Carry Forward,அடுத்த Carry
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,BOM இருந்து பொருட்களை பெற
diff --git a/erpnext/translations/te.csv b/erpnext/translations/te.csv
index 3de7a94..2df2254 100644
--- a/erpnext/translations/te.csv
+++ b/erpnext/translations/te.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% కస్టమర్లకు
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),ఎక్స్చేంజ్ రేట్ అదే ఉండాలి {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,వినియోగదారుని పేరు
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},బ్యాంక్ ఖాతా పేరుతో సాధ్యం కాదు {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},బ్యాంక్ ఖాతా పేరుతో సాధ్యం కాదు {0}
 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.","కరెన్సీ, మార్పిడి రేటు, ఎగుమతి మొత్తం, ఎగుమతి గ్రాండ్ మొత్తం 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 +173,Outstanding for {0} cannot be less than zero ({1}),అత్యుత్తమ {0} ఉండకూడదు కంటే తక్కువ సున్నా ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,న్యూ లీవ్ అప్లికేషన్
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,న్యూ లీవ్ అప్లికేషన్
 apps/erpnext/erpnext/setup/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,చెల్లింపు ఖాతా మోడ్
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","చర్యలు యొక్క లాగ్, బిల్లింగ్ సమయం ట్రాకింగ్ కోసం ఉపయోగించవచ్చు పనులు వ్యతిరేకంగా వినియోగదారులు ప్రదర్శించారు."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},న్యూ {0}: # {1}
 ,Sales Partners Commission,సేల్స్ భాగస్వాములు కమిషన్
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,కంటే ఎక్కువ 5 అక్షరాలు కాదు సంక్షిప్తీకరణ
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,కంటే ఎక్కువ 5 అక్షరాలు కాదు సంక్షిప్తీకరణ
 DocType: Payment Request,Payment Request,చెల్లింపు అభ్యర్థన
 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.",విలువ {0} {1} అంశం వంటి రకరకాలు \ నుండి తొలగించడం సాధ్యం కాదు లక్షణం ఈ లక్షణం చోటుచేసుకున్నాయి.
@@ -195,6 +195,7 @@
 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 (%),ధర జాబితా రేటు తగ్గింపు (%)
 DocType: Offer Letter,Select Terms and Conditions,Select నియమాలు మరియు నిబంధనలు
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,అవుట్ విలువ
 DocType: Production Planning Tool,Sales Orders,సేల్స్ ఆర్డర్స్
 DocType: Purchase Taxes and Charges,Valuation,వాల్యువేషన్
 ,Purchase Order Trends,ఆర్డర్ ట్రెండ్లులో కొనుగోలు
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,టెలివిజన్
 DocType: Production Order Operation,Updated via 'Time Log',&#39;టైం లోగ్&#39; ద్వారా నవీకరించబడింది
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},ఖాతా {0} కంపెనీకి చెందినది కాదు {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},అడ్వాన్స్ మొత్తాన్ని కంటే ఎక్కువ ఉండకూడదు {0} {1}
 DocType: Naming Series,Series List for this Transaction,ఈ లావాదేవీ కోసం సిరీస్ జాబితా
 DocType: Sales Invoice,Is Opening Entry,ఎంట్రీ ప్రారంభ ఉంది
 DocType: Customer Group,Mention if non-standard receivable account applicable,మెన్షన్ ప్రామాణికం కాని స్వీకరించదగిన ఖాతా వర్తిస్తే
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,పైన పేర్కొన్న ప్రమాణాలను కోసం జీతం స్లిప్ సృష్టిస్తుంది.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,ఇచ్చిన వివరణను
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,కొనుగోలు కోసం అభ్యర్థన.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,మాత్రమే ఎంచుకున్న లీవ్ అప్రూవర్గా ఈ లీవ్ అప్లికేషన్ సమర్పించవచ్చు
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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} సెటప్&gt; సెట్టింగ్స్ ద్వారా&gt; నామకరణ సిరీస్ నామకరణ సెట్ చెయ్యండి
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},{0} వేర్హౌస్ కంపెనీకి చెందినది కాదు {1}
 DocType: Item Website Specification,Item Website Specification,అంశం వెబ్సైట్ స్పెసిఫికేషన్
 DocType: Payment Tool,Reference No,ప్రస్తావన
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Leave నిరోధిత
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},అంశం {0} జీవితం యొక్క దాని ముగింపు చేరుకుంది {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,Leave నిరోధిత
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},అంశం {0} జీవితం యొక్క దాని ముగింపు చేరుకుంది {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,వార్షిక
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,స్టాక్ సయోధ్య అంశం
 DocType: Stock Entry,Sales Invoice No,సేల్స్ వాయిస్ లేవు
@@ -248,7 +250,7 @@
 DocType: Pricing Rule,Supplier Type,సరఫరాదారు టైప్
 DocType: Item,Publish in Hub,హబ్ లో ప్రచురించండి
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,{0} అంశం రద్దు
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,{0} అంశం రద్దు
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,మెటీరియల్ అభ్యర్థన
 DocType: Bank Reconciliation,Update Clearance Date,నవీకరణ క్లియరెన్స్ తేదీ
 DocType: Item,Purchase Details,కొనుగోలు వివరాలు
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,డెలివరీ గమనిక
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,పన్నులు ఏర్పాటు
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,మీరు వైదొలగిన తర్వాత చెల్లింపు ఎంట్రీ మారిస్తే. మళ్ళీ తీసి దయచేసి.
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} అంశం పన్ను రెండుసార్లు ఎంటర్
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,నెల మరియు సంవత్సరం దయచేసి ఎంచుకోండి
@@ -327,7 +329,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,మీ ఇమెయిల్ చిరునామా
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,అటాచ్మెంట్ చూడండి
 DocType: Purchase Order,% Received,% పొందింది
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,సెటప్ ఇప్పటికే సంపూర్ణ !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,సెటప్ ఇప్పటికే సంపూర్ణ !!
 ,Finished Goods,తయారైన వస్తువులు
 DocType: Delivery Note,Instructions,సూచనలు
 DocType: Quality Inspection,Inspected By,తనిఖీలు
@@ -352,14 +354,13 @@
 ,Purchase Register,కొనుగోలు నమోదు
 DocType: Landed Cost Item,Applicable Charges,వర్తించే ఛార్జీలు
 DocType: Workstation,Consumable Cost,వినిమయ వ్యయం
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) పాత్ర కలిగి ఉండాలి &#39;లీవ్ అప్రూవర్గా&#39;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) పాత్ర కలిగి ఉండాలి &#39;లీవ్ అప్రూవర్గా&#39;
 DocType: Purchase Receipt,Vehicle Date,వాహనం తేదీ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,మెడికల్
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,కోల్పోయినందుకు కారణము
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},కార్యక్షేత్ర హాలిడే జాబితా ప్రకారం క్రింది తేదీలు మూసివేయబడింది: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,అవకాశాలు
 DocType: Employee,Single,సింగిల్
-DocType: Issue,Attachment,జోడింపు
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,బడ్జెట్ గ్రూప్ ఖర్చు సెంటర్ సెట్ సాధ్యం కాదు
 DocType: Account,Cost of Goods Sold,వస్తువుల ఖర్చు సోల్డ్
 DocType: Purchase Invoice,Yearly,వార్షిక
@@ -388,7 +389,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,లక్షణం {0} గుణాలు పట్టిక పలుమార్లు ఎంపిక
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,లక్షణం {0} గుణాలు పట్టిక పలుమార్లు ఎంపిక
 DocType: HR Settings,Employee record is created using selected field. ,Employee రికార్డు ఎంపిక రంగంలో ఉపయోగించి రూపొందించినవారు ఉంది.
 DocType: Sales Order,Not Applicable,వర్తించదు
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,హాలిడే మాస్టర్.
@@ -427,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,కాస్మటిక్స్
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items","విలీనం, క్రింది రెండు లక్షణాలతో అంశాలను అదే ఉండాలి"
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","విలీనం, క్రింది రెండు లక్షణాలతో అంశాలను అదే ఉండాలి"
 DocType: Shipping Rule,Net Weight,నికర బరువు
 DocType: Employee,Emergency Phone,అత్యవసర ఫోన్
 ,Serial No Warranty Expiry,సీరియల్ తోబుట్టువుల సంఖ్య వారంటీ గడువు
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,మేనేజింగ్ ఉప
 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,రేటు ధర జాబితా కరెన్సీ కంపెనీ బేస్ కరెన్సీ మార్చబడుతుంది
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},{0} ఖాతా కంపెనీకి చెందదు: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},{0} ఖాతా కంపెనీకి చెందదు: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,సంక్షిప్త ఇప్పటికే మరొక సంస్థ కోసం ఉపయోగిస్తారు
 DocType: Selling Settings,Default Customer Group,డిఫాల్ట్ కస్టమర్ గ్రూప్
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","ఆపివేసినా, &#39;నున్నటి మొత్తం&#39; రంగంలో ఏ లావాదేవీ లో కనిపించవు"
 DocType: BOM,Operating Cost,నిర్వహణ ఖర్చు
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,వాయిస్ పట్టిక కనుగొనబడలేదు రికార్డులు
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,మొదటి కంపెనీ మరియు పార్టీ రకాన్ని ఎంచుకోండి
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,ఫైనాన్షియల్ / అకౌంటింగ్ సంవత్సరం.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,పోగుచేసిన విలువలు
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","క్షమించండి, సీరియల్ సంఖ్యలు విలీనం సాధ్యం కాదు"
 DocType: Project Task,Project Task,ప్రాజెక్ట్ టాస్క్
 ,Lead Id,లీడ్ ID
@@ -492,7 +495,7 @@
 DocType: Quotation,Quotation To,.కొటేషన్
 DocType: Lead,Middle Income,మధ్య ఆదాయ
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),ప్రారంభ (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,మీరు ఇప్పటికే మరొక UoM కొన్ని ట్రాన్సాక్షన్ (లు) చేసిన ఎందుకంటే అంశం కోసం మెజర్ అప్రమేయ యూనిట్ {0} నేరుగా మారలేదు. మీరు వేరే డిఫాల్ట్ UoM ఉపయోగించడానికి ఒక కొత్త అంశాన్ని సృష్టించడానికి అవసరం.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,మీరు ఇప్పటికే మరొక UoM కొన్ని ట్రాన్సాక్షన్ (లు) చేసిన ఎందుకంటే అంశం కోసం మెజర్ అప్రమేయ యూనిట్ {0} నేరుగా మారలేదు. మీరు వేరే డిఫాల్ట్ UoM ఉపయోగించడానికి ఒక కొత్త అంశాన్ని సృష్టించడానికి అవసరం.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,కేటాయించింది మొత్తం ప్రతికూల ఉండకూడదు
 DocType: Purchase Order Item,Billed Amt,బిల్ ఆంట్
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,స్టాక్ ఎంట్రీలు తయారు చేస్తారు ఇది వ్యతిరేకంగా ఒక తార్కిక వేర్హౌస్.
@@ -570,7 +573,7 @@
 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 +543,Item has variants.,అంశం రకాల్లో.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,ట్రీ టైప్
@@ -583,6 +586,7 @@
 DocType: Journal Entry,Credit Card Entry,క్రెడిట్ కార్డ్ ఎంట్రీ
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,టాస్క్ Subject
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,గూడ్స్ పంపిణీదారుల నుండి పొందింది.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,విలువ
 DocType: Lead,Campaign Name,ప్రచారం పేరు
 ,Reserved,రిసర్వ్డ్
 DocType: Purchase Order,Supply Raw Materials,సప్లై రా మెటీరియల్స్
@@ -597,16 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,ఇప్పటికే లావాదేవీతో ఖాతా లెడ్జర్ మార్చబడతాయి కాదు
 DocType: Delivery Note,Customer's Purchase Order No,కస్టమర్ యొక్క కొనుగోలు ఆర్డర్ సంఖ్య
 DocType: Employee,Cell Number,సెల్ సంఖ్య
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,ఆటో మెటీరియల్ అభ్యర్థనలు రూపొందించినవి
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,ఆటో మెటీరియల్ అభ్యర్థనలు రూపొందించినవి
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,లాస్ట్
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,మీరు కాలమ్ &#39;జర్నల్ ఎంట్రీ వ్యతిరేకంగా&#39; ప్రస్తుత రసీదును ఎంటర్ కాదు
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,శక్తి
 DocType: Opportunity,Opportunity From,నుండి అవకాశం
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,మంత్లీ జీతం ప్రకటన.
 DocType: Item Group,Website Specifications,వెబ్సైట్ లక్షణాలు
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},మీ చిరునామా మూస లోపం ఉంది {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,కొత్త ఖాతా
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: నుండి {0} రకం {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,రో {0}: మార్పిడి ఫాక్టర్ తప్పనిసరి
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","అదే ప్రమాణాల బహుళ ధర రూల్స్ ఉనికిలో ఉంది, ప్రాధాన్యత కేటాయించి వివాద పరిష్కారం దయచేసి. ధర నియమాలు: {0}"
 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.,అకౌంటింగ్ ఎంట్రీలు ఆకు నోడ్స్ వ్యతిరేకంగా తయారు చేయవచ్చు. గుంపులు వ్యతిరేకంగా ఎంట్రీలు అనుమతి లేదు.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,సోమరిగాచేయు లేదా ఇతర BOMs తో అనుసంధానం BOM రద్దు కాదు
 DocType: Opportunity,Maintenance,నిర్వహణ
@@ -649,7 +655,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,ధర జాబితా ఎంచుకోలేదు
 DocType: Employee,Family Background,కుటుంబ నేపథ్యం
 DocType: Process Payroll,Send Email,ఇమెయిల్ పంపండి
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},హెచ్చరిక: చెల్లని జోడింపు {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},హెచ్చరిక: చెల్లని జోడింపు {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,అనుమతి లేదు
 DocType: Company,Default Bank Account,డిఫాల్ట్ బ్యాంక్ ఖాతా
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",పార్టీ ఆధారంగా ఫిల్టర్ ఎన్నుకోండి పార్టీ మొదటి రకం
@@ -679,13 +685,13 @@
 DocType: Production Planning Tool,Select Items,ఐటమ్లను ఎంచుకోండి
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} బిల్లుకు వ్యతిరేకంగా {1} నాటి {2}
 DocType: Maintenance Visit,Completion Status,పూర్తి స్థితి
-DocType: Sales Invoice Item,Target Warehouse,టార్గెట్ వేర్హౌస్
+DocType: Production Order,Target Warehouse,టార్గెట్ వేర్హౌస్
 DocType: Item,Allow over delivery or receipt upto this percent,ఈ శాతం వరకు డెలివరీ లేదా రసీదులు పైగా అనుమతించు
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,ఊహించినది డెలివరీ తేదీ సేల్స్ ఆర్డర్ తేదీ ముందు ఉండరాదు
 DocType: Upload Attendance,Import Attendance,దిగుమతి హాజరు
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,అన్ని అంశం గుంపులు
 DocType: Process Payroll,Activity Log,కార్యాచరణ లాగ్
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,నికర లాభం / నష్టం
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,నికర లాభం / నష్టం
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,స్వయంచాలకంగా లావాదేవీల సమర్పణ సందేశాన్ని కంపోజ్.
 DocType: Production Order,Item To Manufacture,అంశం తయారీకి
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} స్థితి {2} ఉంది
@@ -693,7 +699,7 @@
 DocType: Sales Order Item,Projected Qty,ప్రొజెక్టెడ్ ప్యాక్ చేసిన అంశాల
 DocType: Sales Invoice,Payment Due Date,చెల్లింపు గడువు తేదీ
 DocType: Newsletter,Newsletter Manager,వార్తా మేనేజర్
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,అంశం వేరియంట్ {0} ఇప్పటికే అదే గుణ ఉంది
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,అంశం వేరియంట్ {0} ఇప్పటికే అదే గుణ ఉంది
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;ప్రారంభిస్తున్నాడు&#39;
 DocType: Notification Control,Delivery Note Message,డెలివరీ గమనిక సందేశం
 DocType: Expense Claim,Expenses,ఖర్చులు
@@ -703,7 +709,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,రీసెర్చ్ &amp; డెవలప్మెంట్
 ,Amount to Bill,బిల్ మొత్తం
 DocType: Company,Registration Details,నమోదు వివరాలు
-DocType: Item,Re-Order Qty,రీ-ఆర్డర్ ప్యాక్ చేసిన అంశాల
+DocType: Item Reorder,Re-Order Qty,రీ-ఆర్డర్ ప్యాక్ చేసిన అంశాల
 DocType: Leave Block List Date,Leave Block List Date,బ్లాక్ జాబితా తేది వదిలి
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},పంపవచ్చని షెడ్యూల్డ్ {0}
 DocType: Pricing Rule,Price or Discount,ధర లేదా డిస్కౌంట్
@@ -746,7 +752,7 @@
 DocType: Bank Reconciliation,Total Amount,మొత్తం డబ్బు
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,ఇంటర్నెట్ పబ్లిషింగ్
 DocType: Production Planning Tool,Production Orders,ఉత్పత్తి ఆర్డర్స్
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,సంతులనం విలువ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,సంతులనం విలువ
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,సేల్స్ ధర జాబితా
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,అంశాలను సమకాలీకరించడానికి ప్రచురించు
 DocType: Bank Reconciliation,Account Currency,ఖాతా కరెన్సీ
@@ -755,7 +761,7 @@
 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 +538,Item Variants {0} updated,అంశం రకరకాలు {0} నవీకరించబడింది
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,అంశం రకరకాలు {0} నవీకరించబడింది
 DocType: Quality Inspection Reading,Reading 6,6 పఠనం
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,వాయిస్ అడ్వాన్స్ కొనుగోలు
 DocType: Address,Shop,షాప్
@@ -832,7 +838,7 @@
 DocType: POS Profile,Cash/Bank Account,క్యాష్ / బ్యాంక్ ఖాతా
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,పరిమాణం లేదా విలువ ఎటువంటి మార్పు తొలగించబడిన అంశాలు.
 DocType: Delivery Note,Delivery To,డెలివరీ
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,లక్షణం పట్టిక తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,డిస్కౌంట్
@@ -860,7 +866,7 @@
 DocType: Tax Rule,Shipping State,షిప్పింగ్ రాష్ట్రం
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,అంశం బటన్ &#39;కొనుగోలు రసీదులు నుండి అంశాలు పొందండి&#39; ఉపయోగించి జత చేయాలి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,సేల్స్ ఖర్చులు
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,ప్రామాణిక కొనుగోలు
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,ప్రామాణిక కొనుగోలు
 DocType: GL Entry,Against,ఎగైనెస్ట్
 DocType: Item,Default Selling Cost Center,డిఫాల్ట్ సెల్లింగ్ ఖర్చు సెంటర్
 DocType: Sales Partner,Implementation Partner,అమలు భాగస్వామి
@@ -902,7 +908,7 @@
 DocType: Sales Partner,Distributor,పంపిణీదారు
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,షాపింగ్ కార్ట్ షిప్పింగ్ రూల్
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,ఉత్పత్తి ఆర్డర్ {0} ఈ అమ్మకాల ఆర్డర్ రద్దు ముందే రద్దు చేయాలి
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',సెట్ &#39;న అదనపు డిస్కౌంట్ వర్తించు&#39; దయచేసి
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',సెట్ &#39;న అదనపు డిస్కౌంట్ వర్తించు&#39; దయచేసి
 ,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.,సమయం దినచర్య ఎంచుకోండి మరియు ఒక కొత్త సేల్స్ వాయిస్ సృష్టించడానికి సమర్పించండి.
@@ -970,9 +976,9 @@
 DocType: Contact,User ID,వినియోగదారుని గుర్తింపు
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,చూడండి లెడ్జర్
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,తొట్టతొలి
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group","ఒక అంశం గ్రూప్ అదే పేరుతో, అంశం పేరు మార్చడానికి లేదా అంశం సమూహం పేరు దయచేసి"
 DocType: Production Order,Manufacture against Sales Order,అమ్మకాల ఆర్డర్ వ్యతిరేకంగా తయారీ
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,ప్రపంచంలోని మిగిలిన
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,స్థూల పే
@@ -1002,7 +1008,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","క్షమించండి, కంపెనీలు విలీనం సాధ్యం కాదు"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","క్షమించండి, కంపెనీలు విలీనం సాధ్యం కాదు"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,చిన్న
 DocType: Employee,Employee Number,Employee సంఖ్య
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},కేస్ లేదు (s) ఇప్పటికే ఉపయోగంలో ఉంది. కేస్ నో నుండి ప్రయత్నించండి {0}
@@ -1021,7 +1027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,వ్యవసాయం
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,మీ ఉత్పత్తులు లేదా సేవల
 DocType: Mode of Payment,Mode of Payment,చెల్లింపు విధానం
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,వెబ్సైట్ చిత్రం పబ్లిక్ ఫైలు లేదా వెబ్సైట్ URL అయి ఉండాలి
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,వెబ్సైట్ చిత్రం పబ్లిక్ ఫైలు లేదా వెబ్సైట్ URL అయి ఉండాలి
 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,వేర్హౌస్ సంప్రదింపు సమాచారం
@@ -1093,6 +1099,7 @@
 DocType: Address,Utilities,యుటిలిటీస్
 DocType: Purchase Invoice Item,Accounting,అకౌంటింగ్
 DocType: Features Setup,Features Setup,ఫీచర్స్ సెటప్
+DocType: Item,Is Service Item,సర్వీస్ Item ఉంది
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,అప్లికేషన్ కాలం వెలుపల సెలవు కేటాయింపు కాలం ఉండకూడదు
 DocType: Activity Cost,Projects,ప్రాజెక్ట్స్
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,ఫిస్కల్ ఇయర్ దయచేసి ఎంచుకోండి
@@ -1123,7 +1130,7 @@
 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 +465,cannot be greater than 100,100 కంటే ఎక్కువ ఉండకూడదు
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,{0} అంశం స్టాక్ అంశం కాదు
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,{0} అంశం స్టాక్ అంశం కాదు
 DocType: Maintenance Visit,Unscheduled,అనుకోని
 DocType: Employee,Owned,ఆధ్వర్యంలోని
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,పే లేకుండా వదిలి ఆధారపడి
@@ -1182,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,ప్రభుత్వం
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,అంశం రకరకాలు
 DocType: Company,Services,సర్వీసులు
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),మొత్తం ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),మొత్తం ({0})
 DocType: Cost Center,Parent Cost Center,మాతృ ఖర్చు సెంటర్
 DocType: Sales Invoice,Source,మూల
 DocType: Leave Type,Is Leave Without Pay,పే లేకుండా వదిలి ఉంటుంది
@@ -1255,17 +1262,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,చెల్లింపు ఇమెయిల్ను మళ్లీ పంపండి
 DocType: Dependent Task,Dependent Task,అస్వతంత్ర టాస్క్
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},రకం లీవ్ {0} కంటే ఎక్కువ ఉండరాదు {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,వినియోగించిన మొత్తం
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} చూడండి
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,నగదు నికర మార్పు
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,నగదు నికర మార్పు
 DocType: Salary Structure Deduction,Salary Structure Deduction,జీతం నిర్మాణం తీసివేత
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,మెజర్ {0} యొక్క యూనిట్ మార్పిడి ఫాక్టర్ టేబుల్ లో ఒకసారి కంటే ఎక్కువ నమోదు చేయబడింది
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,మెజర్ {0} యొక్క యూనిట్ మార్పిడి ఫాక్టర్ టేబుల్ లో ఒకసారి కంటే ఎక్కువ నమోదు చేయబడింది
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},చెల్లింపు అభ్యర్థన ఇప్పటికే ఉంది {0}
 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 +182,Quantity must not be more than {0},పరిమాణం కంటే ఎక్కువ ఉండకూడదు {0}
@@ -1327,7 +1334,7 @@
 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: Packed Item,To Warehouse (Optional),గిడ్డంగి (ఆప్షనల్)
 DocType: Sales Invoice,Paid Amount (Company Currency),మొత్తం చెల్లించారు (కంపెనీ కరెన్సీ)
 DocType: Purchase Invoice,Additional Discount,అదనపు డిస్కౌంట్
 DocType: Selling Settings,Selling Settings,సెట్టింగులు సెల్లింగ్
@@ -1336,7 +1343,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","కంపెనీ, నెల మరియు ఫిస్కల్ ఇయర్ తప్పనిసరి"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,మార్కెటింగ్ ఖర్చులు
 ,Item Shortage Report,అంశం కొరత రిపోర్ట్
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","బరువు \ n దయచేసి చాలా &quot;బరువు UoM&quot; చెప్పలేదు, ప్రస్తావించబడింది"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","బరువు \ n దయచేసి చాలా &quot;బరువు UoM&quot; చెప్పలేదు, ప్రస్తావించబడింది"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,మెటీరియల్ అభ్యర్థన ఈ స్టాక్ ఎంట్రీ చేయడానికి ఉపయోగిస్తారు
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,ఒక అంశం యొక్క సింగిల్ యూనిట్.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',సమయం లాగిన్ బ్యాచ్ {0} &#39;Submitted&#39; తప్పక
@@ -1347,6 +1354,7 @@
 DocType: Employee,Date Of Retirement,రిటైర్మెంట్ డేట్ అఫ్
 DocType: Upload Attendance,Get Template,మూస పొందండి
 DocType: Address,Postal,పోస్టల్
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext సెటప్ పూర్తి!
 DocType: Item,Weightage,వెయిటేజీ
 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,ఒక కస్టమర్ గ్రూప్ అదే పేరుతో కస్టమర్ పేరును లేదా కస్టమర్ గ్రూప్ పేరు దయచేసి
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,{0} మొదటి ఎంచుకోండి.
@@ -1375,12 +1383,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,చాలా కాలమ్. నివేదిక ఎగుమతి చేయండి మరియు స్ప్రెడ్షీట్ అనువర్తనం ఉపయోగించి ప్రింట్.
 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 +139,Main,ప్రధాన
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,ప్రధాన
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,వేరియంట్
 DocType: Naming Series,Set prefix for numbering series on your transactions,మీ లావాదేవీలపై సిరీస్ నంబరింగ్ కోసం సెట్ ఉపసర్గ
 DocType: Employee Attendance Tool,Employees HTML,ఉద్యోగులు HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,ఆగిపోయింది ఆర్డర్ రద్దు సాధ్యం కాదు. రద్దు Unstop.
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,డిఫాల్ట్ BOM ({0}) ఈ అంశం లేదా దాని టెంప్లేట్ కోసం చురుకుగా ఉండాలి
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,రకరకాలు
@@ -1405,7 +1413,6 @@
 DocType: Sales Order,To Deliver and Bill,బట్వాడా మరియు బిల్
 DocType: GL Entry,Credit Amount in Account Currency,ఖాతా కరెన్సీ లో క్రెడిట్ మొత్తం
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,తయారీ కోసం సమయం దినచర్య.
-DocType: Item,Apply Warehouse-wise Reorder Level,వేర్హౌస్ వారీగా క్రమాన్ని స్థాయి వర్తించు
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,బిఒఎం {0} సమర్పించాలి
 DocType: Authorization Control,Authorization Control,అధికార కంట్రోల్
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},రో # {0}: వేర్హౌస్ తిరస్కరించబడిన తిరస్కరించిన వస్తువు వ్యతిరేకంగా తప్పనిసరి {1}
@@ -1503,6 +1510,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,రో # {0}: ఆపరేషన్ {1} ఉత్పత్తి లో పూర్తి వస్తువుల {2} అంశాల పూర్తిచేయాలని కాదు ఆజ్ఞాపించాలని # {3}. సమయం దినచర్య ద్వారా ఆపరేషన్ డేట్ దయచేసి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,ఇన్వెస్ట్మెంట్స్
 DocType: Issue,Resolution Details,రిజల్యూషన్ వివరాలు
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,కేటాయింపులు
 DocType: Quality Inspection Reading,Acceptance Criteria,అంగీకారం ప్రమాణం
 DocType: Item Attribute,Attribute Name,పేరు లక్షణం
 DocType: Item Group,Show In Website,వెబ్సైట్ షో
@@ -1553,7 +1561,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,ఖర్చు చెప్పడం ఆమోదం లభించవలసి ఉంది. మాత్రమే ఖర్చుల అప్రూవర్గా డేట్ చేయవచ్చు.
 DocType: Purchase Invoice,Additional Discount Amount,అదనపు డిస్కౌంట్ మొత్తం
 DocType: Leave Block List Allow,Leave Block List Allow,బ్లాక్ జాబితా అనుమతించు వదిలి
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr ఖాళీ లేదా ఖాళీ ఉండరాదు
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr ఖాళీ లేదా ఖాళీ ఉండరాదు
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,కాని గ్రూప్ గ్రూప్
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,క్రీడలు
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,యదార్థమైన మొత్తం
@@ -1594,7 +1602,7 @@
 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**.,** ఫిస్కల్ ఇయర్ ** ఆర్థిక సంవత్సరం సూచిస్తుంది. అన్ని అకౌంటింగ్ ఎంట్రీలు మరియు ఇతర ప్రధాన లావాదేవీల ** ** ఫిస్కల్ ఇయర్ వ్యతిరేకంగా చూడబడతాయి.
 DocType: Opportunity,Customer / Lead Address,కస్టమర్ / లీడ్ చిరునామా
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},హెచ్చరిక: అటాచ్మెంట్ చెల్లని SSL సర్టిఫికెట్ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},హెచ్చరిక: అటాచ్మెంట్ చెల్లని SSL సర్టిఫికెట్ {0}
 DocType: Production Order Operation,Actual Operation Time,అసలు ఆపరేషన్ సమయం
 DocType: Authorization Rule,Applicable To (User),వర్తించదగిన (వాడుకరి)
 DocType: Purchase Taxes and Charges,Deduct,తీసివేయు
@@ -1743,7 +1751,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,కేస్ నం 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,మీరు (ఛానల్ భాగస్వాములు) సేల్స్ టీం మరియు అమ్మకానికి భాగస్వాములు ఉంటే వారు ట్యాగ్ మరియు అమ్మకాలు కార్యకలాపాలలో వారి సహకారం నిర్వహించడానికి చేయవచ్చు
 DocType: Item,Show a slideshow at the top of the page,పేజీ ఎగువన ఒక స్లైడ్ చూపించు
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,దుకాణాలు
+DocType: Item,"Allow in Sales Order of type ""Service""",రకం &quot;సేవ&quot; యొక్క అమ్మకాల ఉత్తర్వు అనుమతించు
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,దుకాణాలు
 DocType: Time Log,Projects Manager,ప్రాజెక్ట్స్ మేనేజర్
 DocType: Serial No,Delivery Time,డెలివరీ సమయం
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,ఆధారంగా ఏజింగ్
@@ -1768,7 +1777,7 @@
 ,Financial Analytics,ఫైనాన్షియల్ Analytics
 DocType: Quality Inspection,Verified By,ద్వారా ధృవీకరించబడిన
 DocType: Address,Subsidiary,అనుబంధ
-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.","ఇప్పటికే లావాదేవీలు ఉన్నాయి ఎందుకంటే, కంపెనీ యొక్క డిఫాల్ట్ కరెన్సీ మార్చలేరు. ట్రాన్సాక్షన్స్ డిఫాల్ట్ కరెన్సీ మార్చడానికి రద్దు చేయాలి."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","ఇప్పటికే లావాదేవీలు ఉన్నాయి ఎందుకంటే, కంపెనీ యొక్క డిఫాల్ట్ కరెన్సీ మార్చలేరు. ట్రాన్సాక్షన్స్ డిఫాల్ట్ కరెన్సీ మార్చడానికి రద్దు చేయాలి."
 DocType: Quality Inspection,Purchase Receipt No,కొనుగోలు రసీదులు లేవు
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ఎర్నెస్ట్ మనీ
 DocType: Process Payroll,Create Salary Slip,వేతనం స్లిప్ సృష్టించు
@@ -1816,7 +1825,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,రా మెటీరియల్స్ ఖాళీ ఉండకూడదు.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","స్టాక్ అప్డేట్ కాలేదు, ఇన్వాయిస్ డ్రాప్ షిప్పింగ్ అంశం కలిగి."
 DocType: Newsletter,Test,టెస్ట్
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'","ఉన్న స్టాక్ లావాదేవీలను విలువలను మార్చలేరు \ ఈ అంశాన్ని కోసం ఉన్నాయి &#39;సీరియల్ చెప్పడం&#39;, &#39;బ్యాచ్ ఉంది నో&#39;, &#39;స్టాక్ అంశం&#39; మరియు &#39;వాల్యుయేషన్ విధానం&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,త్వరిత జర్నల్ ఎంట్రీ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,బిఒఎం ఏ అంశం agianst పేర్కొన్నారు ఉంటే మీరు రేటు మార్చలేరు
@@ -1905,7 +1914,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,దయచేసి డెలివరీ గమనిక మొదటి
 DocType: Purchase Invoice,Currency and Price List,కరెన్సీ మరియు ధర జాబితా
 DocType: Opportunity,Customer / Lead Name,కస్టమర్ / లీడ్ పేరు
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,క్లియరెన్స్ తేదీ ప్రస్తావించలేదు
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,క్లియరెన్స్ తేదీ ప్రస్తావించలేదు
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,ఉత్పత్తి
 DocType: Item,Allow Production Order,అనుమతించు ఉత్పత్తి ఆర్డర్
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,రో {0}: ప్రారంభ తేదీ ముగింపు తేదీ ముందు ఉండాలి
@@ -1915,7 +1924,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,మొత్తం ఎర్నింగ్
 DocType: Purchase Receipt,Time at which materials were received,పదార్థాలు అందుకున్న సమయంలో
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,నా చిరునామాలు
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,నా చిరునామాలు
 DocType: Stock Ledger Entry,Outgoing Rate,అవుట్గోయింగ్ రేటు
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,ఆర్గనైజేషన్ శాఖ మాస్టర్.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,లేదా
@@ -1984,7 +1993,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,కస్టమర్ గ్రూప్ ట్రీ నిర్వహించండి.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,కొత్త ఖర్చు సెంటర్ పేరు
 DocType: Leave Control Panel,Leave Control Panel,కంట్రోల్ ప్యానెల్ వదిలి
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,డిఫాల్ట్ చిరునామా మూస దొరకలేదు. సెటప్&gt; ముద్రణ మరియు బ్రాండింగ్&gt; చిరునామా మూస నుండి ఒక కొత్త దానిని రూపొందించే దయచేసి.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,డిఫాల్ట్ చిరునామా మూస దొరకలేదు. సెటప్&gt; ముద్రణ మరియు బ్రాండింగ్&gt; చిరునామా మూస నుండి ఒక కొత్త దానిని రూపొందించే దయచేసి.
 DocType: Appraisal,HR User,ఆర్ వాడుకరి
 DocType: Purchase Invoice,Taxes and Charges Deducted,పన్నులు మరియు ఆరోపణలు తగ్గించబడుతూ
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,ఇష్యూస్
@@ -2001,7 +2010,7 @@
 ,Sales Browser,సేల్స్ బ్రౌజర్
 DocType: Journal Entry,Total Credit,మొత్తం క్రెడిట్
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},హెచ్చరిక: మరో {0} # {1} స్టాక్ ప్రవేశానికి వ్యతిరేకంగా ఉంది {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,స్థానిక
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,పెద్ద
@@ -2020,7 +2029,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,మీరు సెట్ మరియు లక్ష్యాలు మానిటర్ విధంగా అన్ని సేల్స్ లావాదేవీలు బహుళ ** సేల్స్ పర్సన్స్ ** వ్యతిరేకంగా ట్యాగ్ చేయవచ్చు.
 ,S.O. No.,SO నం
 DocType: Production Order Operation,Make Time Log,సమయం లాగిన్ చేయండి
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,క్రమాన్ని పరిమాణం సెట్ చెయ్యండి
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},లీడ్ నుండి కస్టమర్ సృష్టించడానికి దయచేసి {0}
 DocType: Price List,Applicable for Countries,దేశాలు వర్తించే
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,కంప్యూటర్లు
@@ -2095,7 +2103,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,సంబంధిత ఎంట్రీలు పొందండి
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,స్టాక్ కోసం అకౌంటింగ్ ఎంట్రీ
 DocType: Sales Invoice,Sales Team1,సేల్స్ team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,అంశం {0} ఉనికిలో లేదు
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,అంశం {0} ఉనికిలో లేదు
 DocType: Sales Invoice,Customer Address,కస్టమర్ చిరునామా
 DocType: Payment Request,Recipient and Message,గ్రహీతకు అందిస్తామని మరియు సందేశం
 DocType: Purchase Invoice,Apply Additional Discount On,అదనపు డిస్కౌంట్ న వర్తించు
@@ -2137,7 +2145,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,వాల్యువేషన్ రేటు
 apps/erpnext/erpnext/stock/get_item_details.py +274,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} పైన &#39;కొనుగోలు రసీదులు&#39; పట్టిక ఉనికిలో లేదు కొనుగోలు రసీదులు
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Employee {0} has already applied for {1} between {2} and {3},Employee {0} ఇప్పటికే దరఖాస్తు చేశారు {1} మధ్య {2} మరియు {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Employee {0} has already applied for {1} between {2} and {3},Employee {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,లోనికి ప్రవేశించండి పేరుమార్చు
@@ -2175,7 +2183,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,తేదీ ఉపశమనం ఎంటర్ చెయ్యండి.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,ఆంట్
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,కేవలం హోదా &#39;అప్రూవ్డ్ సమర్పించిన చేయవచ్చు దరఖాస్తులను వదిలి
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,చిరునామా శీర్షిక తప్పనిసరి.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,చిరునామా శీర్షిక తప్పనిసరి.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,విచారణ సోర్స్ ప్రచారం ఉంటే ప్రచారం పేరు ఎంటర్
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,వార్తాపత్రిక ప్రచురణ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ఫిస్కల్ ఇయర్ ఎంచుకోండి
@@ -2199,6 +2207,7 @@
 DocType: UOM,Must be Whole Number,మొత్తం సంఖ్య ఉండాలి
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(రోజుల్లో) కేటాయించిన కొత్త ఆకులు
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,సీరియల్ లేవు {0} ఉనికిలో లేదు
+DocType: Sales Invoice Item,Customer Warehouse (Optional),కస్టమర్ వేర్హౌస్ (ఆప్షనల్)
 DocType: Pricing Rule,Discount Percentage,డిస్కౌంట్ శాతం
 DocType: Payment Reconciliation Invoice,Invoice Number,ఇన్వాయిస్ సంఖ్యా
 apps/erpnext/erpnext/hooks.py +55,Orders,ఆర్డర్స్
@@ -2308,7 +2317,7 @@
 DocType: Appraisal,Appraisal,అప్రైసల్
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,తేదీ పునరావృతమవుతుంది
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,సంతకం పెట్టడానికి అధికారం
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},ఒకటి ఉండాలి అప్రూవర్గా వదిలి {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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,ప్రారంభ సమయం
@@ -2477,7 +2486,7 @@
 DocType: BOM Replace Tool,BOM Replace Tool,బిఒఎం భర్తీ సాధనం
 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 +733,Show tax break-up,షో పన్ను విడిపోవడానికి
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,షో పన్ను విడిపోవడానికి
 apps/erpnext/erpnext/accounts/party.py +283,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',మీరు తయారీ కార్యకలాపాల్లో ప్రమేయం కలిగి ఉంటే. ప్రారంభిస్తుంది అంశం &#39;తయారు&#39;
@@ -2526,7 +2535,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,తిరిగి రకం కంపెనీ పేరు నిర్ధారించడానికి దయచేసి
@@ -2553,8 +2562,6 @@
 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,చేరిన తేదీ పుట్టిన తేది కంటే ఎక్కువ ఉండాలి
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,జీతం నిర్మాణం
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","బహుళ ధర రూల్ అదే ప్రమాణాలు ఉనికిలో ఉంది, ప్రాధాన్యత కేటాయించి \ పరిష్కరించవచ్చు దయచేసి. ధర నియమాలు: {0}"
 DocType: Account,Bank,బ్యాంక్
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,వైనానిక
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,ఇష్యూ మెటీరియల్
@@ -2579,7 +2586,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,సెక్యూరిటీస్ అండ్ కమోడిటీ ఎక్స్చేంజెస్
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',వేరియంట్ కోసం మెజర్ అప్రమేయ యూనిట్ &#39;{0}&#39; మూస లో అదే ఉండాలి &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',వేరియంట్ కోసం మెజర్ అప్రమేయ యూనిట్ &#39;{0}&#39; మూస లో అదే ఉండాలి &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,బేస్డ్ న లెక్కించు
 DocType: Delivery Note Item,From Warehouse,గిడ్డంగి నుండి
 DocType: Purchase Taxes and Charges,Valuation and Total,వాల్యుయేషన్ మరియు మొత్తం
@@ -2588,7 +2595,7 @@
 DocType: Account,Purchase User,కొనుగోలు వాడుకరి
 DocType: Notification Control,Customize the Notification,నోటిఫికేషన్ అనుకూలీకరించండి
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,ఆపరేషన్స్ నుండి నగదు ప్రవాహ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,డిఫాల్ట్ చిరునామా మూస తొలగించడం సాధ్యం కాదు
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,డిఫాల్ట్ చిరునామా మూస తొలగించడం సాధ్యం కాదు
 DocType: Sales Invoice,Shipping Rule,షిప్పింగ్ రూల్
 DocType: Manufacturer,Limited to 12 characters,12 అక్షరాలకు పరిమితం
 DocType: Journal Entry,Print Heading,ప్రింట్ శీర్షిక
@@ -2681,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,ప్రాజెక్టు వారీగా డేటా కొటేషన్ అందుబాటులో లేదు
 DocType: Project,Expected End Date,ఊహించినది ముగింపు తేదీ
 DocType: Appraisal Template,Appraisal Template Title,అప్రైసల్ మూస శీర్షిక
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,కమర్షియల్స్
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,అద్భుతంగా సేవలు
@@ -2700,7 +2707,7 @@
 DocType: Customer,Default Receivable Accounts,స్వీకరించదగిన ఖాతాలు Default
 DocType: Tax Rule,Billing State,బిల్లింగ్ రాష్ట్రం
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,ట్రాన్స్ఫర్
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),(ఉప అసెంబ్లీలను సహా) పేలింది BOM పొందు
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),(ఉప అసెంబ్లీలను సహా) పేలింది BOM పొందు
 DocType: Authorization Rule,Applicable To (Employee),వర్తించదగిన (ఉద్యోగి)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,గడువు తేదీ తప్పనిసరి
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,గుణానికి పెంపు {0} 0 ఉండకూడదు
@@ -2733,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,ప్రతికూల వాల్యువేషన్ రేటు అనుమతి లేదు
 DocType: Holiday List,Weekly Off,వీక్లీ ఆఫ్
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ఉదా 2012, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),ప్రొవిజనల్ లాభం / నష్టం (క్రెడిట్)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),ప్రొవిజనల్ లాభం / నష్టం (క్రెడిట్)
 DocType: Sales Invoice,Return Against Sales Invoice,ఎగైనెస్ట్ సేల్స్ వాయిస్ తిరిగి
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,అంశం 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},కంపెనీ లో డిఫాల్ట్ విలువ {0} సెట్ దయచేసి {1}
@@ -2764,6 +2771,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,చైల్డ్ జోడించండి
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,పాత్ర ఘనీభవించిన అకౌంట్స్ &amp; సవరించు ఘనీభవించిన ఎంట్రీలు సెట్ చేయడానికి అనుమతించాలో
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,ఇది పిల్లల నోడ్స్ కలిగి లెడ్జర్ కాస్ట్ సెంటర్ మార్చేందుకు కాదు
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,ఓపెనింగ్ విలువ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,సీరియల్ #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,సేల్స్ కమిషన్
 DocType: Offer Letter Term,Value / Description,విలువ / వివరణ
@@ -2797,7 +2805,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,విజయవంతంగా ఈ కంపెనీకి సంబంధించిన అన్ని లావాదేవీలు తొలగించబడింది!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,తేదీ నాటికి
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,పరిశీలన
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,డిఫాల్ట్ వేర్హౌస్ స్టాక్ అంశం తప్పనిసరి.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},నెల జీతం చెల్లింపు {0} మరియు సంవత్సరం {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ఆటో చొప్పించు ధర జాబితా రేటు లేదు ఉంటే
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,మొత్తం చెల్లించిన మొత్తాన్ని
@@ -2833,7 +2840,7 @@
 DocType: Payment Tool,Set Matching Amounts,సెట్ సరిపోలిక మొత్తంలో
 DocType: Purchase Invoice,Taxes and Charges Added,పన్నులు మరియు ఆరోపణలు చేర్చబడింది
 ,Sales Funnel,అమ్మకాల గరాటు
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,సంక్షిప్త తప్పనిసరి
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,సంక్షిప్త తప్పనిసరి
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,మా నవీకరణలకు చందా మీ ఆసక్తికి ధన్యవాదాలు
 ,Qty to Transfer,బదిలీ చేసిన అంశాల
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,లీడ్స్ లేదా వినియోగదారుడు కోట్స్.
@@ -2861,7 +2868,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,సరఫరాదారు కొటేషన్
 DocType: Quotation,In Words will be visible once you save the Quotation.,మీరు కొటేషన్ సేవ్ ఒకసారి వర్డ్స్ కనిపిస్తుంది.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} ఆగిపోయింది ఉంది
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},బార్కోడ్ {0} ఇప్పటికే అంశం ఉపయోగిస్తారు {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,రాబోయే ఈవెంట్స్
@@ -2883,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,ఫిస్కల్ ఇయర్ ఎంచుకోండి ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS ప్రొఫైల్ POS ఎంట్రీ చేయడానికి అవసరం
 DocType: Hub Settings,Name Token,పేరు టోకెన్
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,ప్రామాణిక సెల్లింగ్
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,ప్రామాణిక సెల్లింగ్
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,కనీసం ఒక గిడ్డంగి తప్పనిసరి
 DocType: Serial No,Out of Warranty,వారంటీ బయటకు
 DocType: BOM Replace Tool,Replace,పునఃస్థాపించుము
@@ -3006,7 +3013,7 @@
 DocType: Sales Invoice,Paid Amount,మొత్తం చెల్లించారు
 ,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,ఏ ఇతర డిఫాల్ట్ ఉంది డిఫాల్ట్ ఈ చిరునామాను మూస చేస్తోంది
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,ఏ ఇతర డిఫాల్ట్ ఉంది డిఫాల్ట్ ఈ చిరునామాను మూస చేస్తోంది
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ఇప్పటికే డెబిట్ ఖాతా సంతులనం, మీరు &#39;క్రెడిట్&#39; గా &#39;సంతులనం ఉండాలి&#39; సెట్ అనుమతి లేదు"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,క్వాలిటీ మేనేజ్మెంట్
 DocType: Production Planning Tool,Filter based on customer,వడపోత కస్టమర్ ఆధారంగా
@@ -3107,7 +3114,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",డిఫాల్ట్ గా ఈ ఆర్థిక సంవత్సరం సెట్ &#39;డిఫాల్ట్ గా సెట్&#39; పై క్లిక్
 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 +19,Shortage Qty,కొరత ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,అంశం వేరియంట్ {0} అదే లక్షణాలు తో ఉంది
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,అంశం వేరియంట్ {0} అదే లక్షణాలు తో ఉంది
 DocType: Salary Slip,Salary Slip,వేతనం స్లిప్
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,తేదీ &#39;అవసరం
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","ప్యాకేజీలు అందజేసిన కోసం స్లిప్స్ ప్యాకింగ్ ఉత్పత్తి. ప్యాకేజీ సంఖ్య, ప్యాకేజీ విషయాలు మరియు దాని బరువు తెలియజేయడానికి వాడతారు."
@@ -3118,7 +3125,7 @@
 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.","తనిఖీ లావాదేవీల ఏ &quot;సమర్పించిన&quot; చేసినప్పుడు, ఒక ఇమెయిల్ పాప్ అప్ స్వయంచాలకంగా జోడింపుగా లావాదేవీతో, ఆ లావాదేవీ సంబంధం &quot;సంప్రదించండి&quot; కు ఒక ఇమెయిల్ పంపండి తెరిచింది. యూజర్ మారవచ్చు లేదా ఇమెయిల్ పంపలేరు."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,గ్లోబల్ సెట్టింగులు
 DocType: Employee Education,Employee Education,Employee ఎడ్యుకేషన్
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,ఇది అంశం వివరాలు పొందడం అవసరమవుతుంది.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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} ఇప్పటికే అందింది
@@ -3144,6 +3151,7 @@
 DocType: BOM,Manufacturing User,తయారీ వాడుకరి
 DocType: Purchase Order,Raw Materials Supplied,రా మెటీరియల్స్ పంపినవి
 DocType: Purchase Invoice,Recurring Print Format,పునరావృత ప్రింట్ ఫార్మాట్
+DocType: C-Form,Series,సిరీస్
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,ఊహించినది డెలివరీ తేదీ కొనుగోలు ఆర్డర్ తేదీ ముందు ఉండరాదు
 DocType: Appraisal,Appraisal Template,అప్రైసల్ మూస
 DocType: Item Group,Item Classification,అంశం వర్గీకరణ
@@ -3219,7 +3227,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},రో {0}: ఒక క్రమాన్ని ఎంట్రీ ఇప్పటికే ఈ గిడ్డంగి కోసం ఉంది {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.","కొటేషన్ చేయబడింది ఎందుకంటే, కోల్పోయిన డిక్లేర్ కాదు."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,కొనుగోలు మాస్టర్ మేనేజర్
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,ఆర్డర్ {0} సమర్పించాలి ఉత్పత్తి
@@ -3227,7 +3235,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,ప్రధాన నివేదికలు
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,తేదీ తేదీ నుండి ముందు ఉండరాదు
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,/ మార్చు ధరలు జోడించండి
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,నా ఆర్డర్స్
@@ -3275,7 +3283,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},రో # {0}: అంశాన్ని సెట్ సరఫరాదారు {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,అంశం {1} జత వెబ్సైట్ చిత్రం {0} కనుగొనబడలేదు
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,అంశం {1} జత వెబ్సైట్ చిత్రం {0} కనుగొనబడలేదు
 DocType: Issue,Content Type,కంటెంట్ రకం
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,కంప్యూటర్
 DocType: Item,List this Item in multiple groups on the website.,వెబ్ సైట్ బహుళ సమూహాలు ఈ అంశం జాబితా.
@@ -3289,7 +3297,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,&#39;అవును&#39; ఉంటుంది కాని స్టాక్ అంశం కోసం కాదు &#39;సీరియల్ చెప్పడం&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,&#39;అవును&#39; ఉంటుంది కాని స్టాక్ అంశం కోసం కాదు &#39;సీరియల్ చెప్పడం&#39;
 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,ఖాతా హెడ్
@@ -3315,7 +3323,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,ఖాతా {0} మూసివేయడం రకం బాధ్యత / ఈక్విటీ ఉండాలి
 DocType: Authorization Rule,Based On,ఆధారంగా
 DocType: Sales Order Item,Ordered Qty,క్రమ ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,అంశం {0} నిలిపివేయబడింది
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,అంశం {0} నిలిపివేయబడింది
 DocType: Stock Settings,Stock Frozen Upto,స్టాక్ ఘనీభవించిన వరకు
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},నుండి మరియు కాలం పునరావృత తప్పనిసరి తేదీలు కాలం {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,ప్రాజెక్టు చర్య / పని.
@@ -3323,7 +3331,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",వర్తించే ఎంపిక ఉంది ఉంటే కొనుగోలు తనిఖీ చెయ్యాలి {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,డిస్కౌంట్ 100 కంటే తక్కువ ఉండాలి
 DocType: Purchase Invoice,Write Off Amount (Company Currency),మొత్తం ఆఫ్ వ్రాయండి (కంపెనీ కరెన్సీ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,రో # {0}: క్రమాన్ని పరిమాణం సెట్ చెయ్యండి
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,రో # {0}: క్రమాన్ని పరిమాణం సెట్ చెయ్యండి
 DocType: Landed Cost Voucher,Landed Cost Voucher,అడుగుపెట్టాయి ఖర్చు ఓచర్
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},సెట్ దయచేసి {0}
 DocType: Purchase Invoice,Repeat on Day of Month,నెల రోజు రిపీట్
@@ -3395,7 +3403,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ఇప్పుడు వీక్షణ
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,వాయిస్ స్వయంచాలకంగా ఉత్పత్తి అవుతుంది కాలం ఎంచుకోండి
 DocType: BOM,Raw Material Cost,రా మెటీరియల్ ఖర్చు
-DocType: Item,Re-Order Level,రీ-ఆర్డర్ స్థాయి
+DocType: Item Reorder,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.,మీరు ఉత్పత్తి ఆర్డర్లు పెంచడానికి లేదా విశ్లేషణకు ముడి పదార్థాలు డౌన్లోడ్ కోరుకుంటున్న అంశాలు మరియు ప్రణాళిక చేసిన అంశాల ఎంటర్.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,పార్ట్ టైమ్
 DocType: Employee,Applicable Holiday List,వర్తించే హాలిడే జాబితా
@@ -3450,7 +3458,7 @@
 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 +573,Please specify Attribute Value for attribute {0},గుణానికి విలువ లక్షణం రాయండి {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3529,7 +3537,7 @@
 DocType: Address,Office,ఆఫీసు
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,అకౌంటింగ్ జర్నల్ ఎంట్రీలు.
 DocType: Delivery Note Item,Available Qty at From Warehouse,గిడ్డంగి నుండి వద్ద అందుబాటులో ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,మొదటి ఉద్యోగి రికార్డ్ ఎంచుకోండి.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,మొదటి ఉద్యోగి రికార్డ్ ఎంచుకోండి.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,ఖర్చుల ఖాతాను నమోదు చేయండి
@@ -3604,7 +3612,7 @@
 DocType: Item Attribute,Numeric Values,సంఖ్యా విలువలు
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,లోగో అటాచ్
 DocType: Customer,Commission Rate,కమిషన్ రేటు
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,వేరియంట్ చేయండి
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,వేరియంట్ చేయండి
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,శాఖ బ్లాక్ సెలవు అప్లికేషన్లు.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,కార్ట్ ఖాళీగా ఉంది
 DocType: Production Order,Actual Operating Cost,వాస్తవ ఆపరేటింగ్ వ్యయం
@@ -3621,15 +3629,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item","క్రమాన్ని స్థాయి సెట్, అంశం కొనుగోలు అంశం లేదా తయారీ అంశం ఉండాలి"
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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.,కరెన్సీ etc $ వంటి ఏ చిహ్నం తదుపరి చూపవద్దు.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(హాఫ్ డే)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(హాఫ్ డే)
 DocType: Supplier,Credit Days,క్రెడిట్ డేస్
 DocType: Leave Type,Is Carry Forward,ఫార్వర్డ్ కారి ఉంటుంది
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,బిఒఎం నుండి అంశాలు పొందండి
diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv
index f1bb972..8d0870c 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% เรียกเก็บแล้ว
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),อัตราแลกเปลี่ยนจะต้องเป็นเช่นเดียวกับ {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ชื่อลูกค้า
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},บัญชีธนาคารไม่สามารถตั้งชื่อเป็น {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},บัญชีธนาคารไม่สามารถตั้งชื่อเป็น {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),ที่โดดเด่นสำหรับ {0} ไม่ สามารถน้อยกว่า ศูนย์ ( {1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,แอพลิเคชันออกใหม่
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,แอพลิเคชันออกใหม่
 apps/erpnext/erpnext/setup/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,โหมดของการบัญชีการชำระเงิน
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",บันทึกกิจกรรมที่ดำเนินการโดยผู้ใช้ ในงานต่างๆ ซึ่งสามารถใช้ติดตามเวลา หรือออกใบเสร็จได้
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},ใหม่ {0}: # {1}
 ,Sales Partners Commission,สำนักงานคณะกรรมการกำกับการขายหุ้นส่วน
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,ตัวอักษรย่อ ห้ามมีความยาวมากกว่า 5 ตัวอักษร
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,ตัวอักษรย่อ ห้ามมีความยาวมากกว่า 5 ตัวอักษร
 DocType: Payment Request,Payment Request,คำขอชำระเงิน
 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.",ค่าแอตทริบิวต์ {0} ไม่สามารถลบออกจาก {1} เป็นรายการที่แตกต่าง \ อยู่กับคุณสมบัตินี้
@@ -196,6 +196,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,เลือกข้อตกลงและเงื่อนไข
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,ราคาออกมา
 DocType: Production Planning Tool,Sales Orders,ใบสั่งขาย
 DocType: Purchase Taxes and Charges,Valuation,การประเมินค่า
 ,Purchase Order Trends,แนวโน้มการสั่งซื้อ
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,โทรทัศน์
 DocType: Production Order Operation,Updated via 'Time Log',ปรับปรุงแล้วทาง 'บันทึกเวลา'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},บัญชี {0} ไม่ได้เป็นของ บริษัท {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},จำนวนเงินล่วงหน้าไม่สามารถจะสูงกว่า {0} {1}
 DocType: Naming Series,Series List for this Transaction,รายชื่อชุดสำหรับการทำธุรกรรมนี้
 DocType: Sales Invoice,Is Opening Entry,จะเปิดรายการ
 DocType: Customer Group,Mention if non-standard receivable account applicable,ถ้าพูดถึงไม่ได้มาตรฐานลูกหนี้บังคับ
@@ -227,7 +229,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,สร้างสลิปเงินเดือนสำหรับเกณฑ์ดังกล่าวข้างต้น
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,ให้ คำอธิบาย
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ขอซื้อ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,เพียง เลือก ผู้อนุมัติ ออกสามารถส่ง ออกจาก โปรแกรมนี้
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; การตั้งชื่อซีรีส์
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},คลังสินค้า {0} ไม่ได้เป็นของ บริษัท {1}
 DocType: Item Website Specification,Item Website Specification,สเปกเว็บไซต์รายการ
 DocType: Payment Tool,Reference No,อ้างอิง
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,ฝากที่ถูกบล็อก
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,ฝากที่ถูกบล็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,ประจำปี
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,สต็อกสินค้าสมานฉันท์
 DocType: Stock Entry,Sales Invoice No,ขายใบแจ้งหนี้ไม่มี
@@ -249,7 +251,7 @@
 DocType: Pricing Rule,Supplier Type,ประเภทผู้ผลิต
 DocType: Item,Publish in Hub,เผยแพร่ใน Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,ขอวัสดุ
 DocType: Bank Reconciliation,Update Clearance Date,อัพเดทวันที่ Clearance
 DocType: Item,Purchase Details,รายละเอียดการซื้อ
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,หมายเหตุจัดส่งสินค้า
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,การตั้งค่าภาษี
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,เข้าชำระเงินได้รับการแก้ไขหลังจากที่คุณดึงมัน กรุณาดึงมันอีกครั้ง
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} ได้บันทึกเป็นครั้งที่สองใน รายการ ภาษี
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,กรุณาเลือกเดือนและปี
@@ -329,7 +331,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,ที่อยู่ อีเมลของคุณ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,โปรดดูสิ่งที่แนบมา
 DocType: Purchase Order,% Received,% ที่ได้รับแล้ว
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,การติดตั้ง เสร็จสมบูรณ์ แล้ว !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,การติดตั้ง เสร็จสมบูรณ์ แล้ว !
 ,Finished Goods,สินค้า สำเร็จรูป
 DocType: Delivery Note,Instructions,คำแนะนำ
 DocType: Quality Inspection,Inspected By,การตรวจสอบโดย
@@ -354,14 +356,13 @@
 ,Purchase Register,สั่งซื้อสมัครสมาชิก
 DocType: Landed Cost Item,Applicable Charges,ค่าใช้จ่าย
 DocType: Workstation,Consumable Cost,ค่าใช้จ่ายที่ สิ้นเปลือง
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) จะต้องมีบทบาท 'ออกอนุมัติ'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) จะต้องมีบทบาท 'ออกอนุมัติ'
 DocType: Purchase Receipt,Vehicle Date,วันที่ยานพาหนะ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,การแพทย์
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,เหตุผล สำหรับการสูญเสีย
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},เวิร์คสเตชั่จะปิดทำการในวันที่ต่อไปนี้เป็นรายชื่อต่อวันหยุด: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,โอกาส
 DocType: Employee,Single,เดียว
-DocType: Issue,Attachment,ความผูกพัน
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,งบประมาณไม่สามารถตั้งค่าสำหรับศูนย์ต้นทุนกลุ่ม
 DocType: Account,Cost of Goods Sold,ค่าใช้จ่ายของ สินค้าที่ขาย
 DocType: Purchase Invoice,Yearly,ประจำปี
@@ -390,7 +391,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,แอตทริบิวต์ {0} เลือกหลายครั้งในคุณสมบัติตาราง
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,แอตทริบิวต์ {0} เลือกหลายครั้งในคุณสมบัติตาราง
 DocType: HR Settings,Employee record is created using selected field. ,ระเบียนของพนักงานจะถูกสร้างขึ้นโดยใช้เขตข้อมูลที่เลือก
 DocType: Sales Order,Not Applicable,ไม่สามารถใช้งาน
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,นาย ฮอลิเดย์
@@ -429,7 +430,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,เครื่องสำอาง
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items",ที่จะ ผสาน คุณสมบัติต่อไปนี้ จะต้อง เหมือนกันสำหรับ ทั้งสองรายการ
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items",ที่จะ ผสาน คุณสมบัติต่อไปนี้ จะต้อง เหมือนกันสำหรับ ทั้งสองรายการ
 DocType: Shipping Rule,Net Weight,ปริมาณสุทธิ
 DocType: Employee,Emergency Phone,โทรศัพท์ ฉุกเฉิน
 ,Serial No Warranty Expiry,อนุกรมหมดอายุไม่มีการรับประกัน
@@ -440,7 +441,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,รับเหมาช่วงการจัดการ
 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,อัตราที่สกุลเงินรายการราคาจะถูกแปลงเป็นสกุลเงินหลักของ บริษัท
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},บัญชี {0} ไม่ได้เป็นของ บริษัท : {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},บัญชี {0} ไม่ได้เป็นของ บริษัท : {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,ชื่อย่อที่ใช้แล้วสำหรับ บริษัท อื่น
 DocType: Selling Settings,Default Customer Group,กลุ่มลูกค้าเริ่มต้น
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",ถ้าปิดการใช้งาน &#39;ปัดรวมฟิลด์จะมองไม่เห็นในการทำธุรกรรมใด ๆ
 DocType: BOM,Operating Cost,ค่าใช้จ่ายในการดำเนินงาน
@@ -476,6 +478,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,ไม่พบใบแจ้งหนี้ในตารางบันทึก
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,กรุณาเลือก บริษัท และประเภทพรรคแรก
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,การเงิน รอบปีบัญชี /
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,ค่าสะสม
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",ขออภัย อนุกรม Nos ไม่สามารถ รวม
 DocType: Project Task,Project Task,โครงการงาน
 ,Lead Id,รหัสช่องทาง
@@ -497,7 +500,7 @@
 DocType: Quotation,Quotation To,ใบเสนอราคาเพื่อ
 DocType: Lead,Middle Income,มีรายได้ปานกลาง
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),เปิด ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,เริ่มต้นหน่วยวัดสำหรับรายการ {0} ไม่สามารถเปลี่ยนแปลงได้โดยตรงเพราะคุณได้ทำแล้วการทำธุรกรรมบาง (s) กับ UOM อื่น คุณจะต้องสร้างรายการใหม่ที่จะใช้ที่แตกต่างกันเริ่มต้น UOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,เริ่มต้นหน่วยวัดสำหรับรายการ {0} ไม่สามารถเปลี่ยนแปลงได้โดยตรงเพราะคุณได้ทำแล้วการทำธุรกรรมบาง (s) กับ UOM อื่น คุณจะต้องสร้างรายการใหม่ที่จะใช้ที่แตกต่างกันเริ่มต้น UOM
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,จำนวนเงินที่จัดสรร ไม่สามารถ ลบ
 DocType: Purchase Order Item,Billed Amt,จำนวนจำนวนมากที่สุด
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,โกดังตรรกะกับที่รายการหุ้นที่ทำ
@@ -575,7 +578,7 @@
 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 +543,Item has variants.,รายการที่มีสายพันธุ์
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,ประเภท ต้นไม้
@@ -588,6 +591,7 @@
 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 +33,Goods received from Suppliers.,สินค้าที่ได้รับจากผู้จำหน่าย
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,ในราคา
 DocType: Lead,Campaign Name,ชื่อแคมเปญ
 ,Reserved,ที่สงวนไว้
 DocType: Purchase Order,Supply Raw Materials,ซัพพลายวัตถุดิบ
@@ -602,16 +606,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,บัญชี กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น บัญชีแยกประเภท
 DocType: Delivery Note,Customer's Purchase Order No,ใบสั่งซื้อของลูกค้าไม่มี
 DocType: Employee,Cell Number,จำนวนเซลล์
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto วัสดุการขอสร้าง
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Auto วัสดุการขอสร้าง
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,สูญหาย
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,คุณไม่สามารถใส่บัตรกำนัลในปัจจุบัน 'กับอนุทิน' คอลัมน์
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,พลังงาน
 DocType: Opportunity,Opportunity From,โอกาสจาก
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,งบเงินเดือน
 DocType: Item Group,Website Specifications,ข้อมูลจำเพาะเว็บไซต์
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},เกิดข้อผิดพลาดในแม่แบบที่อยู่ของคุณ {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,บัญชีผู้ใช้ใหม่
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: จาก {0} ประเภท {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,แถว {0}: ปัจจัยการแปลงมีผลบังคับใช้
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",กฎราคาหลายอยู่กับเกณฑ์เดียวกันโปรดแก้ปัญหาความขัดแย้งโดยการกำหนดลำดับความสำคัญ กฎราคา: {0}
 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.,รายการทางบัญชีสามารถทำกับโหนดใบ คอมเมนต์กับกลุ่มไม่ได้รับอนุญาต
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,ไม่สามารถยกเลิกการใช้งานหรือยกเลิก BOM ตามที่มีการเชื่อมโยงกับ BOMs อื่น ๆ
 DocType: Opportunity,Maintenance,การบำรุงรักษา
@@ -673,7 +679,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,ราคา ไม่ได้เลือก
 DocType: Employee,Family Background,ภูมิหลังของครอบครัว
 DocType: Process Payroll,Send Email,ส่งอีเมล์
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},คำเตือน: สิ่งที่แนบมาไม่ถูกต้อง {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},คำเตือน: สิ่งที่แนบมาไม่ถูกต้อง {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,ไม่ได้รับอนุญาต
 DocType: Company,Default Bank Account,บัญชีธนาคารเริ่มต้น
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",ในการกรองขึ้นอยู่กับพรรคเลือกพรรคพิมพ์ครั้งแรก
@@ -703,13 +709,13 @@
 DocType: Production Planning Tool,Select Items,เลือกรายการ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} กับบิล {1} ลงวันที่ {2}
 DocType: Maintenance Visit,Completion Status,สถานะเสร็จ
-DocType: Sales Invoice Item,Target Warehouse,คลังสินค้าเป้าหมาย
+DocType: Production Order,Target Warehouse,คลังสินค้าเป้าหมาย
 DocType: Item,Allow over delivery or receipt upto this percent,อนุญาตให้ส่งมอบหรือใบเสร็จรับเงินได้ไม่เกินร้อยละนี้
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,วันที่ส่ง ที่คาดว่าจะ ไม่สามารถเป็น วัน ก่อนที่จะ ขายสินค้า
 DocType: Upload Attendance,Import Attendance,การเข้าร่วมประชุมและนำเข้า
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,ทั้งหมด รายการ กลุ่ม
 DocType: Process Payroll,Activity Log,บันทึกกิจกรรม
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,กำไร / ขาดทุน
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,กำไร / ขาดทุน
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,เขียนข้อความ โดยอัตโนมัติใน การส่ง ของ การทำธุรกรรม
 DocType: Production Order,Item To Manufacture,รายการที่จะผลิต
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} สถานะเป็น {2}
@@ -717,7 +723,7 @@
 DocType: Sales Order Item,Projected Qty,จำนวนที่คาดการณ์ไว้
 DocType: Sales Invoice,Payment Due Date,วันที่ครบกำหนด ชำระเงิน
 DocType: Newsletter,Newsletter Manager,ผู้จัดการจดหมายข่าว
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,รายการตัวแปร {0} อยู่แล้วที่มีลักษณะเดียวกัน
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,รายการตัวแปร {0} อยู่แล้วที่มีลักษณะเดียวกัน
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','กำลังเปิด'
 DocType: Notification Control,Delivery Note Message,ข้อความหมายเหตุจัดส่งสินค้า
 DocType: Expense Claim,Expenses,รายจ่าย
@@ -727,7 +733,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,การวิจัยและพัฒนา
 ,Amount to Bill,จำนวนเงินที่จะเรียกเก็บเงิน
 DocType: Company,Registration Details,รายละเอียดการลงทะเบียน
-DocType: Item,Re-Order Qty,Re สั่งซื้อจำนวน
+DocType: Item Reorder,Re-Order Qty,Re สั่งซื้อจำนวน
 DocType: Leave Block List Date,Leave Block List Date,ฝากวันที่รายการบล็อก
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},กำหนดให้ ส่งไปที่ {0}
 DocType: Pricing Rule,Price or Discount,ราคา หรือ ส่วนลด
@@ -770,7 +776,7 @@
 DocType: Bank Reconciliation,Total Amount,รวมเป็นเงิน
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,สำนักพิมพ์ ทางอินเทอร์เน็ต
 DocType: Production Planning Tool,Production Orders,คำสั่งซื้อการผลิต
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,ความสมดุลของ ความคุ้มค่า
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,ความสมดุลของ ความคุ้มค่า
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,ขายราคาตามรายการ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,เผยแพร่เพื่อซิงค์รายการ
 DocType: Bank Reconciliation,Account Currency,สกุลเงินของบัญชี
@@ -779,7 +785,7 @@
 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 +538,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
 DocType: Quality Inspection Reading,Reading 6,Reading 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ใบแจ้งหนี้การซื้อล่วงหน้า
 DocType: Address,Shop,ร้านค้า
@@ -856,7 +862,7 @@
 DocType: POS Profile,Cash/Bank Account,เงินสด / บัญชีธนาคาร
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,รายการที่ลบออกด้วยการเปลี่ยนแปลงในปริมาณหรือไม่มีค่า
 DocType: Delivery Note,Delivery To,เพื่อจัดส่งสินค้า
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,ตาราง Attribute มีผลบังคับใช้
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,ส่วนลด
@@ -884,7 +890,7 @@
 DocType: Tax Rule,Shipping State,การจัดส่งสินค้าของรัฐ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,รายการจะต้องมีการเพิ่มการใช้ 'รับรายการสั่งซื้อจากใบเสร็จรับเงิน' ปุ่ม
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,ค่าใช้จ่ายในการขาย
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,การซื้อมาตรฐาน
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,การซื้อมาตรฐาน
 DocType: GL Entry,Against,กับ
 DocType: Item,Default Selling Cost Center,ขาย เริ่มต้นที่ ศูนย์ต้นทุน
 DocType: Sales Partner,Implementation Partner,พันธมิตรการดำเนินงาน
@@ -926,7 +932,7 @@
 DocType: Sales Partner,Distributor,ผู้จัดจำหน่าย
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,รถเข็นกฎการจัดส่งสินค้า
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,สั่งผลิต {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',โปรดตั้ง &#39;ใช้ส่วนลดเพิ่มเติมใน&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',โปรดตั้ง &#39;ใช้ส่วนลดเพิ่มเติมใน&#39;
 ,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.,เลือกบันทึกเวลา และส่งมาเพื่อสร้างเป็นใบแจ้งหนี้การขายใหม่
@@ -994,9 +1000,9 @@
 DocType: Contact,User ID,รหัสผู้ใช้
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,ดู บัญชีแยกประเภท
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ที่เก่าแก่ที่สุด
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group",รายการกลุ่ม ที่มีอยู่ ที่มีชื่อเดียวกัน กรุณาเปลี่ยน ชื่อรายการหรือเปลี่ยนชื่อ กลุ่ม รายการ
 DocType: Production Order,Manufacture against Sales Order,การผลิตกับการสั่งซื้อการขาย
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,ส่วนที่เหลือ ของโลก
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,จ่ายขั้นต้น
@@ -1026,7 +1032,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged",ขออภัย บริษัท ไม่สามารถ รวม
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged",ขออภัย บริษัท ไม่สามารถ รวม
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,เล็ก
 DocType: Employee,Employee Number,จำนวนพนักงาน
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},กรณีที่ ไม่ ( s) การใช้งานแล้ว ลอง จาก กรณี ไม่มี {0}
@@ -1045,7 +1051,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,การเกษตร
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,สินค้า หรือ บริการของคุณ
 DocType: Mode of Payment,Mode of Payment,โหมดของการชำระเงิน
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,ภาพ Website ควรจะเป็นไฟล์สาธารณะหรือ URL ของเว็บไซต์
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,ภาพ Website ควรจะเป็นไฟล์สาธารณะหรือ URL ของเว็บไซต์
 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,ข้อมูลการติดต่อคลังสินค้า
@@ -1117,6 +1123,7 @@
 DocType: Address,Utilities,ยูทิลิตี้
 DocType: Purchase Invoice Item,Accounting,การบัญชี
 DocType: Features Setup,Features Setup,การติดตั้งสิ่งอำนวยความสะดวก
+DocType: Item,Is Service Item,รายการบริการเป็น
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,รับสมัครไม่สามารถออกจากนอกระยะเวลาการจัดสรร
 DocType: Activity Cost,Projects,โครงการ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,กรุณาเลือก ปีงบประมาณ
@@ -1147,7 +1154,7 @@
 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 +465,cannot be greater than 100,ไม่สามารถจะมากกว่า 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
 DocType: Maintenance Visit,Unscheduled,ไม่ได้หมายกำหนดการ
 DocType: Employee,Owned,เจ้าของ
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,ขึ้นอยู่กับการออกโดยไม่จ่ายเงิน
@@ -1207,7 +1214,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,รัฐบาล
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,รายการที่แตกต่าง
 DocType: Company,Services,การบริการ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),รวม ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),รวม ({0})
 DocType: Cost Center,Parent Cost Center,ศูนย์ต้นทุนผู้ปกครอง
 DocType: Sales Invoice,Source,แหล่ง
 DocType: Leave Type,Is Leave Without Pay,ถูกทิ้งไว้โดยไม่ต้องจ่ายเงิน
@@ -1280,17 +1287,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ส่งอีเมล์การชำระเงิน
 DocType: Dependent Task,Dependent Task,ขึ้นอยู่กับงาน
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},การลา ประเภท {0} ไม่สามารถ จะยาวกว่า {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,บริโภคจํานวนเงิน
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} ดู
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,เปลี่ยนเป็นเงินสดสุทธิ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,เปลี่ยนเป็นเงินสดสุทธิ
 DocType: Salary Structure Deduction,Salary Structure Deduction,หักโครงสร้างเงินเดือน
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,หน่วย ของการวัด {0} ได้รับการป้อน มากกว่าหนึ่งครั้งใน การแปลง ปัจจัย ตาราง
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,หน่วย ของการวัด {0} ได้รับการป้อน มากกว่าหนึ่งครั้งใน การแปลง ปัจจัย ตาราง
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},รวมเข้ากับการชำระเงินที่มีอยู่แล้ว {0}
 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 +182,Quantity must not be more than {0},จำนวนต้องไม่เกิน {0}
@@ -1352,7 +1359,7 @@
 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: Packed Item,To Warehouse (Optional),คลังสินค้า (อุปกรณ์เสริม)
 DocType: Sales Invoice,Paid Amount (Company Currency),จำนวนเงินที่จ่าย (บริษัท สกุล)
 DocType: Purchase Invoice,Additional Discount,ส่วนลดเพิ่มเติม
 DocType: Selling Settings,Selling Settings,ตั้งค่าระบบการขาย
@@ -1361,7 +1368,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",บริษัท เดือน และ ปีงบประมาณ มีผลบังคับใช้
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,ค่าใช้จ่ายใน การตลาด
 ,Item Shortage Report,รายงานสินค้าไม่เพียงพอ
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","น้ำหนักที่ถูกกล่าวถึง, \n กรุณาระบุ ""น้ำหนัก UOM"" เกินไป"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","น้ำหนักที่ถูกกล่าวถึง, \n กรุณาระบุ ""น้ำหนัก UOM"" เกินไป"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ขอวัสดุที่ใช้เพื่อให้รายการสินค้านี้
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,หน่วยเดียวของรายการ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',ต้อง 'ส่ง' ชุดบันทึกเวลา {0}
@@ -1372,6 +1379,7 @@
 DocType: Employee,Date Of Retirement,วันที่ของการเกษียณอายุ
 DocType: Upload Attendance,Get Template,รับแม่แบบ
 DocType: Address,Postal,ไปรษณีย์
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ติดตั้ง ERPNext Complete!
 DocType: Item,Weightage,weightage
 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,กลุ่ม ลูกค้าที่มีอยู่ ที่มีชื่อเดียวกัน โปรด เปลี่ยนชื่อ ลูกค้าหรือเปลี่ยนชื่อ กลุ่ม ลูกค้า
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,กรุณาเลือก {0} ครั้งแรก
@@ -1400,12 +1408,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,คอลัมน์มากเกินไป ส่งออกรายงานและพิมพ์โดยใช้โปรแกรมสเปรดชีต
 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 +139,Main,หลัก
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,หลัก
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,ตัวแปร
 DocType: Naming Series,Set prefix for numbering series on your transactions,กำหนดคำนำหน้าสำหรับหมายเลขชุดทำธุรกรรมของคุณ
 DocType: Employee Attendance Tool,Employees HTML,พนักงาน HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,เพื่อ หยุด ไม่สามารถยกเลิกได้ เปิดจุก ที่จะยกเลิก
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,BOM ค่าเริ่มต้น ({0}) จะต้องใช้งานสำหรับรายการนี้หรือแม่แบบของมัน
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,สายพันธุ์
@@ -1430,7 +1438,6 @@
 DocType: Sales Order,To Deliver and Bill,การส่งและบิล
 DocType: GL Entry,Credit Amount in Account Currency,จำนวนเงินเครดิตสกุลเงินในบัญชี
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,บันทึกเวลาในการผลิต
-DocType: Item,Apply Warehouse-wise Reorder Level,สมัครโกดังฉลาดสั่งซื้อใหม่ระดับ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} จะต้องส่ง
 DocType: Authorization Control,Authorization Control,ควบคุมการอนุมัติ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},แถว # {0}: ปฏิเสธคลังสินค้ามีผลบังคับใช้กับปฏิเสธรายการ {1}
@@ -1529,6 +1536,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,แถว #{0}: การดำเนินการ {1} ยังไม่เสร็จสมบูรณ์สำหรับ {2} จำนวนของสินค้าที่เสร็จแล้วตามคำสั่งผลิต # {3} โปรดปรับปรุงสถานะการทำงานผ่านทางบันทึกเวลา
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,เงินลงทุน
 DocType: Issue,Resolution Details,รายละเอียดความละเอียด
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,การจัดสรร
 DocType: Quality Inspection Reading,Acceptance Criteria,เกณฑ์การยอมรับ กําหนดเกณฑ์ การยอมรับ
 DocType: Item Attribute,Attribute Name,ชื่อแอตทริบิวต์
 DocType: Item Group,Show In Website,แสดงในเว็บไซต์
@@ -1579,7 +1587,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,ค่าใช้จ่ายที่ เรียกร้อง คือการ รอการอนุมัติ เพียง แต่ผู้อนุมัติ ค่าใช้จ่าย สามารถอัปเดต สถานะ
 DocType: Purchase Invoice,Additional Discount Amount,จำนวนส่วนลดเพิ่มเติม
 DocType: Leave Block List Allow,Leave Block List Allow,ฝากรายการบล็อกอนุญาตให้
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,เงื่อนไขที่ไม่สามารถเป็นที่ว่างเปล่าหรือพื้นที่
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,เงื่อนไขที่ไม่สามารถเป็นที่ว่างเปล่าหรือพื้นที่
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,กลุ่มที่ไม่ใช่กลุ่ม
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,กีฬา
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,ทั้งหมดที่เกิดขึ้นจริง
@@ -1620,7 +1628,7 @@
 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**.,** ปีงบประมาณ ** หมายถึงปีทางการเงิน ทุกรายการบัญชีและการทำธุรกรรมอื่น ๆ ที่สำคัญมีการติดตามต่อปี ** ** การคลัง
 DocType: Opportunity,Customer / Lead Address,ลูกค้า / ที่อยู่
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},คำเตือน: ใบรับรอง SSL ที่ไม่ถูกต้องในสิ่งที่แนบมา {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},คำเตือน: ใบรับรอง SSL ที่ไม่ถูกต้องในสิ่งที่แนบมา {0}
 DocType: Production Order Operation,Actual Operation Time,เวลาการดำเนินงานที่เกิดขึ้นจริง
 DocType: Authorization Rule,Applicable To (User),ที่ใช้บังคับกับ (User)
 DocType: Purchase Taxes and Charges,Deduct,หัก
@@ -1769,7 +1777,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,คดีหมายเลข ไม่สามารถ เป็น 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,หากคุณมีการขายและทีมหุ้นส่วนขาย (ตัวแทนจำหน่าย) พวกเขาสามารถติดแท็กและรักษาผลงานของพวกเขาในกิจกรรมการขาย
 DocType: Item,Show a slideshow at the top of the page,สไลด์โชว์ที่ด้านบนของหน้า
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,ร้านค้า
+DocType: Item,"Allow in Sales Order of type ""Service""",อนุญาตให้ใช้คำสั่งขายประเภท &quot;บริการ&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,ร้านค้า
 DocType: Time Log,Projects Manager,ผู้จัดการโครงการ
 DocType: Serial No,Delivery Time,เวลาจัดส่งสินค้า
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,เอจจิ้ง อยู่ ที่
@@ -1794,7 +1803,7 @@
 ,Financial Analytics,Analytics การเงิน
 DocType: Quality Inspection,Verified By,ตรวจสอบโดย
 DocType: Address,Subsidiary,บริษัท สาขา
-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.",ไม่สามารถเปลี่ยน สกุลเงินเริ่มต้น ของ บริษัท เนื่องจากมี การทำธุรกรรม ที่มีอยู่ รายการที่ จะต้อง ยกเลิก การเปลี่ยน สกุลเงินเริ่มต้น
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",ไม่สามารถเปลี่ยน สกุลเงินเริ่มต้น ของ บริษัท เนื่องจากมี การทำธุรกรรม ที่มีอยู่ รายการที่ จะต้อง ยกเลิก การเปลี่ยน สกุลเงินเริ่มต้น
 DocType: Quality Inspection,Purchase Receipt No,หมายเลขใบเสร็จรับเงิน (ซื้อ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,เงินมัดจำ
 DocType: Process Payroll,Create Salary Slip,สร้างสลิปเงินเดือน
@@ -1842,7 +1851,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,วัตถุดิบไม่สามารถมีช่องว่าง
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","ไม่สามารถอัปเดสต็อก, ใบแจ้งหนี้ที่มีรายการการขนส่งลดลง"
 DocType: Newsletter,Test,ทดสอบ
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'","เนื่องจากมีการทำธุรกรรมที่มีอยู่สต็อกสำหรับรายการนี้ \ คุณไม่สามารถเปลี่ยนค่าของ &#39;มีไม่มี Serial&#39;, &#39;มีรุ่นที่ไม่มี&#39;, &#39;เป็นรายการสต็อก &quot;และ&quot; วิธีการประเมิน&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,วารสารรายการด่วน
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,คุณไม่สามารถเปลี่ยน อัตรา ถ้า BOM กล่าว agianst รายการใด ๆ
@@ -1951,7 +1960,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,กรุณาหมายเหตุการจัดส่งครั้งแรก
 DocType: Purchase Invoice,Currency and Price List,สกุลเงินและรายชื่อราคา
 DocType: Opportunity,Customer / Lead Name,ลูกค้า / ชื่อ
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,โปรโมชั่น วันที่ ไม่ได้กล่าวถึง
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,โปรโมชั่น วันที่ ไม่ได้กล่าวถึง
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,การผลิต
 DocType: Item,Allow Production Order,อนุญาตให้สั่งซื้อการผลิต
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,แถว {0}: วันที่ เริ่มต้น ต้องอยู่ก่อน วันที่สิ้นสุด
@@ -1961,7 +1970,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,กำไรรวม
 DocType: Purchase Receipt,Time at which materials were received,เวลาที่ได้รับวัสดุ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,ที่อยู่ของฉัน
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,ที่อยู่ของฉัน
 DocType: Stock Ledger Entry,Outgoing Rate,อัตราการส่งออก
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,ปริญญาโท สาขา องค์กร
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,หรือ
@@ -2030,7 +2039,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,จัดการ กลุ่ม ลูกค้า ต้นไม้
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,ใหม่ ชื่อ ศูนย์ต้นทุน
 DocType: Leave Control Panel,Leave Control Panel,ฝากแผงควบคุม
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,ไม่มีแม่แบบที่อยู่เริ่มต้นพบ กรุณาสร้างขึ้นมาใหม่จากการตั้งค่า> การพิมพ์และการสร้างแบรนด์> แม่แบบที่อยู่
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,ไม่มีแม่แบบที่อยู่เริ่มต้นพบ กรุณาสร้างขึ้นมาใหม่จากการตั้งค่า> การพิมพ์และการสร้างแบรนด์> แม่แบบที่อยู่
 DocType: Appraisal,HR User,ผู้ใช้งานทรัพยากรบุคคล
 DocType: Purchase Invoice,Taxes and Charges Deducted,ภาษีและค่าบริการหัก
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,ปัญหา
@@ -2047,7 +2056,7 @@
 ,Sales Browser,ขาย เบราว์เซอร์
 DocType: Journal Entry,Total Credit,เครดิตรวม
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},คำเตือน: อีก {0} # {1} อยู่กับรายการหุ้น {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,ในประเทศ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,ใหญ่
@@ -2066,7 +2075,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ขายทำธุรกรรมทั้งหมดสามารถติดแท็กกับหลายบุคคลที่ขาย ** ** เพื่อให้คุณสามารถตั้งค่าและตรวจสอบเป้าหมาย
 ,S.O. No.,เลขที่ใบสั่งขาย
 DocType: Production Order Operation,Make Time Log,สร้างบันทึกเวลา
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,กรุณาตั้งค่าปริมาณการสั่งซื้อ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},กรุณาสร้าง ลูกค้า จากช่องทาง {0}
 DocType: Price List,Applicable for Countries,ใช้งานได้สำหรับประเทศ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,คอมพิวเตอร์
@@ -2153,7 +2161,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,ได้รับ คอมเมนต์ ที่เกี่ยวข้อง
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,เข้าบัญชีสำหรับสต็อก
 DocType: Sales Invoice,Sales Team1,ขาย Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,รายการที่ {0} ไม่อยู่
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,รายการที่ {0} ไม่อยู่
 DocType: Sales Invoice,Customer Address,ที่อยู่ของลูกค้า
 DocType: Payment Request,Recipient and Message,และผู้รับข้อความ
 DocType: Purchase Invoice,Apply Additional Discount On,สมัครสมาชิกเพิ่มเติมส่วนลด
@@ -2195,7 +2203,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,อัตราการประเมิน
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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,เปลี่ยนชื่อเข้าสู่ระบบ
@@ -2233,7 +2241,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,กรุณากรอก วันที่ บรรเทา
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,เพียง ปล่อยให้ การใช้งาน ที่มีสถานะ 'อนุมัติ ' สามารถ ส่ง
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,ที่อยู่ ชื่อเรื่อง มีผลบังคับใช้
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,ที่อยู่ ชื่อเรื่อง มีผลบังคับใช้
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ป้อนชื่อของแคมเปญหากแหล่งที่มาของการรณรงค์สอบถามรายละเอียดเพิ่มเติม
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,หนังสือพิมพ์ สำนักพิมพ์
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,เลือกปีงบประมาณ
@@ -2257,6 +2265,7 @@
 DocType: UOM,Must be Whole Number,ต้องเป็นจำนวนเต็ม
 DocType: Leave Control Panel,New Leaves Allocated (In Days),ใบใหม่ที่จัดสรร (ในวัน)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,อนุกรม ไม่มี {0} ไม่อยู่
+DocType: Sales Invoice Item,Customer Warehouse (Optional),คลังสินค้าของลูกค้า (อุปกรณ์เสริม)
 DocType: Pricing Rule,Discount Percentage,ร้อยละ ส่วนลด
 DocType: Payment Reconciliation Invoice,Invoice Number,จำนวนใบแจ้งหนี้
 apps/erpnext/erpnext/hooks.py +55,Orders,คำสั่งซื้อ
@@ -2366,7 +2375,7 @@
 DocType: Appraisal,Appraisal,การตีราคา
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,วันที่ซ้ำแล้วซ้ำอีก
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,ผู้มีอำนาจลงนาม
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},ออกจาก ผู้อนุมัติ ต้องเป็นหนึ่งใน {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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,เวลา
@@ -2535,7 +2544,7 @@
 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 +733,Show tax break-up,แสดงภาษีผิดขึ้น
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,แสดงภาษีผิดขึ้น
 apps/erpnext/erpnext/accounts/party.py +283,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',หากคุณ มีส่วนร่วมใน กิจกรรมการผลิต ให้เปิดใช้ตัวเลือก 'เป็นผลิตภัณฑ์ที่ถูกผลิต '
@@ -2585,7 +2594,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,กรุณาชื่อ บริษัท อีกครั้งเพื่อยืนยันชนิด
@@ -2612,9 +2621,6 @@
 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,วันที่ เข้าร่วม จะต้องมากกว่า วันเกิด
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,โครงสร้างเงินเดือน
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","กฎข้อที่ราคาหลายอยู่กับเกณฑ์เดียวกันกรุณาแก้ปัญหาความขัดแย้ง \
- โดยการกำหนดลำดับความสำคัญ ราคากฎ: {0}"
 DocType: Account,Bank,ธนาคาร
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,สายการบิน
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,ฉบับวัสดุ
@@ -2639,7 +2645,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,หลักทรัพย์และ การแลกเปลี่ยน สินค้าโภคภัณฑ์
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',เริ่มต้นหน่วยวัดสำหรับตัวแปร &#39;{0}&#39; จะต้องเป็นเช่นเดียวกับในแม่แบบ &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',เริ่มต้นหน่วยวัดสำหรับตัวแปร &#39;{0}&#39; จะต้องเป็นเช่นเดียวกับในแม่แบบ &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,การคำนวณพื้นฐานตาม
 DocType: Delivery Note Item,From Warehouse,จากคลังสินค้า
 DocType: Purchase Taxes and Charges,Valuation and Total,การประเมินและรวม
@@ -2648,7 +2654,7 @@
 DocType: Account,Purchase User,ผู้ซื้อ
 DocType: Notification Control,Customize the Notification,กำหนดประกาศ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,กระแสเงินสดจากการดำเนินงาน
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,แม่แบบเริ่มต้นที่อยู่ไม่สามารถลบได้
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,แม่แบบเริ่มต้นที่อยู่ไม่สามารถลบได้
 DocType: Sales Invoice,Shipping Rule,กฎการจัดส่งสินค้า
 DocType: Manufacturer,Limited to 12 characters,จำกัด 12 ตัวอักษร
 DocType: Journal Entry,Print Heading,พิมพ์หัวเรื่อง
@@ -2742,7 +2748,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,ข้อมูล โครงการ ฉลาด ไม่สามารถใช้ได้กับ ใบเสนอราคา
 DocType: Project,Expected End Date,คาดว่าวันที่สิ้นสุด
 DocType: Appraisal Template,Appraisal Template Title,หัวข้อแม่แบบประเมิน
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,เชิงพาณิชย์
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,บริการ ที่น่ากลัว
@@ -2761,7 +2767,7 @@
 DocType: Customer,Default Receivable Accounts,บัญชีลูกหนี้เริ่มต้น
 DocType: Tax Rule,Billing State,รัฐเรียกเก็บเงิน
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,โอน
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),เรียก BOM ระเบิด (รวมถึงการ ประกอบย่อย )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),เรียก BOM ระเบิด (รวมถึงการ ประกอบย่อย )
 DocType: Authorization Rule,Applicable To (Employee),ที่ใช้บังคับกับ (พนักงาน)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,วันที่ครบกำหนดมีผลบังคับใช้
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,เพิ่มสำหรับแอตทริบิวต์ {0} ไม่สามารถเป็น 0
@@ -2794,7 +2800,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,อัตรา การประเมิน เชิงลบ ไม่ได้รับอนุญาต
 DocType: Holiday List,Weekly Off,สัปดาห์ปิด
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","สำหรับเช่น 2012, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),กำไรเฉพาะกาล / ขาดทุน (เครดิต)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),กำไรเฉพาะกาล / ขาดทุน (เครดิต)
 DocType: Sales Invoice,Return Against Sales Invoice,กลับไปกับใบแจ้งหนี้การขาย
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,ข้อ 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},กรุณาตั้งค่าเริ่มต้น {0} ใน บริษัท {1}
@@ -2825,6 +2831,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,เพิ่ม เด็ก
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,บทบาทที่ได้รับอนุญาตให้ตั้ง บัญชีแช่แข็ง และแก้ไขรายการแช่แข็ง
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,ไม่สามารถแปลง ศูนย์ต้นทุน ไปยัง บัญชีแยกประเภท ที่มี ต่อมน้ำเด็ก
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,ราคาเปิด
 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,สำนักงานคณะกรรมการกำกับ การขาย
 DocType: Offer Letter Term,Value / Description,ค่า / รายละเอียด
@@ -2858,7 +2865,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,ประสบความสำเร็จในการทำธุรกรรมที่ถูกลบทั้งหมดที่เกี่ยวข้องกับ บริษัท นี้!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,ขณะที่ในวันที่
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,การทดลอง
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,โกดัง เริ่มต้น มีผลบังคับใช้ กับ รายการ สต็อก
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},การชำระเงิน ของเงินเดือน สำหรับเดือน{0} และปี {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,แทรกอัตโนมัติราคาอัตรารายชื่อถ้าขาดหายไป
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,รวมจำนวนเงินที่จ่าย
@@ -2894,7 +2900,7 @@
 DocType: Payment Tool,Set Matching Amounts,ระบุจำนวนเงินที่จับคู่
 DocType: Purchase Invoice,Taxes and Charges Added,ภาษีและค่าบริการเพิ่ม
 ,Sales Funnel,ช่องทาง ขาย
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,ชื่อย่อมีผลบังคับใช้
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,ชื่อย่อมีผลบังคับใช้
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,ขอบคุณที่ให้ความสนใจในการสมัครรับการปรับปรุงของเรา
 ,Qty to Transfer,จำนวน การโอน
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,ใบเสนอราคาไปยังช่องทาง หรือลูกค้า
@@ -2922,7 +2928,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,ใบเสนอราคาของผู้ผลิต
 DocType: Quotation,In Words will be visible once you save the Quotation.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกใบเสนอราคา
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} หยุดทำงาน
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},บาร์โค้ด {0} ได้ใช้แล้วในรายการ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,เหตุการณ์ที่จะเกิดขึ้น
@@ -2944,7 +2950,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,เลือกปีงบประมาณ ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,รายละเอียด POS ต้องทำให้ POS รายการ
 DocType: Hub Settings,Name Token,ชื่อ Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,ขาย มาตรฐาน
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,ขาย มาตรฐาน
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,อย่างน้อยหนึ่งคลังสินค้ามีผลบังคับใช้
 DocType: Serial No,Out of Warranty,ออกจากการรับประกัน
 DocType: BOM Replace Tool,Replace,แทนที่
@@ -3067,7 +3073,7 @@
 DocType: Sales Invoice,Paid Amount,จำนวนเงินที่ชำระ
 ,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,การตั้งค่าแม่แบบที่อยู่นี้เป็นค่าเริ่มต้นที่ไม่มีค่าเริ่มต้นอื่น ๆ
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,การตั้งค่าแม่แบบที่อยู่นี้เป็นค่าเริ่มต้นที่ไม่มีค่าเริ่มต้นอื่น ๆ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",ยอดเงินในบัญชีแล้วในเดบิตคุณไม่ได้รับอนุญาตให้ตั้ง 'ยอดดุลต้องเป็น' เป็น 'เครดิต
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,การบริหารจัดการคุณภาพ
 DocType: Production Planning Tool,Filter based on customer,กรองขึ้นอยู่กับลูกค้า
@@ -3168,7 +3174,7 @@
 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 +19,Shortage Qty,ปัญหาการขาดแคลนจำนวน
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
 DocType: Salary Slip,Salary Slip,สลิปเงินเดือน
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"โปรดระบุ “วันที่สิ้นสุด"""
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","สร้างบรรจุภัณฑ์สำหรับแพคเกจที่จะส่งมอบ ที่ใช้ในการแจ้งหมายเลขแพคเกจ, แพคเกจเนื้อหาและน้ำหนักของมัน"
@@ -3179,7 +3185,7 @@
 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.",เมื่อใดของการทำธุรกรรมการตรวจสอบเป็น &quot;Submitted&quot; อีเมล์แบบ pop-up เปิดโดยอัตโนมัติในการส่งอีเมลไปยัง &quot;ติดต่อ&quot; ที่เกี่ยวข้องในการทำธุรกรรมที่มีการทำธุรกรรมเป็นสิ่งที่แนบ ผู้ใช้อาจจะหรือไม่อาจจะส่งอีเมล
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,การตั้งค่าสากล
 DocType: Employee Education,Employee Education,การศึกษาการทำงานของพนักงาน
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,มันเป็นสิ่งจำเป็นที่จะดึงรายละเอียดสินค้า
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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} ได้รับ อยู่แล้ว
@@ -3205,6 +3211,7 @@
 DocType: BOM,Manufacturing User,ผู้ใช้การผลิต
 DocType: Purchase Order,Raw Materials Supplied,วัตถุดิบ
 DocType: Purchase Invoice,Recurring Print Format,รูปแบบที่เกิดขึ้นประจำพิมพ์
+DocType: C-Form,Series,ชุด
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,วันที่ส่ง ที่คาดว่าจะ ไม่สามารถเป็น วัน ก่อนที่จะ สั่งซื้อ
 DocType: Appraisal,Appraisal Template,แม่แบบการประเมิน
 DocType: Item Group,Item Classification,การจัดประเภทรายการ
@@ -3291,7 +3298,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},แถว {0}: รายการสั่งซื้อใหม่อยู่แล้วสำหรับคลังสินค้านี้ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.",ไม่ สามารถประกาศ เป็น หายไป เพราะ ใบเสนอราคา ได้รับการทำ
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ซื้อผู้จัดการโท
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,สั่งผลิต {0} จะต้องส่ง
@@ -3299,7 +3306,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,รายงานหลัก
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,วันที่ ไม่สามารถ ก่อนที่จะ นับจากวันที่
 DocType: Purchase Receipt Item,Prevdoc DocType,DocType Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,เพิ่ม / แก้ไขราคา
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,คำสั่งซื้อของฉัน
@@ -3347,7 +3354,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},แถว # {0}: ตั้งผู้ผลิตสำหรับรายการ {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,ภาพ Website {0} แนบไปกับรายการ {1} ไม่สามารถพบได้
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,ภาพ Website {0} แนบไปกับรายการ {1} ไม่สามารถพบได้
 DocType: Issue,Content Type,ประเภทเนื้อหา
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,คอมพิวเตอร์
 DocType: Item,List this Item in multiple groups on the website.,รายการนี้ในหลายกลุ่มในเว็บไซต์
@@ -3361,7 +3368,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,'มีเลขซีเรียล' ไม่สามารถ 'ใช่' สำหรับรายการ ที่ไม่มี สต็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'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,หัวบัญชี
@@ -3387,7 +3394,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,บัญชีปิด {0} ต้องเป็นชนิดรับผิด / ผู้ถือหุ้น
 DocType: Authorization Rule,Based On,ขึ้นอยู่กับ
 DocType: Sales Order Item,Ordered Qty,สั่งซื้อ จำนวน
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
 DocType: Stock Settings,Stock Frozen Upto,สต็อกไม่เกิน Frozen
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},ระยะเวลาเริ่มต้นและระยะเวลาในการบังคับใช้สำหรับวันที่เกิดขึ้น {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,กิจกรรมของโครงการ / งาน
@@ -3395,7 +3402,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",ต้องเลือก การซื้อ ถ้าเลือก ใช้ได้กับ เป็น {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ส่วนลด จะต้อง น้อยกว่า 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),เขียนปิดจำนวนเงิน (บริษัท สกุล)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,แถว # {0}: กรุณาตั้งค่าปริมาณการสั่งซื้อ
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,แถว # {0}: กรุณาตั้งค่าปริมาณการสั่งซื้อ
 DocType: Landed Cost Voucher,Landed Cost Voucher,ที่ดินคูปองต้นทุน
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},กรุณาตั้ง {0}
 DocType: Purchase Invoice,Repeat on Day of Month,ทำซ้ำในวันเดือน
@@ -3468,7 +3475,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ดู ตอนนี้
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,เลือกระยะเวลาเมื่อใบแจ้งหนี้จะถูกสร้างขึ้นโดยอัตโนมัติ
 DocType: BOM,Raw Material Cost,วัตถุดิบต้นทุน
-DocType: Item,Re-Order Level,ระดับ Re-Order
+DocType: Item Reorder,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.,ป้อนรายการและจำนวนที่วางแผนไว้สำหรับที่คุณต้องการที่จะยกระดับการสั่งผลิตหรือดาวน์โหลดวัตถุดิบสำหรับการวิเคราะห์
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,รายการวันหยุดที่ใช้บังคับ
@@ -3523,7 +3530,7 @@
 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 +573,Please specify Attribute Value for attribute {0},โปรดระบุคุณสมบัติราคาแอตทริบิวต์ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3602,7 +3609,7 @@
 DocType: Address,Office,สำนักงาน
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,รายการบัญชีวารสาร
 DocType: Delivery Note Item,Available Qty at From Warehouse,จำนวนที่จำหน่ายจากคลังสินค้า
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,กรุณาเลือกพนักงานบันทึกครั้งแรก
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,กรุณาเลือกพนักงานบันทึกครั้งแรก
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,กรุณากรอกบัญชีค่าใช้จ่าย
@@ -3677,7 +3684,7 @@
 DocType: Item Attribute,Numeric Values,ค่าที่เป็นตัวเลข
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,แนบ โลโก้
 DocType: Customer,Commission Rate,อัตราค่าคอมมิชชั่น
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,ทำให้ตัวแปร
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,ทำให้ตัวแปร
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,ปิดกั้นการใช้งานออกโดยกรม
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,รถเข็นที่ว่างเปล่า
 DocType: Production Order,Actual Operating Cost,ต้นทุนการดำเนินงานที่เกิดขึ้นจริง
@@ -3694,15 +3701,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item",การตั้งค่าระดับสั่งซื้อสินค้าจะต้องเป็นรายการการซื้อหรือการผลิตรายการ
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),(ครึ่งวัน)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(ครึ่งวัน)
 DocType: Supplier,Credit Days,วันเครดิต
 DocType: Leave Type,Is Carry Forward,เป็น Carry Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,รับสินค้า จาก BOM
diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv
index 4821d96..365da5a 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -42,7 +42,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Döviz Kuru aynı olmalıdır {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Müşteri Adı
 DocType: Sales Invoice,Customer Name,Müşteri Adı
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Banka hesabı olarak adlandırılan olamaz {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Banka hesabı olarak adlandırılan olamaz {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),{0} için bekleyen sıfırdan az olamaz ({1})
@@ -58,7 +58,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Yeni İzin Uygulaması
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Yeni İzin Uygulaması
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Banka Havalesi
 apps/erpnext/erpnext/setup/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
@@ -106,7 +106,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Yeni {0}: # {1}
 ,Sales Partners Commission,Satış Ortakları Komisyonu
 ,Sales Partners Commission,Satış Ortakları Komisyonu
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Kısaltma 5 karakterden fazla olamaz.
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Kısaltma 5 karakterden fazla olamaz.
 DocType: Payment Request,Payment Request,Ödeme isteği
 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.",Değer {0} {1} Öğe olarak Varyantlar \ kaldırıldı olamaz Özellik bu Öznitelik ile var.
@@ -245,6 +245,7 @@
 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 (%)
 DocType: Offer Letter,Select Terms and Conditions,Şartlar ve Koşulları Seç
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,out Değeri
 DocType: Production Planning Tool,Sales Orders,Satış Siparişleri
 DocType: Purchase Taxes and Charges,Valuation,Değerleme
 DocType: Purchase Taxes and Charges,Valuation,Değerleme
@@ -260,6 +261,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizyon
 DocType: Production Order Operation,Updated via 'Time Log','Zaman Log' aracılığıyla Güncelleme
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Hesap {0} Şirkete ait değil {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Peşin miktar daha büyük olamaz {0} {1}
 DocType: Naming Series,Series List for this Transaction,Bu İşlem için Seri Listesi
 DocType: Naming Series,Series List for this Transaction,Bu İşlem için Seri Listesi
 DocType: Sales Invoice,Is Opening Entry,Açılış Girdisi
@@ -280,8 +282,8 @@
 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/templates/generators/item.html +30,No description given,Açıklama verilmemiştir
-apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Satın alma isteği.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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/config/buying.py +18,Request for purchase.,Satın alma talebi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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&gt; Ayarlar yoluyla&gt; Adlandırma Serisi Serisi adlandırma set Lütfen
@@ -291,8 +293,8 @@
 DocType: Item Website Specification,Item Website Specification,Ürün Web Sitesi Özellikleri
 DocType: Item Website Specification,Item Website Specification,Ürün Web Sitesi Özellikleri
 DocType: Payment Tool,Reference No,Referans No
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,İzin engellendi
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,İzin engellendi
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,Annual,Yıllık
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Yıllık
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stok Uzlaşma Öğe
@@ -307,7 +309,7 @@
 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 +606,Item {0} is cancelled,Ürün {0} iptal edildi
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Ürün {0} iptal edildi
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Malzeme Talebi
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Malzeme Talebi
 DocType: Bank Reconciliation,Update Clearance Date,Güncelleme Alma Tarihi
@@ -364,7 +366,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,İrsaliye
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Vergiler kurma
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} iki kere ürün vergisi girildi
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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
@@ -400,7 +402,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,Eke bakın
 DocType: Purchase Order,% Received,% Alındı
 DocType: Purchase Order,% Received,% Alındı
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Kurulum Tamamlandı!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Kurulum Tamamlandı!
 ,Finished Goods,Mamüller
 ,Finished Goods,Mamüller
 DocType: Delivery Note,Instructions,Talimatlar
@@ -432,7 +434,7 @@
 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 +169,{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 +189,{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/setup_wizard/install_fixtures.py +39,Medical,Tıbbi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Tıbbi
@@ -442,7 +444,6 @@
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Fırsatlar
 DocType: Employee,Single,Tek
 DocType: Employee,Single,Bireysel
-DocType: Issue,Attachment,Haciz
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Bütçe Grubu Maliyet Merkezi için ayarlanamaz
 DocType: Account,Cost of Goods Sold,Satışların Maliyeti
 DocType: Purchase Invoice,Yearly,Yıllık
@@ -476,7 +477,7 @@
 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 +564,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 +550,Attribute {0} selected multiple times in Attributes Table,Özellik {0} Nitelikler Tablo birden çok kez seçilmiş
 DocType: HR Settings,Employee record is created using selected field. ,Çalışan kaydı seçilen alan kullanılarak yapılmıştır
 DocType: Sales Order,Not Applicable,Uygulanamaz
 DocType: Sales Order,Not Applicable,Uygulanamaz
@@ -524,7 +525,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Malzeme Talebinin yapılacağı Depoyu girin
 DocType: Production Order,Additional Operating Cost,Ek İşletme Maliyeti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Bakım ürünleri
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"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: Shipping Rule,Net Weight,Net Ağırlık
 DocType: Employee,Emergency Phone,Acil Telefon
 DocType: Employee,Emergency Phone,Acil Telefon
@@ -540,7 +541,8 @@
 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ü
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Fiyat listesi para biriminin şirketin temel para birimine dönüştürülme oranı
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Hesap {0} Şirkete ait değil: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Hesap {0} Şirkete ait değil: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Kısaltma zaten başka bir şirket için kullanılan
 DocType: Selling Settings,Default Customer Group,Varsayılan Müşteri Grubu
 DocType: Selling Settings,Default Customer Group,Varsayılan Müşteri Grubu
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Devre dışıysa, 'Yuvarlanmış Toplam' alanı hiçbir işlemde görünmeyecektir."
@@ -586,6 +588,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Fatura tablosunda kayıt bulunamadı
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,İlk Şirket ve Parti Tipi seçiniz
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Mali / Muhasebe yılı.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,birikmiş Değerler
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Üzgünüz, seri numaraları birleştirilemiyor"
 DocType: Project Task,Project Task,Proje Görevi
 ,Lead Id,Talep Yaratma  Kimliği
@@ -613,7 +616,7 @@
 DocType: Lead,Middle Income,Orta Gelir
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Açılış (Cr)
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Açılış (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Zaten başka Ölçü Birimi bazı işlem (ler) yaptık çünkü Öğe için Ölçü Varsayılan Birim {0} doğrudan değiştirilemez. Farklı Standart Ölçü Birimi kullanmak için yeni bir öğe oluşturmanız gerekecektir.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Zaten başka Ölçü Birimi bazı işlem (ler) yaptık çünkü Öğe için Ölçü Varsayılan Birim {0} doğrudan değiştirilemez. Farklı Standart Ölçü Birimi kullanmak için yeni bir öğe oluşturmanız gerekecektir.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Tahsis edilen miktar negatif olamaz
 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ı
@@ -712,7 +715,7 @@
 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 +543,Item has variants.,Öğe varyantları vardır.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -729,6 +732,7 @@
 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 +33,Goods received from Suppliers.,Tedarikçilerden alınan mallar.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,Değer
 DocType: Lead,Campaign Name,Kampanya Adı
 DocType: Lead,Campaign Name,Kampanya Adı
 ,Reserved,Ayrılmış
@@ -746,7 +750,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,İşlem görmüş hesaplar muhasebe defterine dönüştürülemez.
 DocType: Delivery Note,Customer's Purchase Order No,Müşterinin Sipariş numarası
 DocType: Employee,Cell Number,Hücre sayısı
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Otomatik Malzeme İstekler Oluşturulmuş
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Otomatik Malzeme İstekler Oluşturulmuş
 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 +126,You can not enter current voucher in 'Against Journal Entry' column,Sen sütununda 'Journal girişine karşı' geçerli fiş giremezsiniz
@@ -756,10 +760,12 @@
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Aylık maaş beyanı.
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Aylık maaş beyanı.
 DocType: Item Group,Website Specifications,Web Sitesi Özellikleri
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Adres Şablon bir hata var {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Yeni Hesap
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Yeni Hesap
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: gönderen {0} çeşidi {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Satır {0}: Dönüşüm katsayısı zorunludur
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Çoklu Fiyat Kuralları aynı kriterler ile var, öncelik atayarak çatışma çözmek lütfen. Fiyat Kuralları: {0}"
 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.,Muhasebe Girişler yaprak düğümleri karşı yapılabilir. Gruplar karşı Girişler izin verilmez.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,Devre dışı bırakmak veya diğer ürün ağaçları ile bağlantılı olarak BOM iptal edilemiyor
 DocType: Opportunity,Maintenance,Bakım
@@ -827,7 +833,7 @@
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Uyarı: Geçersiz Eklenti {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Uyarı: Geçersiz Eklenti {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,İzin yok
 DocType: Company,Default Bank Account,Varsayılan Banka Hesabı
 DocType: Company,Default Bank Account,Varsayılan Banka Hesabı
@@ -863,14 +869,14 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} Bill karşı {1} tarihli {2}
 DocType: Maintenance Visit,Completion Status,Tamamlanma Durumu
 DocType: Maintenance Visit,Completion Status,Tamamlanma Durumu
-DocType: Sales Invoice Item,Target Warehouse,Hedef Depo
+DocType: Production Order,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 +50,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/setup_wizard/install_fixtures.py +17,All Item Groups,Bütün Ürün Grupları
 DocType: Process Payroll,Activity Log,Etkinlik Günlüğü
 DocType: Process Payroll,Activity Log,Etkinlik Günlüğü
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Net Kar / Zarar
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Net Kar / Zarar
 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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} durum {2} olduğu
@@ -879,7 +885,7 @@
 DocType: Sales Invoice,Payment Due Date,Son Ödeme Tarihi
 DocType: Sales Invoice,Payment Due Date,Son Ödeme Tarihi
 DocType: Newsletter,Newsletter Manager,Bülten Müdürü
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Öğe Variant {0} zaten aynı özelliklere sahip bulunmaktadır
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Öğe Variant {0} zaten aynı özelliklere sahip bulunmaktadır
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Açılış&#39;
 DocType: Notification Control,Delivery Note Message,İrsaliye Mesajı
 DocType: Expense Claim,Expenses,Giderler
@@ -892,7 +898,7 @@
 ,Amount to Bill,Faturalanacak Tutar
 DocType: Company,Registration Details,Kayıt Detayları
 DocType: Company,Registration Details,Kayıt Detayları
-DocType: Item,Re-Order Qty,Yeniden sipariş Adet
+DocType: Item Reorder,Re-Order Qty,Yeniden sipariş Adet
 DocType: Leave Block List Date,Leave Block List Date,İzin engel listesi tarihi
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programlandı ve şuna gönderildi {0}
 DocType: Pricing Rule,Price or Discount,Fiyat veya İndirim
@@ -944,7 +950,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,İnternet Yayıncılığı
 DocType: Production Planning Tool,Production Orders,Üretim Siparişleri
 DocType: Production Planning Tool,Production Orders,Üretim Siparişleri
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Denge Değeri
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Denge Değeri
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Satış Fiyat Listesi
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Öğeleri senkronize Yayınla
 DocType: Bank Reconciliation,Account Currency,Hesabın Döviz Cinsi
@@ -955,7 +961,7 @@
 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 +538,Item Variants {0} updated,Öğe Türevleri {0} güncellendi
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -1044,7 +1050,7 @@
 DocType: POS Profile,Cash/Bank Account,Kasa / Banka Hesabı
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Özellik tablosu zorunludur
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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
@@ -1076,8 +1082,8 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Ürün düğmesi 'satın alma makbuzlarını Öğeleri alın' kullanılarak eklenmelidir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Satış Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Satış Giderleri
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Standart Satın Alma
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Standart Satın Alma
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Standart Satın Alma
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Standart Satın Alma
 DocType: GL Entry,Against,Karşı
 DocType: Item,Default Selling Cost Center,Standart Satış Maliyet Merkezi
 DocType: Item,Default Selling Cost Center,Standart Satış Maliyet Merkezi
@@ -1125,7 +1131,7 @@
 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 +210,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/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Set &#39;On İlave İndirim Uygula&#39; Lütfen
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Set &#39;On İlave İndirim Uygula&#39; Lütfen
 ,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.
@@ -1208,9 +1214,9 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Değerlendirme Defteri
 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 +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Satış Emrine Karşı Üretim
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Dünyanın geri kalanı
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1242,7 +1248,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Üzgünüz, şirketler birleştirilemiyor"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Üzgünüz, şirketler birleştirilemiyor"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Küçük
 DocType: Employee,Employee Number,Çalışan sayısı
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Konu Numarası/numaraları zaten kullanımda. Konu No {0} olarak deneyin.
@@ -1266,7 +1272,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Ürünleriniz veya hizmetleriniz
 DocType: Mode of Payment,Mode of Payment,Ödeme Şekli
 DocType: Mode of Payment,Mode of Payment,Ödeme Şekli
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Web Sitesi Resim kamu dosya veya web sitesi URL olmalıdır
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Web Sitesi Resim kamu dosya veya web sitesi URL olmalıdır
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Bu bir kök Ürün grubudur ve düzenlenemez.
 DocType: Journal Entry Account,Purchase Order,Satın alma emri
 DocType: Warehouse,Warehouse Contact Info,Depo İletişim Bilgileri
@@ -1357,6 +1363,7 @@
 DocType: Purchase Invoice Item,Accounting,Muhasebe
 DocType: Purchase Invoice Item,Accounting,Muhasebe
 DocType: Features Setup,Features Setup,Özellik  Kurulumu
+DocType: Item,Is Service Item,Hizmet Maddesi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Uygulama süresi dışında izin tahsisi dönemi olamaz
 DocType: Activity Cost,Projects,Projeler
 DocType: Activity Cost,Projects,Projeler
@@ -1397,7 +1404,7 @@
 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 +465,cannot be greater than 100,100 'den daha büyük olamaz
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Ürün {0} bir stok ürünü değildir
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1472,8 +1479,8 @@
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Öğe Türevleri
 DocType: Company,Services,Servisler
 DocType: Company,Services,Servisler
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Toplam ({0})
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Toplam ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Toplam ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Toplam ({0})
 DocType: Cost Center,Parent Cost Center,Ana Maliyet Merkezi
 DocType: Sales Invoice,Source,Kaynak
 DocType: Sales Invoice,Source,Kaynak
@@ -1561,8 +1568,8 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ödeme E-posta tekrar gönder
 DocType: Dependent Task,Dependent Task,Bağımlı Görev
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},Tip{0} izin  {1}'den uzun olamaz
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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
@@ -1570,10 +1577,10 @@
 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
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Görüntüle
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Nakit Net Değişim
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Nakit Net Değişim
 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/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Ödeme Talebi zaten var {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,İhraç Öğeler Maliyeti
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Quantity must not be more than {0},Miktar fazla olmamalıdır {0}
@@ -1646,7 +1653,7 @@
 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: Packed 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ı
@@ -1658,7 +1665,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Pazarlama Giderleri
 ,Item Shortage Report,Ürün yetersizliği Raporu
 ,Item Shortage Report,Ürün yetersizliği Raporu
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Ağırlık çok ""Ağırlık Ölçü Birimi"" belirtiniz \n, söz edilmektedir"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Ağırlık çok ""Ağırlık Ölçü Birimi"" belirtiniz \n, söz edilmektedir"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Bu stok girdisini yapmak için kullanılan Malzeme Talebi
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Bir Ürünün tek birimi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Günlük Seri {0} 'Teslim edilmelidir'
@@ -1671,6 +1678,7 @@
 DocType: Upload Attendance,Get Template,Şablon alın
 DocType: Address,Postal,Posta
 DocType: Address,Postal,Posta
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext Kurulumu Tamamlandı!
 DocType: Item,Weightage,Ağırlık
 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.
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Önce {0} seçiniz
@@ -1704,13 +1712,13 @@
 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şine izin ver
-apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Ana
-apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Ana
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Ana
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Ana
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Varyant
 DocType: Naming Series,Set prefix for numbering series on your transactions,İşlemlerinizde seri numaralandırma için ön ek ayarlayın
 DocType: Employee Attendance Tool,Employees HTML,"Çalışanlar, HTML"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,Durdurulan Sipariş iptal edilemez. İptali kaldırın
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,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/stock/doctype/item/item.py +361,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
@@ -1739,7 +1747,6 @@
 DocType: Sales Order,To Deliver and Bill,Teslim edildi ve Faturalandı
 DocType: GL Entry,Credit Amount in Account Currency,Hesap Para Birimi Kredi Tutarı
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Üretim için Time Kayıtlar.
-DocType: Item,Apply Warehouse-wise Reorder Level,Depo-bilge Yeniden Sipariş Seviyesi Uygula
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} teslim edilmelidir
 DocType: Authorization Control,Authorization Control,Yetki Kontrolü
 DocType: Authorization Control,Authorization Control,Yetki Kontrolü
@@ -1857,6 +1864,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Yatırımlar
 DocType: Issue,Resolution Details,Karar Detayları
 DocType: Issue,Resolution Details,Karar Detayları
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,tahsisler
 DocType: Quality Inspection Reading,Acceptance Criteria,Onaylanma Kriterleri
 DocType: Item Attribute,Attribute Name,Öznitelik Adı
 DocType: Item Group,Show In Website,Web sitesinde Göster
@@ -1918,7 +1926,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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ı
 DocType: Leave Block List Allow,Leave Block List Allow,İzin engel listesi müsaade eder
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Kısaltma boş veya boşluktan oluşamaz
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Kısaltma boş veya boşluktan oluşamaz
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Sigara Grup Grup
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Spor
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Spor
@@ -1968,7 +1976,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Ürün {0} zaten iade edilmiş
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Mali Yılı ** Mali Yılı temsil eder. Tüm muhasebe kayıtları ve diğer önemli işlemler ** ** Mali Yılı karşı izlenir.
 DocType: Opportunity,Customer / Lead Address,Müşteri / Adres
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Uyarı: eki Geçersiz SSL sertifikası {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Uyarı: eki Geçersiz SSL sertifikası {0}
 DocType: Production Order Operation,Actual Operation Time,Gerçek Çalışma Süresi
 DocType: Authorization Rule,Applicable To (User),(Kullanıcıya) Uygulanabilir
 DocType: Purchase Taxes and Charges,Deduct,Düşmek
@@ -2147,8 +2155,9 @@
 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
-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: 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 +86,Stores,Mağazalar
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Mağazalar
 DocType: Time Log,Projects Manager,Proje Yöneticisi
 DocType: Serial No,Delivery Time,Teslimat süresi
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Dayalı Yaşlanma
@@ -2180,7 +2189,7 @@
 DocType: Quality Inspection,Verified By,Onaylayan Kişi
 DocType: Address,Subsidiary,Yardımcı
 DocType: Address,Subsidiary,Yardımcı
-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.","Mevcut işlemler olduğundan, şirketin varsayılan para birimini değiştiremezsiniz. İşlemler Varsayılan para birimini değiştirmek için iptal edilmelidir."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Mevcut işlemler olduğundan, şirketin varsayılan para birimini değiştiremezsiniz. İşlemler Varsayılan para birimini değiştirmek için iptal edilmelidir."
 DocType: Quality Inspection,Purchase Receipt No,Satın alma makbuzu numarası
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kaparo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kaparo
@@ -2219,7 +2228,7 @@
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Biten İyi Ürün için BOM numarası
 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: Warranty Claim,Raised By,Talep eden
 DocType: Payment Gateway Account,Payment Account,Ödeme Hesabı
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Please specify Company to proceed,Devam etmek için Firma belirtin
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Please specify Company to proceed,Devam etmek için Firma belirtin
@@ -2235,7 +2244,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Stok güncelleme olamazdı, fatura damla nakliye öğe içeriyor."
 DocType: Newsletter,Test,Test
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 &#39;Seri No Has&#39;, &#39;Toplu Has Hayır&#39;, &#39;Stok Öğe mı&#39; ve &#39;Değerleme Metodu&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Hızlı Kayıt Girdisi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Herhangi bir Ürünye karşo BOM belirtildiyse oran değiştiremezsiniz.
@@ -2358,7 +2367,7 @@
 DocType: Purchase Invoice,Currency and Price List,Döviz ve Fiyat Listesi
 DocType: Purchase Invoice,Currency and Price List,Döviz ve Fiyat Listesi
 DocType: Opportunity,Customer / Lead Name,Müşteri/ İlk isim
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Gümrükleme Tarih belirtilmeyen
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Gümrükleme Tarih belirtilmeyen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Üretim
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Üretim
 DocType: Item,Allow Production Order,Üretim Emri izni
@@ -2371,7 +2380,7 @@
 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
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,Benim Adresleri
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Benim Adresleri
 DocType: Stock Ledger Entry,Outgoing Rate,Giden Oranı
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Kuruluş Şube Alanı
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,veya
@@ -2457,7 +2466,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Yeni Maliyet Merkezi Adı
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,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 +95,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.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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ı
 DocType: Purchase Invoice,Taxes and Charges Deducted,Mahsup Vergi ve Harçlar
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Sorunlar
@@ -2476,8 +2485,8 @@
 ,Sales Browser,Satış Tarayıcı
 DocType: Journal Entry,Total Credit,Toplam Kredi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Uyarı: Başka {0} # {1} stok girişi karşı var {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Yerel
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Yerel
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,Local,Yerel
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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
@@ -2500,7 +2509,6 @@
 ,S.O. No.,SO No
 ,S.O. No.,SO No
 DocType: Production Order Operation,Make Time Log,Zaman Giriş Yap
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Yeniden sipariş miktarını ayarlamak Lütfen
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Lütfen alan {0}'dan Müşteri oluşturunuz
 DocType: Price List,Applicable for Countries,Ülkeler için geçerlidir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Bilgisayarlar
@@ -2594,7 +2602,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Stokta Muhasebe Giriş
 DocType: Sales Invoice,Sales Team1,Satış Ekibi1
 DocType: Sales Invoice,Sales Team1,Satış Ekibi1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Ürün {0} yoktur
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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
 DocType: Payment Request,Recipient and Message,Alıcı ve Mesaj
@@ -2648,7 +2656,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Değerleme Oranı
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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
@@ -2695,7 +2703,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Lütfen Boşaltma tarihi girin.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Sadece durumu 'Onaylandı' olan İzin Uygulamaları verilebilir
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Adres Başlığı zorunludur.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Adres Başlığı zorunludur.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Sorgu kaynağı kampanya ise kampanya adı girin
 apps/erpnext/erpnext/setup/setup_wizard/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
@@ -2728,6 +2736,7 @@
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Tahsis Edilen Yeni İzinler (Günler)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Seri No {0} yok
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Seri No {0} yok
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Müşteri Depo (İsteğe bağlı)
 DocType: Pricing Rule,Discount Percentage,İndirim Yüzdesi
 DocType: Pricing Rule,Discount Percentage,İndirim Yüzdesi
 DocType: Payment Reconciliation Invoice,Invoice Number,Fatura Numarası
@@ -2858,8 +2867,8 @@
 DocType: Appraisal,Appraisal,Appraisal:Değerlendirme
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Tarih tekrarlanır
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Yetkili imza
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,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 +164,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 +184,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 +184,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ı
@@ -2930,7 +2939,7 @@
 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
+DocType: Purchase Receipt Item,Rate and Amount,Oran ve Miktar
 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
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Hiç kişiler Henüz eklenmiş.
@@ -3050,7 +3059,7 @@
 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ı
 DocType: Sales Order Item,Supplier delivers to Customer,Tedarikçi Müşteriye teslim
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Göster vergi break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Göster vergi break-up
 apps/erpnext/erpnext/accounts/party.py +283,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
@@ -3108,7 +3117,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,Re-tipi şirket ismi onaylamak için lütfen
@@ -3127,7 +3136,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Yatırım Bankacılığı
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,Cash or Bank Account is mandatory for making payment entry,Kasa veya Banka Hesabı ödeme girişi yapmak için zorunludur
 DocType: Purchase Invoice,Price List Exchange Rate,Fiyat Listesi Döviz Kuru
-DocType: Purchase Invoice Item,Rate,Br.Fiyat
+DocType: Purchase Invoice Item,Rate,Oran
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Stajyer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Stajyer
 DocType: Newsletter,A Lead with this email id should exist,Bu e-posta sistemde zaten kayıtlı
@@ -3142,9 +3151,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Maaş Yapısı
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Maaş Yapısı
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Çoklu Fiyat Kural aynı kriterlerle var, öncelik atayarak \
- çatışmayı çözmek lütfen. Fiyat Kuralları: {0}"
 DocType: Account,Bank,Banka
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Havayolu
@@ -3178,7 +3184,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Teminatlar ve Emtia Borsaları
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant için Ölçü Varsayılan Birim &#39;{0}&#39; Şablon aynı olmalıdır &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant için Ölçü Varsayılan Birim &#39;{0}&#39; Şablon aynı olmalıdır &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Tabanlı hesaplayın
 DocType: Delivery Note Item,From Warehouse,Atölyesi&#39;nden
 DocType: Purchase Taxes and Charges,Valuation and Total,Değerleme ve Toplam
@@ -3188,7 +3194,7 @@
 DocType: Account,Purchase User,Satınalma Kullanıcı
 DocType: Notification Control,Customize the Notification,Bildirim özelleştirin
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Faaliyetlerden Nakit Akışı
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Varsayılan Adres Şablon silinemez
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Varsayılan Adres Şablon silinemez
 DocType: Sales Invoice,Shipping Rule,Kargo Kuralı
 DocType: Manufacturer,Limited to 12 characters,12 karakter ile sınırlıdır
 DocType: Journal Entry,Print Heading,Baskı Başlığı
@@ -3214,7 +3220,7 @@
 ,Produced,Üretilmiş
 ,Produced,Üretilmiş
 DocType: Item,Item Code for Suppliers,Tedarikçi Ürün Kodu
-DocType: Issue,Raised By (Email),(Email)  ile talep edilen
+DocType: Issue,Raised By (Email),(Email)  ile talep eden
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Genel
 apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Genel
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Attach Letterhead,Antetli Kağıt Ekleyin
@@ -3302,8 +3308,8 @@
 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/setup_wizard/setup_wizard.py +373,Commercial,Ticari
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,Ticari
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,Commercial,Ticari
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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
@@ -3326,7 +3332,7 @@
 DocType: Tax Rule,Billing State,Fatura Kamu
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Transfer
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),(Alt-montajlar dahil) patlamış BOM'ları getir
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,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 +95,Due Date is mandatory,Due Date zorunludur
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Attribute için Artım {0} 0 olamaz
@@ -3365,8 +3371,8 @@
 DocType: Holiday List,Weekly Off,Haftalık İzin
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Örneğin 2012 için, 2012-13"
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Örneğin 2012 için, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Geçici Kar / Zarar (Kredi)
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Geçici Kar / Zarar (Kredi)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Geçici Kar / Zarar (Kredi)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Geçici Kar / Zarar (Kredi)
 DocType: Sales Invoice,Return Against Sales Invoice,Karşı Satış Fatura Dönüş
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Madde 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Şirket varsayılan değeri {0} set Lütfen {1}
@@ -3402,6 +3408,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Alt öğe ekle
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rol Dondurulmuş Hesaplar ve Düzenleme Dondurulmuş Girişleri Set İzin
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Çocuk nodları olduğundan Maliyet Merkezi ana deftere dönüştürülemez
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,açılış Değeri
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Seri #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Satış Komisyonu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Satış Komisyonu
@@ -3446,7 +3453,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Tarihinde gibi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Deneme Süresi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Deneme Süresi
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Standart Depo stok Ürünleri için zorunludur.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Ay {0} ve yıl {1} için maaş ödemesi
 DocType: Stock Settings,Auto insert Price List rate if missing,Otomatik ekleme Fiyat Listesi oranı eksik ise
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Toplam Ödenen Tutar
@@ -3487,7 +3493,7 @@
 DocType: Payment Tool,Set Matching Amounts,Set Eşleştirme tutarlar
 DocType: Purchase Invoice,Taxes and Charges Added,Eklenen Vergi ve Harçlar
 ,Sales Funnel,Satış Yolu
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Kısaltma zorunludur
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Kısaltma zorunludur
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Güncellemeler için abone olduğunuzdan dolayı teşekkür ederiz
 ,Qty to Transfer,Transfer edilecek Miktar
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Müşterilere veya Taleplere verilen fiyatlar.
@@ -3518,7 +3524,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} durduruldu
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Barkod {0} zaten Ürün {1} de kullanılmış
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Yaklaşan Etkinlikler
@@ -3546,8 +3552,8 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Mali Yıl Seçin ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS Profil POS Girişi yapmak için gerekli
 DocType: Hub Settings,Name Token,İsim Jetonu
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Standart Satış
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Standart Satış
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Standart Satış
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Standart Satış
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,En az bir depo zorunludur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,En az bir depo zorunludur
 DocType: Serial No,Out of Warranty,Garanti Dışı
@@ -3696,7 +3702,7 @@
 DocType: Sales Invoice,Paid Amount,Ödenen Tutar
 ,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"
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Bakiye borçlu durumdaysa alacaklı duruma çevrilemez.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Kalite Yönetimi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Kalite Yönetimi
@@ -3822,7 +3828,7 @@
 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 +19,Shortage Qty,Yetersizlik adeti
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Ürün çeşidi {0} aynı özelliklere sahip bulunmaktadır
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,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/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Tarihine Kadar' gereklidir
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Paketleri teslim edilmek üzere fişleri ambalaj oluşturun. Paket numarası, paket içeriğini ve ağırlığını bildirmek için kullanılır."
@@ -3834,7 +3840,7 @@
 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 +749,It is needed to fetch Item Details.,Bu Ürün Detayları getirmesi için gereklidir.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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
@@ -3865,6 +3871,8 @@
 DocType: BOM,Manufacturing User,Üretim Kullanıcı
 DocType: Purchase Order,Raw Materials Supplied,Tedarik edilen Hammaddeler
 DocType: Purchase Invoice,Recurring Print Format,Tekrarlayan Baskı Biçimi
+DocType: C-Form,Series,Seriler
+DocType: C-Form,Series,Seriler
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,Beklenen Teslim Tarihi Siparii Tarihinden önce olamaz
 DocType: Appraisal,Appraisal Template,Değerlendirme Şablonu
 DocType: Item Group,Item Classification,Ürün Sınıflandırması
@@ -3964,7 +3972,7 @@
 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 +434,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 +420,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."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Satınalma Usta Müdürü
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Üretim Siparişi {0} verilmelidir
@@ -3974,7 +3982,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Tarihine kadar kısmı tarihinden itibaren kısmından önce olamaz
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc Doctype
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Fiyatları Ekle / Düzenle
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Siparişlerim
@@ -4034,7 +4042,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Satır # {0}: öğe için Set Tedarikçi {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Öğe {1} bağlı Web Sitesi Resmi {0} bulunamıyor
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Öğe {1} bağlı Web Sitesi Resmi {0} bulunamıyor
 DocType: Issue,Content Type,İçerik Türü
 DocType: Issue,Content Type,İçerik Türü
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Bilgisayar
@@ -4052,7 +4060,7 @@
 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 +357,'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 +351,'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ığı
@@ -4086,7 +4094,7 @@
 DocType: Authorization Rule,Based On,Göre
 DocType: Sales Order Item,Ordered Qty,Sipariş Miktarı
 DocType: Sales Order Item,Ordered Qty,Sipariş Miktarı
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Öğe {0} devre dışı
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Öğe {0} devre dışı
 DocType: Stock Settings,Stock Frozen Upto,Stok Dondurulmuş
 apps/erpnext/erpnext/controllers/recurring_document.py +168,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.
@@ -4094,7 +4102,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Eğer Uygulanabilir {0} olarak seçilirse, alım kontrol edilmelidir."
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,İndirim 100'den az olmalıdır
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Tutar Off yazın (Şirket Para)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Satır # {0}: yeniden sipariş miktarını ayarlamak Lütfen
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Satır # {0}: yeniden sipariş miktarını ayarlamak Lütfen
 DocType: Landed Cost Voucher,Landed Cost Voucher,Indi Maliyet Çeki
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Lütfen {0} ayarlayınız
 DocType: Purchase Invoice,Repeat on Day of Month,Ayın gününde tekrarlayın
@@ -4184,8 +4192,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Şimdi görüntüle
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Otomatik olarak fatura oluşturulacak dönemi seçin
 DocType: BOM,Raw Material Cost,Hammadde Maliyeti
-DocType: Item,Re-Order Level,Yeniden sipariş seviyesi
-DocType: Item,Re-Order Level,Yeniden Sipariş Seviyesi
+DocType: Item Reorder,Re-Order Level,Yeniden sipariş seviyesi
+DocType: Item Reorder,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.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Yarı Zamanlı
 DocType: Employee,Applicable Holiday List,Uygulanabilir Tatil Listesi
@@ -4251,7 +4259,7 @@
 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 +573,Please specify Attribute Value for attribute {0},Öznitelik için değeri Özellik belirtiniz {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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)
@@ -4345,7 +4353,7 @@
 DocType: Address,Office,Ofis
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Muhasebe günlük girişleri.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Depo itibaren Boş Adet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,İlk Çalışan Kaydı seçiniz.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,İlk Çalışan Kaydı seçiniz.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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
@@ -4434,7 +4442,7 @@
 DocType: Item Attribute,Numeric Values,Sayısal Değerler
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Logo Ekleyin
 DocType: Customer,Commission Rate,Komisyon Oranı
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Variant olun
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Variant olun
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Departman tarafından blok aralığı uygulamaları.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Sepet Boş
 DocType: Production Order,Actual Operating Cost,Gerçek İşletme Maliyeti
@@ -4454,17 +4462,16 @@
 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 +380,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 +419,"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 +408,"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 +380, (Half Day),(Yarım Gün)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,BOM dan Ürünleri alın
diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv
index 90bff38..34a87e6 100644
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,Оголошений%
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),"Обмінний курс повинен бути такий же, як {0} {1} ({2})"
 DocType: Sales Invoice,Customer Name,Ім&#39;я клієнта
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Банківський рахунок не може бути названий {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Банківський рахунок не може бути названий {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Видатний {0} не може бути менше нуля ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Новий Залишити заявку
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Новий Залишити заявку
 apps/erpnext/erpnext/setup/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,Режим розрахунковий рахунок
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Журнал діяльності здійснюється користувачами проти Завдання, які можуть бути використані для відстеження часу, виставлення рахунків."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Новий {0}: # {1}
 ,Sales Partners Commission,Партнери по збуту комісія
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,"Абревіатура не може бути більше, ніж 5 символів"
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,"Абревіатура не може бути більше, ніж 5 символів"
 DocType: Payment Request,Payment Request,Оплата Запит
 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.",Атрибут Значення {0} не може бути вилучена з {1} як пункту Варіанти \ існують з цим атрибутом.
@@ -195,6 +195,7 @@
 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 (%),Знижка на Прайс-лист ставка (%)
 DocType: Offer Letter,Select Terms and Conditions,Виберіть Терміни та умови
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,ауту
 DocType: Production Planning Tool,Sales Orders,Замовлення
 DocType: Purchase Taxes and Charges,Valuation,Оцінка
 ,Purchase Order Trends,Замовити тенденції Купівля
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Телебачення
 DocType: Production Order Operation,Updated via 'Time Log',Оновлене допомогою &#39;Час Вхід &quot;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Рахунок {0} не належать компанії {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},"Попередня сума не може бути більше, ніж {0} {1}"
 DocType: Naming Series,Series List for this Transaction,Список серії для даної транзакції
 DocType: Sales Invoice,Is Opening Entry,Відкриває запис
 DocType: Customer Group,Mention if non-standard receivable account applicable,Згадка якщо нестандартна заборгованість рахунок застосовно
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Створює зарплати ковзання для згаданих вище критеріїв.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Не введене опис
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Запит на покупку.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Тільки вибраний Залишити затверджує може представити цей Залишити заявку
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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&gt; Установки&gt; іменування серії"
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Склад {0} не належить компанії {1}
 DocType: Item Website Specification,Item Website Specification,Пункт Сайт Специфікація
 DocType: Payment Tool,Reference No,Посилання Немає
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Залишити Заблоковані
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},Пункт {0} досяг кінець життя на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,Залишити Заблоковані
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Пункт {0} досяг кінець життя на {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Річний
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Фото Примирення товару
 DocType: Stock Entry,Sales Invoice No,Видаткова накладна Немає
@@ -248,7 +250,7 @@
 DocType: Pricing Rule,Supplier Type,Постачальник Тип
 DocType: Item,Publish in Hub,Опублікувати в Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,Пункт {0} скасовується
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Пункт {0} скасовується
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Матеріал Запит
 DocType: Bank Reconciliation,Update Clearance Date,Оновлення оформлення Дата
 DocType: Item,Purchase Details,Купівля Деталі
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Накладна
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Налаштування Податки
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата запис була змінена після витягнув його. Ласка, витягнути його знову."
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} введений двічі на п податку
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,"Ласка, виберіть місяць та рік"
@@ -327,7 +329,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Ваша електронна адреса
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,"Будь ласка, див вкладення"
 DocType: Purchase Order,% Received,Отримане%
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Налаштування Вже Повний !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Налаштування Вже Повний !!
 ,Finished Goods,Готові вироби
 DocType: Delivery Note,Instructions,Інструкції
 DocType: Quality Inspection,Inspected By,Перевірено
@@ -352,14 +354,13 @@
 ,Purchase Register,Купівля Реєстрація
 DocType: Landed Cost Item,Applicable Charges,Застосовувані Збори
 DocType: Workstation,Consumable Cost,Вартість витратних
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) повинен мати роль &quot;Залишити затверджує&quot;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) повинен мати роль &quot;Залишити затверджує&quot;
 DocType: Purchase Receipt,Vehicle Date,Дата
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Медична
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина втрати
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Робоча станція закрита в наступні терміни відповідно курортні Список: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Можливості
 DocType: Employee,Single,Одиночний
-DocType: Issue,Attachment,Прихильність
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Бюджет не може бути встановлений для групи МВЗ
 DocType: Account,Cost of Goods Sold,Вартість проданих товарів
 DocType: Purchase Invoice,Yearly,Річний
@@ -388,7 +389,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} вибрано кілька разів в таблиці атрибутів
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} вибрано кілька разів в таблиці атрибутів
 DocType: HR Settings,Employee record is created using selected field. ,Співробітник запис створено за допомогою обраного поля.
 DocType: Sales Order,Not Applicable,Не застосовується
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Майстер відпочинку.
@@ -427,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Косметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items","Щоб об&#39;єднати, наступні властивості повинні бути однаковими для обох пунктів"
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Щоб об&#39;єднати, наступні властивості повинні бути однаковими для обох пунктів"
 DocType: Shipping Rule,Net Weight,Вага нетто
 DocType: Employee,Emergency Phone,Аварійний телефон
 ,Serial No Warranty Expiry,Серійний Немає Гарантія Термін
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Управління субпідряду
 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,"Швидкість, з якою Прайс-лист валюта конвертується в базову валюту компанії"
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Рахунок {0} не належить компанії: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Рахунок {0} не належить компанії: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Абревіатура вже використовується для іншої компанії
 DocType: Selling Settings,Default Customer Group,За замовчуванням Група клієнтів
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Якщо відключити, &quot;округляється Всього &#39;полі не буде видна в будь-якій угоді"
 DocType: BOM,Operating Cost,Експлуатаційні витрати
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Записи не знайдені в таблиці рахунків
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Будь ласка, виберіть компаній і партії першого типу"
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Фінансова / звітний рік.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,накопичені значення
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","На жаль, послідовний пп не можуть бути об&#39;єднані"
 DocType: Project Task,Project Task,Проект Завдання
 ,Lead Id,Ведучий Id
@@ -492,7 +495,7 @@
 DocType: Quotation,Quotation To,Цитата Для
 DocType: Lead,Middle Income,Середній дохід
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Відкриття (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"За замовчуванням Одиниця виміру для п {0} не може бути змінений безпосередньо, тому що ви вже зробили деякі угоди (угод) з іншим UOM. Вам потрібно буде створити новий пункт для використання іншого замовчуванням одиниця виміру."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"За замовчуванням Одиниця виміру для п {0} не може бути змінений безпосередньо, тому що ви вже зробили деякі угоди (угод) з іншим UOM. Вам потрібно буде створити новий пункт для використання іншого замовчуванням одиниця виміру."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Позначена сума не може бути негативним
 DocType: Purchase Order Item,Billed Amt,Оголошений Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Логічний склад, на якому акції записів зроблені."
@@ -570,7 +573,7 @@
 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 +543,Item has variants.,Пункт має варіанти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,Дерево Тип
@@ -583,6 +586,7 @@
 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 +33,Goods received from Suppliers.,"Товари, отримані від постачальників."
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,У полі Значення
 DocType: Lead,Campaign Name,Назва кампанії
 ,Reserved,Зарезервований
 DocType: Purchase Order,Supply Raw Materials,Постачання сировини
@@ -597,16 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Рахунок з існуючою транзакції не можуть бути перетворені в бухгалтерській книзі
 DocType: Delivery Note,Customer's Purchase Order No,Клієнтам Замовлення Немає
 DocType: Employee,Cell Number,Кількість стільникових
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,"Запити Авто матеріал, отриманий"
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,"Запити Авто матеріал, отриманий"
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Втрачений
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Ви не можете ввести поточний ваучер в «Проти Запис у журналі &#39;колонці
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Енергія
 DocType: Opportunity,Opportunity From,Можливість Від
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Щомісячна виписка зарплата.
 DocType: Item Group,Website Specifications,Сайт характеристики
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Існує помилка в адресному Шаблон {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Новий акаунт
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: З {0} типу {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коефіцієнт перетворення є обов&#39;язковим
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Кілька Ціна Правила існує з тими ж критеріями, будь ласка вирішити конфлікт шляхом присвоєння пріоритету. Ціна Правила: {0}"
 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.,Бухгалтерські записи можна з листовими вузлами. Записи проти груп не допускається.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете деактивувати або скасувати специфікації, як вона пов&#39;язана з іншими специфікаціями"
 DocType: Opportunity,Maintenance,Технічне обслуговування
@@ -649,7 +655,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,Ціни не обраний
 DocType: Employee,Family Background,Сімейні обставини
 DocType: Process Payroll,Send Email,Відправити лист
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Увага: Невірний Додаток {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Увага: Невірний Додаток {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Немає доступу
 DocType: Company,Default Bank Account,За замовчуванням Банківський рахунок
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Щоб відфільтрувати на основі партії, виберіть партія першого типу"
@@ -679,13 +685,13 @@
 DocType: Production Planning Tool,Select Items,Оберіть товари
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} проти Білла {1} від {2}
 DocType: Maintenance Visit,Completion Status,Статус завершення
-DocType: Sales Invoice Item,Target Warehouse,Цільова Склад
+DocType: Production Order,Target Warehouse,Цільова Склад
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволити доставку по квитанції або Шифрування до цього відсотка
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,"Очікувана дата поставки не може бути, перш ніж Sales Order Дата"
 DocType: Upload Attendance,Import Attendance,Імпорт Відвідуваність
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Всі Групи товарів
 DocType: Process Payroll,Activity Log,Журнал активності
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Чистий прибуток / збиток
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Чистий прибуток / збиток
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматично написати повідомлення за поданням угод.
 DocType: Production Order,Item To Manufacture,Елемент Виробництво
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статус {2}
@@ -693,7 +699,7 @@
 DocType: Sales Order Item,Projected Qty,Прогнозований Кількість
 DocType: Sales Invoice,Payment Due Date,Дата платежу
 DocType: Newsletter,Newsletter Manager,Розсилка менеджер
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Пункт Варіант {0} вже існує ж атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Пункт Варіант {0} вже існує ж атрибутами
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Відкриття&quot;
 DocType: Notification Control,Delivery Note Message,Доставка Примітка Повідомлення
 DocType: Expense Claim,Expenses,Витрати
@@ -703,7 +709,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Дослідження і розвиток
 ,Amount to Bill,Сума Білла
 DocType: Company,Registration Details,Реєстраційні дані
-DocType: Item,Re-Order Qty,Re-Order Кіл
+DocType: Item Reorder,Re-Order Qty,Re-Order Кіл
 DocType: Leave Block List Date,Leave Block List Date,Залишити Чорний список Реєстрація
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Планується відправити {0}
 DocType: Pricing Rule,Price or Discount,Ціна зі знижкою або
@@ -746,7 +752,7 @@
 DocType: Bank Reconciliation,Total Amount,Загальна кількість
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Інтернет видання
 DocType: Production Planning Tool,Production Orders,Виробничі замовлення
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Валюта балансу
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Валюта балансу
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Продажі Прайс-лист
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Опублікувати синхронізувати елементи
 DocType: Bank Reconciliation,Account Currency,Валюта рахунку
@@ -755,7 +761,7 @@
 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 +538,Item Variants {0} updated,Пункт Варіанти {0} оновлюються
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,Пункт Варіанти {0} оновлюються
 DocType: Quality Inspection Reading,Reading 6,Читання 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Рахунок покупки Advance
 DocType: Address,Shop,Магазин
@@ -832,7 +838,7 @@
 DocType: POS Profile,Cash/Bank Account,Готівковий / Банківський рахунок
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Вилучені пункти без зміни в кількості або вартості.
 DocType: Delivery Note,Delivery To,Доставка Для
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,Атрибут стіл є обов&#39;язковим
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,Attribute table is mandatory,Атрибут стіл є обов&#39;язковим
 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/public/js/pos/pos.html +28,Discount,Знижка
@@ -860,7 +866,7 @@
 DocType: Tax Rule,Shipping State,Державний Доставка
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Товар повинен бути додані за допомогою &quot;Отримати товари від покупки розписок&quot; кнопки
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Продажі Витрати
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Стандартний Купівля
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Стандартний Купівля
 DocType: GL Entry,Against,Проти
 DocType: Item,Default Selling Cost Center,За замовчуванням Продаж МВЗ
 DocType: Sales Partner,Implementation Partner,Реалізація Партнер
@@ -902,7 +908,7 @@
 DocType: Sales Partner,Distributor,Дистриб&#39;ютор
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Кошик Правило Доставка
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,Виробничий замовлення {0} має бути скасований до скасування цього замовлення клієнта
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',"Будь ласка, встановіть &quot;Застосувати Додаткова Знижка On &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',"Будь ласка, встановіть &quot;Застосувати Додаткова Знижка On &#39;"
 ,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.,Виберіть час і журнали Розмістити створити нову рахунок-фактуру.
@@ -970,9 +976,9 @@
 DocType: Contact,User ID,ідентифікатор користувача
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Подивитися Леджер
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Найперша
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Група існує з таким же ім&#39;ям, будь ласка, змініть ім&#39;я пункту або перейменувати групу товарів"
+apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Група існує з таким же ім&#39;ям, будь ласка, змініть ім&#39;я пункту або перейменувати групу товарів"
 DocType: Production Order,Manufacture against Sales Order,Виробництво проти замовлення клієнта
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Решта світу
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,Повна Платне
@@ -1002,7 +1008,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","На жаль, компанії не можуть бути об&#39;єднані"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","На жаль, компанії не можуть бути об&#39;єднані"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Невеликий
 DocType: Employee,Employee Number,Кількість працівників
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Справа Ні (и) вже використовується. Спробуйте зі справи № {0}
@@ -1021,7 +1027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Сільське господарство
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Ваші продукти або послуги
 DocType: Mode of Payment,Mode of Payment,Спосіб платежу
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Сайт зображення повинно бути суспільне файл або адресу веб-сайту
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Сайт зображення повинно бути суспільне файл або адресу веб-сайту
 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,Склад Контактна інформація
@@ -1093,6 +1099,7 @@
 DocType: Address,Utilities,Комунальні послуги
 DocType: Purchase Invoice Item,Accounting,Облік
 DocType: Features Setup,Features Setup,Особливості установки
+DocType: Item,Is Service Item,Є служба товару
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Термін подачі заяв не може бути період розподілу межами відпустку
 DocType: Activity Cost,Projects,Проектів
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Будь ласка, виберіть фінансовий рік"
@@ -1123,7 +1130,7 @@
 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 +465,cannot be greater than 100,не може бути більше ніж 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Пункт {0} не є акціонерним товару
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Пункт {0} не є акціонерним товару
 DocType: Maintenance Visit,Unscheduled,Позапланові
 DocType: Employee,Owned,Бувший
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Залежить у відпустці без
@@ -1182,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Уряд
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Предмет Варіанти
 DocType: Company,Services,Послуги
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Всього ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Всього ({0})
 DocType: Cost Center,Parent Cost Center,Батько Центр Вартість
 DocType: Sales Invoice,Source,Джерело
 DocType: Leave Type,Is Leave Without Pay,Є відпустці без
@@ -1255,17 +1262,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Повторно оплати на e-mail
 DocType: Dependent Task,Dependent Task,Залежить Завдання
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},"Залишити типу {0} не може бути більше, ніж {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,Споживана Сума
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,Перегляд {0}
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Чиста зміна грошових коштів
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Чиста зміна грошових коштів
 DocType: Salary Structure Deduction,Salary Structure Deduction,Зарплата Структура Відрахування
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Одиниця виміру {0} був введений більш ніж один раз в таблицю перетворення фактора
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Одиниця виміру {0} був введений більш ніж один раз в таблицю перетворення фактора
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Оплата Запит вже існує {0}
 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 +182,Quantity must not be more than {0},"Кількість не повинна бути більше, ніж {0}"
@@ -1327,7 +1334,7 @@
 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),На склад (Необов&#39;язково)
+DocType: Packed Item,To Warehouse (Optional),На склад (Необов&#39;язково)
 DocType: Sales Invoice,Paid Amount (Company Currency),Платні Сума (Компанія валют)
 DocType: Purchase Invoice,Additional Discount,Додаткова знижка
 DocType: Selling Settings,Selling Settings,Продаж Налаштування
@@ -1336,7 +1343,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Компанія, місяць і фінансовий рік є обов&#39;язковим"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Маркетингові витрати
 ,Item Shortage Report,Пункт Брак Повідомити
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вага згадується, \ nБудь ласка, кажучи &quot;Вага Одиниця виміру&quot; занадто"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вага згадується, \ nБудь ласка, кажучи &quot;Вага Одиниця виміру&quot; занадто"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,"Матеріал Запит використовується, щоб зробити цей запис зі"
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Одномісний блок елемента.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Час входу Пакетне {0} повинен бути «Передано»
@@ -1347,6 +1354,7 @@
 DocType: Employee,Date Of Retirement,Дата вибуття
 DocType: Upload Attendance,Get Template,Отримати шаблон
 DocType: Address,Postal,Поштовий
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,Налаштування ERPNext завершена!
 DocType: Item,Weightage,Weightage
 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,"А Група клієнтів існує з таким же ім&#39;ям, будь ласка, змініть ім&#39;я клієнта або перейменувати групу клієнтів"
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,"Будь ласка, виберіть {0} перший."
@@ -1375,12 +1383,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Забагато стовбців. Експорт звіту і роздрукувати його за допомогою програми електронної таблиці.
 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 +139,Main,Головна
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Головна
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Варіант
 DocType: Naming Series,Set prefix for numbering series on your transactions,Встановіть префікс нумерації серії на ваших угод
 DocType: Employee Attendance Tool,Employees HTML,співробітники HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,"Зупинився замовлення не може бути скасований. Відкорковувати, щоб скасувати."
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,За замовчуванням BOM ({0}) повинен бути активним для даного елемента або в шаблоні
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,Можливість поле Від обов&#39;язкове
 DocType: Item,Variants,Варіанти
@@ -1405,7 +1413,6 @@
 DocType: Sales Order,To Deliver and Bill,Щоб доставити і Білл
 DocType: GL Entry,Credit Amount in Account Currency,Сума кредиту у валюті рахунку
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Журнали Час для виготовлення.
-DocType: Item,Apply Warehouse-wise Reorder Level,Застосувати Склад-мудрий Reorder рівень
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,Специфікація {0} повинен бути представлений
 DocType: Authorization Control,Authorization Control,Контроль Авторизація
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ряд # {0}: Відхилено Склад є обов&#39;язковим відносно відхилив Пункт {1}
@@ -1503,6 +1510,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Ряд # {0}: Операція {1} не завершені {2} Кількість готової продукції у виробництві Наказ № {3}. Будь ласка, поновіть статус роботи за допомогою журналів Time"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Інвестиції
 DocType: Issue,Resolution Details,Дозвіл Подробиці
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,асигнування
 DocType: Quality Inspection Reading,Acceptance Criteria,Критерії приймання
 DocType: Item Attribute,Attribute Name,Ім&#39;я атрибута
 DocType: Item Group,Show In Website,Показати на веб-сайті
@@ -1553,7 +1561,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,Витрати Заявити очікує схвалення. Тільки за рахунок затверджує можете оновити статус.
 DocType: Purchase Invoice,Additional Discount Amount,Додаткова знижка Сума
 DocType: Leave Block List Allow,Leave Block List Allow,Залишити Чорний список Дозволити
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Абревіатура не може бути порожнім або простір
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Абревіатура не може бути порожнім або простір
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Група не-групи
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спортивний
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Загальний фактичний
@@ -1594,7 +1602,7 @@
 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**.,** Фінансовий рік ** являє собою фінансовий рік. Всі бухгалтерські та інші великі угоди відслідковуються проти ** ** фінансовий рік.
 DocType: Opportunity,Customer / Lead Address,Замовник / Провідний Адреса
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Увага: Невірний сертифікат SSL на прихильності {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Увага: Невірний сертифікат SSL на прихильності {0}
 DocType: Production Order Operation,Actual Operation Time,Фактична Час роботи
 DocType: Authorization Rule,Applicable To (User),Застосовується до (Користувач)
 DocType: Purchase Taxes and Charges,Deduct,Відняти
@@ -1743,7 +1751,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Справа № не може бути 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,"Якщо у вас є команда, і продаж з продажу Партнери (Channel Partners), вони можуть бути помічені і підтримувати їх внесок у збутової діяльності"
 DocType: Item,Show a slideshow at the top of the page,Показати слайд-шоу у верхній частині сторінки
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Магазини
+DocType: Item,"Allow in Sales Order of type ""Service""",Дозволити в замовлення клієнта типу &quot;послуг&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Магазини
 DocType: Time Log,Projects Manager,Менеджер проектів
 DocType: Serial No,Delivery Time,Час доставки
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,На підставі проблем старіння
@@ -1768,7 +1777,7 @@
 ,Financial Analytics,Фінансова аналітика
 DocType: Quality Inspection,Verified By,Перевірено
 DocType: Address,Subsidiary,Дочірня компанія
-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.","Неможливо змінити валюту за замовчуванням компанії, тому що є існуючі угоди. Угоди повинні бути скасовані, щоб поміняти валюту за замовчуванням."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Неможливо змінити валюту за замовчуванням компанії, тому що є існуючі угоди. Угоди повинні бути скасовані, щоб поміняти валюту за замовчуванням."
 DocType: Quality Inspection,Purchase Receipt No,Купівля Отримання Немає
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Аванс-завдаток
 DocType: Process Payroll,Create Salary Slip,Створити зарплата Сліп
@@ -1816,7 +1825,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Сировина не може бути порожнім.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Не вдалося оновити запас, рахунок-фактура містить падіння пункт доставки."
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'","Як є існуючі біржові операції по цьому пункту, \ ви не можете змінити значення &#39;Має серійний номер &quot;,&quot; Має Batch Ні »,« Чи є зі Пункт &quot;і&quot; Оцінка Метод &quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Швидкий журнал запис
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Ви не можете змінити ставку, якщо специфікації згадується agianst будь-якого елементу"
@@ -1905,7 +1914,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,"Будь ласка, в першу чергу поставки Примітка"
 DocType: Purchase Invoice,Currency and Price List,Валюта і Ціни
 DocType: Opportunity,Customer / Lead Name,Замовник / Провідний Ім&#39;я
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Зазор Дата не згадується
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Зазор Дата не згадується
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Виробництво
 DocType: Item,Allow Production Order,Дозволити виробничого замовлення
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Ряд {0}: Дата початку повинна бути раніше дати закінчення
@@ -1915,7 +1924,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,Всього Заробіток
 DocType: Purchase Receipt,Time at which materials were received,"Час, в якому були отримані матеріали"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,Мої Адреси
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Мої Адреси
 DocType: Stock Ledger Entry,Outgoing Rate,Вихідні Оцінити
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Організація філії господар.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,або
@@ -1984,7 +1993,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Управління груповою клієнтів дерево.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Новий Центр Вартість Ім&#39;я
 DocType: Leave Control Panel,Leave Control Panel,Залишити Панель управління
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"Немає за замовчуванням Адреса Шаблон не знайдене. Будь ласка, створіть новий з Setup&gt; Друк і брендингу&gt; Адреса шаблон."
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"Немає за замовчуванням Адреса Шаблон не знайдене. Будь ласка, створіть новий з Setup&gt; Друк і брендингу&gt; Адреса шаблон."
 DocType: Appraisal,HR User,HR Користувач
 DocType: Purchase Invoice,Taxes and Charges Deducted,"Податки та відрахування,"
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Питань
@@ -2001,7 +2010,7 @@
 ,Sales Browser,Браузер з продажу
 DocType: Journal Entry,Total Credit,Всього Кредитна
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Увага: Ще {0} # {1} існує проти вступу фондовій {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Місцевий
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Великий
@@ -2020,7 +2029,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Всі Продажі Угоди можуть бути помічені проти кількох ** ** продажів осіб, так що ви можете встановити і контролювати цілі."
 ,S.O. No.,КО №
 DocType: Production Order Operation,Make Time Log,Зробити часу Вхід
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,"Будь ласка, встановіть кількість тональний"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},"Будь ласка, створіть клієнт зі свинцю {0}"
 DocType: Price List,Applicable for Countries,Стосується для країн
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Комп&#39;ютери
@@ -2095,7 +2103,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Одержати відповідні записи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Облік Вхід для запасі
 DocType: Sales Invoice,Sales Team1,Команда1 продажів
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Пункт {0} не існує
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Пункт {0} не існує
 DocType: Sales Invoice,Customer Address,Замовник Адреса
 DocType: Payment Request,Recipient and Message,Одержувач і повідомлення
 DocType: Purchase Invoice,Apply Additional Discount On,Застосувати Додаткова знижка на
@@ -2137,7 +2145,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Оцінка Оцініть
 apps/erpnext/erpnext/stock/get_item_details.py +274,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}, не існує в таблиці вище &quot;Купити&quot; НАДХОДЖЕННЯ"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,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 +155,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,Перейменувати Вхід
@@ -2175,7 +2183,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Будь ласка, введіть дату зняття."
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Тільки Залиште додатків зі статусом «Схвалено&quot; можуть бути представлені
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Адреса Назва є обов&#39;язковим.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Адреса Назва є обов&#39;язковим.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Введіть ім&#39;я кампанії, якщо джерелом є кампанія запит"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Газетних видавців
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Виберіть фінансовий рік
@@ -2199,6 +2207,7 @@
 DocType: UOM,Must be Whole Number,Повинно бути ціле число
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нові листя Виділені (у днях)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Серійний номер {0} не існує
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Склад Клієнт (Необов&#39;язково)
 DocType: Pricing Rule,Discount Percentage,Знижка у відсотках
 DocType: Payment Reconciliation Invoice,Invoice Number,Номер накладної
 apps/erpnext/erpnext/hooks.py +55,Orders,Замовлення
@@ -2308,7 +2317,7 @@
 DocType: Appraisal,Appraisal,Оцінка
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Дата повторюється
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,"Особа, яка має право підпису"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},Залишити затверджує повинен бути одним з {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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,7 +2486,7 @@
 DocType: BOM Replace Tool,BOM Replace Tool,Специфікація Замінити інструмент
 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 +733,Show tax break-up,Показати податок розпад
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Показати податок розпад
 apps/erpnext/erpnext/accounts/party.py +283,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',Якщо ви залучати у виробничій діяльності. Дозволяє товару &quot;виробляється&quot;
@@ -2510,6 +2519,8 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +216,{0} '{1}' is disabled,{0} {1} &#39;відключений
 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/doctype/stock_entry/stock_entry.py +231,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+					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: Sales Team,Contribution (%),Внесок (%)
@@ -2524,7 +2535,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,"Будь ласка, повторіть введення назва компанії, щоб підтвердити"
@@ -2551,8 +2562,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Посилання № є обов&#39;язковим, якщо ви увійшли Reference Дата"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,"Дата вступу повинні бути більше, ніж Дата народження"
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Зарплата Структура
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Кілька Ціна Правило існує з тими ж критеріями ,, будь ласка, вирішити \ конфлікту віддаючи пріоритет. Ціна Правила: {0}"
 DocType: Account,Bank,Банк
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авіакомпанія
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Матеріал Випуск
@@ -2577,7 +2586,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Цінні папери та бірж
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"За замовчуванням Одиниця виміру для варіанту &#39;{0}&#39; має бути такою ж, як в шаблоні &quot;{1} &#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"За замовчуванням Одиниця виміру для варіанту &#39;{0}&#39; має бути такою ж, як в шаблоні &quot;{1} &#39;"
 DocType: Shipping Rule,Calculate Based On,"Розрахувати, засновані на"
 DocType: Delivery Note Item,From Warehouse,Від Склад
 DocType: Purchase Taxes and Charges,Valuation and Total,Оцінка і Загальна
@@ -2586,7 +2595,7 @@
 DocType: Account,Purchase User,Купівля користувача
 DocType: Notification Control,Customize the Notification,Налаштувати повідомлення
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Потік грошових коштів від операцій
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,За замовчуванням Адреса Шаблон не може бути видалений
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,За замовчуванням Адреса Шаблон не може бути видалений
 DocType: Sales Invoice,Shipping Rule,Правило Доставка
 DocType: Manufacturer,Limited to 12 characters,Обмежено до 12 символів
 DocType: Journal Entry,Print Heading,Роздрукувати товарної позиції
@@ -2679,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,Дані проекту мудрий не доступні для цитати
 DocType: Project,Expected End Date,Очікувана Дата закінчення
 DocType: Appraisal Template,Appraisal Template Title,Оцінка шаблону Назва
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,Комерційна
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Високий Послуги
@@ -2698,7 +2707,7 @@
 DocType: Customer,Default Receivable Accounts,За замовчуванням заборгованість Дебіторська
 DocType: Tax Rule,Billing State,Державний рахунків
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Переклад
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Fetch розібраному специфікації (у тому числі вузлів)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),Fetch розібраному специфікації (у тому числі вузлів)
 DocType: Authorization Rule,Applicable To (Employee),Застосовується до (Співробітник)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,Завдяки Дата є обов&#39;язковим
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Приріст за атрибут {0} не може бути 0
@@ -2731,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Негативний Оцінка Оцініть не допускається
 DocType: Holiday List,Weekly Off,Щотижневий Викл
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Для наприклад 2012, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Попередня прибуток / збиток (кредит)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Попередня прибуток / збиток (кредит)
 DocType: Sales Invoice,Return Against Sales Invoice,Повернутися проти накладна
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Пункт 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},"Будь ласка, встановіть значення за замовчуванням {0} в Компанії {1}"
@@ -2762,6 +2771,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Додати Дитину
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Роль тварин у зазначений заморожені рахунки &amp; Редагувати заморожені Записи
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Неможливо перетворити МВЗ книзі, як це має дочірні вузли"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,значення відкриття
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Серійний #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Комісія з продажу
 DocType: Offer Letter Term,Value / Description,Значення / Опис
@@ -2795,7 +2805,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,"Успішно видалений всі угоди, пов&#39;язані з цією компанією!"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Станом на Дата
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Випробувальний термін
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,За замовчуванням Склад є обов&#39;язковим для фондового Пункт.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Виплата заробітної плати за місяць {0} і рік {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Авто вставка Швидкість Ціни, якщо не вистачає"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Всього сплачена сума
@@ -2831,7 +2840,7 @@
 DocType: Payment Tool,Set Matching Amounts,Відповідні суми вказано
 DocType: Purchase Invoice,Taxes and Charges Added,Податки і збори Додав
 ,Sales Funnel,Воронка продажів
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Абревіатура є обов&#39;язковим
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Абревіатура є обов&#39;язковим
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Спасибі за ваш інтерес до підписки на поновлення
 ,Qty to Transfer,Кількість для передачі
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Котирування на постачанні або клієнтів.
@@ -2859,6 +2868,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,Постачальник цитати
 DocType: Quotation,In Words will be visible once you save the Quotation.,"За словами будуть видні, як тільки ви збережете цитати."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} зупинений
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,Майбутні події
@@ -2880,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Виберіть фінансовий рік ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,"POS-профілю потрібно, щоб зробити запис POS"
 DocType: Hub Settings,Name Token,Ім&#39;я маркера
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Стандартний Продаж
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Стандартний Продаж
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Принаймні одне склад є обов&#39;язковим
 DocType: Serial No,Out of Warranty,З гарантії
 DocType: BOM Replace Tool,Replace,Замінювати
@@ -3003,7 +3013,7 @@
 DocType: Sales Invoice,Paid Amount,Виплачена сума
 ,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,"Установка цього Адреса шаблон за замовчуванням, оскільки немає ніякого іншого замовчуванням"
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,"Установка цього Адреса шаблон за замовчуванням, оскільки немає ніякого іншого замовчуванням"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс рахунку в дебет вже, ви не можете встановити &quot;баланс повинен бути&quot;, як &quot;Кредит»"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Управління якістю
 DocType: Production Planning Tool,Filter based on customer,Фільтр на основі клієнта
@@ -3104,7 +3114,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Щоб встановити цей фінансовий рік, за замовчуванням, натисніть на кнопку &quot;Встановити за замовчуванням&quot;"
 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 +19,Shortage Qty,Брак Кількість
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Стан варіант {0} існує з тими ж атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Стан варіант {0} існує з тими ж атрибутами
 DocType: Salary Slip,Salary Slip,Зарплата ковзання
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Для Дата&quot; потрібно
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Створення пакувальні листи для упаковки повинні бути доставлені. Використовується для повідомлення номер пакету, вміст пакету і його вага."
@@ -3115,7 +3125,7 @@
 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.","Коли будь-який з перевірених угод &quot;Передано&quot;, електронною поштою спливаюче автоматично відкривається, щоб відправити лист у відповідний &quot;Контакт&quot; в цій транзакції, з угоди ролі вкладення. Користувач може або не може відправити по електронній пошті."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Глобальні налаштування
 DocType: Employee Education,Employee Education,Співробітник Освіта
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,Він необхідний для вилучення Подробиці Елементу.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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} вже отримав
@@ -3141,6 +3151,7 @@
 DocType: BOM,Manufacturing User,Виробництво користувача
 DocType: Purchase Order,Raw Materials Supplied,Сировина постачається
 DocType: Purchase Invoice,Recurring Print Format,Періодична друку Формат
+DocType: C-Form,Series,Серія
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,"Очікувана дата поставки не може бути, перш ніж Купівля Порядок Дата"
 DocType: Appraisal,Appraisal Template,Оцінка шаблону
 DocType: Item Group,Item Classification,Пункт Класифікація
@@ -3216,7 +3227,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: Змінити порядок вступу вже існує для цього складу {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.","Не можете оголосити як втрачений, бо цитати був зроблений."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Купівля Майстер-менеджер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Виробничий замовлення {0} повинен бути представлений
@@ -3224,7 +3235,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Основні доповіді
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,На сьогоднішній день не може бути раніше від дати
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Додати / Редагувати Ціни
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Мої Замовлення
@@ -3272,7 +3283,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Ряд # {0}: Встановити Постачальник по пункту {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Сайт зображення {0} прикріплений до пункту {1} не може бути знайдений
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Сайт зображення {0} прикріплений до пункту {1} не може бути знайдений
 DocType: Issue,Content Type,Тип вмісту
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Комп&#39;ютер
 DocType: Item,List this Item in multiple groups on the website.,Список цей пункт в декількох групах на сайті.
@@ -3286,7 +3297,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Має серійний номер &#39;не може бути&#39; Так &#39;для не-фондовій пункту
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Має серійний номер &#39;не може бути&#39; Так &#39;для не-фондовій пункту
 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,Рахунок Керівник
@@ -3312,7 +3323,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Закриття рахунку {0} повинен бути типу відповідальністю / власний капітал
 DocType: Authorization Rule,Based On,Грунтуючись на
 DocType: Sales Order Item,Ordered Qty,Замовив Кількість
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Пункт {0} відключена
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Пункт {0} відключена
 DocType: Stock Settings,Stock Frozen Upto,Фото Заморожені Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},Період з Період і датам обов&#39;язкових для повторюваних {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Проектна діяльність / завдання.
@@ -3320,7 +3331,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Покупка повинна бути перевірена, якщо вибраний Стосується для в {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,"Знижка повинна бути менше, ніж 100"
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Списання Сума (Компанія валют)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,"Ряд # {0}: Будь ласка, встановіть кількість тональний"
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,"Ряд # {0}: Будь ласка, встановіть кількість тональний"
 DocType: Landed Cost Voucher,Landed Cost Voucher,Приземлився Вартість ваучера
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Будь ласка, встановіть {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Повторіть день місяця
@@ -3392,7 +3403,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Дивитися зараз
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Оберіть період, коли рахунок-фактура буде згенерований автоматично"
 DocType: BOM,Raw Material Cost,Сировина Вартість
-DocType: Item,Re-Order Level,Re-Order рівні
+DocType: Item Reorder,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.,"Введіть предметів і плановий Кількість, для якого ви хочете, щоб підняти виробничі замовлення або завантажити сировини для аналізу."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Неповний робочий день
 DocType: Employee,Applicable Holiday List,Стосується Список відпочинку
@@ -3447,7 +3458,7 @@
 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 +573,Please specify Attribute Value for attribute {0},"Будь ласка, сформулюйте Значення атрибуту для атрибуту {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3526,7 +3537,7 @@
 DocType: Address,Office,Офіс
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Бухгалтерських журналів.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно Кількість на зі складу
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,"Будь ласка, виберіть Employee Record перший."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,"Будь ласка, виберіть Employee Record перший."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,"Будь ласка, введіть видатковий рахунок"
@@ -3601,7 +3612,7 @@
 DocType: Item Attribute,Numeric Values,Числові значення
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Прикріпіть логотип
 DocType: Customer,Commission Rate,Ставка комісії
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Зробити Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Зробити Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Блок відпустки додатки по кафедрі.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Кошик Пусто
 DocType: Production Order,Actual Operating Cost,Фактична Операційна Вартість
@@ -3618,15 +3629,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Щоб встановити рівень повторного замовлення, деталь повинна бути Купівля товару або товару Виробництво"
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),(Половина дня)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(Половина дня)
 DocType: Supplier,Credit Days,Кредитні Дні
 DocType: Leave Type,Is Carry Forward,Є переносити
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Отримати елементів із специфікації
diff --git a/erpnext/translations/ur.csv b/erpnext/translations/ur.csv
index bfc5cb8..567f34a 100644
--- a/erpnext/translations/ur.csv
+++ b/erpnext/translations/ur.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,٪ بل
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),زر مبادلہ کی شرح کے طور پر ایک ہی ہونا چاہیے {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,گاہک کا نام
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},بینک اکاؤنٹ کے طور پر نامزد نہیں کیا جا سکتا {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},بینک اکاؤنٹ کے طور پر نامزد نہیں کیا جا سکتا {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),بقایا {0} نہیں ہو سکتا کے لئے صفر سے بھی کم ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,نیا رخصت کی درخواست
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,نیا رخصت کی درخواست
 apps/erpnext/erpnext/setup/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,ادائیگی اکاؤنٹ کے موڈ
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",سرگرمیوں کی لاگ ان، بلنگ وقت سے باخبر رہنے کے لئے استعمال کیا جا سکتا ہے کہ ٹاسکس کے خلاف صارفین کی طرف سے کارکردگی کا مظاہرہ کیا.
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},نیا {0}: # {1}
 ,Sales Partners Commission,سیلز شراکت دار کمیشن
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,زیادہ سے زیادہ 5 حروف نہیں کر سکتے ہیں مخفف
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,زیادہ سے زیادہ 5 حروف نہیں کر سکتے ہیں مخفف
 DocType: Payment Request,Payment Request,ادائیگی کی درخواست
 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.",ویلیو {0} {1} آئٹم کے طور پر متغیرات \ سے ہٹایا نہیں جا سکتا منسوب اس وصف کے ساتھ موجود.
@@ -195,6 +195,7 @@
 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 (%),قیمت کی فہرست کی شرح پر ڈسکاؤنٹ (٪)
 DocType: Offer Letter,Select Terms and Conditions,منتخب کریں شرائط و ضوابط
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,آؤٹ ویلیو
 DocType: Production Planning Tool,Sales Orders,فروخت کے احکامات
 DocType: Purchase Taxes and Charges,Valuation,تشخیص
 ,Purchase Order Trends,آرڈر رجحانات خریدیں
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,ٹیلی ویژن
 DocType: Production Order Operation,Updated via 'Time Log',&#39;وقت لاگ ان&#39; کے ذریعے اپ ڈیٹ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},اکاؤنٹ {0} کمپنی سے تعلق نہیں ہے {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},ایڈوانس رقم سے زیادہ نہیں ہو سکتا {0} {1}
 DocType: Naming Series,Series List for this Transaction,اس ٹرانزیکشن کے لئے سیریز
 DocType: Sales Invoice,Is Opening Entry,انٹری افتتاح ہے
 DocType: Customer Group,Mention if non-standard receivable account applicable,ذکر غیر معیاری وصولی اکاؤنٹ اگر قابل اطلاق ہو
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,مندرجہ بالا معیار کے لئے تنخواہ پرچی بناتا ہے.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,دی کوئی وضاحت
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,خریداری کے لئے درخواست.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,صرف منتخب شدہ رخصت کی منظوری دینے والا اس چھٹی کی درخواست پیش کر سکتے ہیں
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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} سیٹ اپ&gt; ترتیبات کے ذریعے&gt; نام سیریز کے لئے سیریز کا نام مقرر کریں
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},{0} گودام کمپنی سے تعلق نہیں ہے {1}
 DocType: Item Website Specification,Item Website Specification,شے کی ویب سائٹ کی تفصیلات
 DocType: Payment Tool,Reference No,حوالہ نہیں
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,چھوڑ کریں
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},آئٹم {0} پر زندگی کے اس کے آخر تک پہنچ گیا ہے {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,چھوڑ کریں
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},آئٹم {0} پر زندگی کے اس کے آخر تک پہنچ گیا ہے {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,سالانہ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,اسٹاک مصالحتی آئٹم
 DocType: Stock Entry,Sales Invoice No,فروخت انوائس کوئی
@@ -248,7 +250,7 @@
 DocType: Pricing Rule,Supplier Type,پردایک قسم
 DocType: Item,Publish in Hub,حب میں شائع
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,{0} آئٹم منسوخ کر دیا ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,{0} آئٹم منسوخ کر دیا ہے
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,مواد کی درخواست
 DocType: Bank Reconciliation,Update Clearance Date,اپ ڈیٹ کی کلیئرنس تاریخ
 DocType: Item,Purchase Details,خریداری کی تفصیلات
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,ترسیل کے نوٹ
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,ٹیکس قائم
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,آپ اسے نکالا بعد ادائیگی انٹری پر نظر ثانی کر دیا گیا ہے. اسے دوبارہ ھیںچو براہ مہربانی.
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} آئٹم ٹیکس میں دو بار میں داخل
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,مہینے اور سال براہ مہربانی منتخب کریں
@@ -327,7 +329,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,آپ کا ای میل ایڈریس
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,منسلکہ ملاحظہ کریں
 DocType: Purchase Order,% Received,٪ موصول
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,سیٹ اپ پہلے مکمل !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,سیٹ اپ پہلے مکمل !!
 ,Finished Goods,تیار اشیاء
 DocType: Delivery Note,Instructions,ہدایات
 DocType: Quality Inspection,Inspected By,کی طرف سے معائنہ
@@ -352,14 +354,13 @@
 ,Purchase Register,خریداری رجسٹر
 DocType: Landed Cost Item,Applicable Charges,لاگو چارجز
 DocType: Workstation,Consumable Cost,فراہمی لاگت
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) کے کردار ہونا ضروری ہے &#39;رخصت کی منظوری دینے والا&#39;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) کے کردار ہونا ضروری ہے &#39;رخصت کی منظوری دینے والا&#39;
 DocType: Purchase Receipt,Vehicle Date,گاڑی تاریخ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,میڈیکل
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,کھونے کے لئے کی وجہ سے
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},کارگاہ چھٹیوں فہرست کے مطابق مندرجہ ذیل تاریخوں پر بند کر دیا ہے: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,مواقع
 DocType: Employee,Single,سنگل
-DocType: Issue,Attachment,منسلکہ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,بجٹ گروپ لاگت مرکز کے لئے مقرر نہیں کیا جا سکتا
 DocType: Account,Cost of Goods Sold,فروخت سامان کی قیمت
 DocType: Purchase Invoice,Yearly,سالانہ
@@ -388,7 +389,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,خاصیت {0} صفات ٹیبل میں ایک سے زیادہ مرتبہ منتخب
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,خاصیت {0} صفات ٹیبل میں ایک سے زیادہ مرتبہ منتخب
 DocType: HR Settings,Employee record is created using selected field. ,ملازم ریکارڈ منتخب کردہ میدان کا استعمال کرتے ہوئے تخلیق کیا جاتا ہے.
 DocType: Sales Order,Not Applicable,قابل اطلاق نہیں
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,چھٹیوں ماسٹر.
@@ -427,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,کاسمیٹک
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items",ضم کرنے کے لئے، مندرجہ ذیل خصوصیات دونوں اشیاء کے لئے ایک ہی ہونا چاہیے
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items",ضم کرنے کے لئے، مندرجہ ذیل خصوصیات دونوں اشیاء کے لئے ایک ہی ہونا چاہیے
 DocType: Shipping Rule,Net Weight,سارا وزن
 DocType: Employee,Emergency Phone,ایمرجنسی فون
 ,Serial No Warranty Expiry,سیریل کوئی وارنٹی ختم ہونے کی
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,منیجنگ ذیلی سمجھوتے
 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,شرح جس قیمت کی فہرست کرنسی میں کمپنی کی بنیاد کرنسی تبدیل کیا جاتا ہے
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},{0} اکاؤنٹ کمپنی سے تعلق نہیں ہے: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},{0} اکاؤنٹ کمپنی سے تعلق نہیں ہے: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,مخفف پہلے سے ہی ایک اور کمپنی کے لئے استعمال کیا
 DocType: Selling Settings,Default Customer Group,پہلے سے طے شدہ گاہک گروپ
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",غیر فعال اگر، &#39;گول کل&#39; کے خانے کسی بھی لین دین میں نظر نہیں ہو گا
 DocType: BOM,Operating Cost,آپریٹنگ لاگت
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,انوائس ٹیبل میں پایا کوئی ریکارڈ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,پہلی کمپنی اور پارٹی کی قسم منتخب کریں
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,مالی / اکاؤنٹنگ سال.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,جمع اقدار
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",معذرت، سیریل نمبر ضم نہیں کیا جا سکتا
 DocType: Project Task,Project Task,پراجیکٹ ٹاسک
 ,Lead Id,لیڈ کی شناخت
@@ -492,7 +495,7 @@
 DocType: Quotation,Quotation To,کے لئے کوٹیشن
 DocType: Lead,Middle Income,درمیانی آمدنی
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),افتتاحی (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,آپ نے پہلے ہی ایک UOM ساتھ کچھ لین دین (ے) بنا دیا ہے کی وجہ سے اشیاء کے لئے پیمائش کی پہلے سے طے شدہ یونٹ {0} براہ راست تبدیل نہیں کیا جا سکتا. آپ کو ایک مختلف پہلے سے طے شدہ UOM استعمال کرنے کے لئے ایک نیا آئٹم تخلیق کرنے کے لئے کی ضرورت ہو گی.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,آپ نے پہلے ہی ایک UOM ساتھ کچھ لین دین (ے) بنا دیا ہے کی وجہ سے اشیاء کے لئے پیمائش کی پہلے سے طے شدہ یونٹ {0} براہ راست تبدیل نہیں کیا جا سکتا. آپ کو ایک مختلف پہلے سے طے شدہ UOM استعمال کرنے کے لئے ایک نیا آئٹم تخلیق کرنے کے لئے کی ضرورت ہو گی.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,مختص رقم منفی نہیں ہو سکتا
 DocType: Purchase Order Item,Billed Amt,بل AMT
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,اسٹاک اندراجات بنا رہے ہیں جس کے خلاف ایک منطقی گودام.
@@ -570,7 +573,7 @@
 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 +543,Item has variants.,آئٹم مختلف حالتوں ہے.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,درخت کی قسم
@@ -583,6 +586,7 @@
 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 +33,Goods received from Suppliers.,سامان سپلائر کی طرف سے موصول.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,قدر میں
 DocType: Lead,Campaign Name,مہم کا نام
 ,Reserved,محفوظ
 DocType: Purchase Order,Supply Raw Materials,خام مال کی سپلائی
@@ -597,7 +601,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,موجودہ لین دین کے ساتھ اکاؤنٹ اکاؤنٹ میں تبدیل نہیں کیا جا سکتا
 DocType: Delivery Note,Customer's Purchase Order No,گاہک کی خریداری آرڈر نمبر
 DocType: Employee,Cell Number,سیل نمبر
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,آٹو مواد درخواستوں پیدا
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,آٹو مواد درخواستوں پیدا
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,کھو
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,آپ کے کالم &#39;جرنل اندراج کے خلاف&#39; میں موجودہ واؤچر داخل نہیں ہو سکتا
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,توانائی
@@ -649,7 +653,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,قیمت کی فہرست منتخب نہیں
 DocType: Employee,Family Background,خاندانی پس منظر
 DocType: Process Payroll,Send Email,ای میل بھیجیں
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},انتباہ: غلط لف دستاویز {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},انتباہ: غلط لف دستاویز {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,کوئی اجازت
 DocType: Company,Default Bank Account,پہلے سے طے شدہ بینک اکاؤنٹ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",پارٹی کی بنیاد پر فلٹر کرنے کے لئے، منتخب پارٹی پہلی قسم
@@ -679,13 +683,13 @@
 DocType: Production Planning Tool,Select Items,منتخب شدہ اشیاء
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} بل کے خلاف {1} ء {2}
 DocType: Maintenance Visit,Completion Status,تکمیل کی حیثیت
-DocType: Sales Invoice Item,Target Warehouse,ہدف گودام
+DocType: Production Order,Target Warehouse,ہدف گودام
 DocType: Item,Allow over delivery or receipt upto this percent,اس فی صد تک کی ترسیل یا رسید سے زیادہ کرنے کی اجازت دیں
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,متوقع تاریخ کی ترسیل سیلز آرڈر کی تاریخ سے پہلے نہیں ہو سکتا
 DocType: Upload Attendance,Import Attendance,درآمد حاضری
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,تمام آئٹم گروپس
 DocType: Process Payroll,Activity Log,سرگرمی لاگ ان
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,خالص منافع / خسارہ
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,خالص منافع / خسارہ
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,خود کار طریقے سے لین دین کی جمع کرانے پر پیغام لکھیں.
 DocType: Production Order,Item To Manufacture,اشیاء تیار کرنے کے لئے
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} {2} حیثیت ہے
@@ -693,7 +697,7 @@
 DocType: Sales Order Item,Projected Qty,متوقع مقدار
 DocType: Sales Invoice,Payment Due Date,ادائیگی کی وجہ سے تاریخ
 DocType: Newsletter,Newsletter Manager,نیوز لیٹر منیجر
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,آئٹم مختلف {0} پہلے ہی صفات کے ساتھ موجود
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,آئٹم مختلف {0} پہلے ہی صفات کے ساتھ موجود
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',کی افتتاحی &#39;
 DocType: Notification Control,Delivery Note Message,ترسیل کے نوٹ پیغام
 DocType: Expense Claim,Expenses,اخراجات
@@ -703,7 +707,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,ریسرچ اینڈ ڈیولپمنٹ
 ,Amount to Bill,بل رقم
 DocType: Company,Registration Details,رجسٹریشن کی تفصیلات
-DocType: Item,Re-Order Qty,دوبارہ آرڈر کی مقدار
+DocType: Item Reorder,Re-Order Qty,دوبارہ آرڈر کی مقدار
 DocType: Leave Block List Date,Leave Block List Date,بلاک فہرست تاریخ چھوڑ دو
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},کو بھیجنے کے لئے تخسوچت {0}
 DocType: Pricing Rule,Price or Discount,قیمت یا ڈسکاؤنٹ
@@ -746,7 +750,7 @@
 DocType: Bank Reconciliation,Total Amount,کل رقم
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,انٹرنیٹ پبلشنگ
 DocType: Production Planning Tool,Production Orders,پیداوار کے احکامات
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,بیلنس ویلیو
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,بیلنس ویلیو
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,سیلز قیمت کی فہرست
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,اشیاء مطابقت پذیر کرنے کے شائع
 DocType: Bank Reconciliation,Account Currency,اکاؤنٹ کی کرنسی
@@ -755,7 +759,7 @@
 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 +538,Item Variants {0} updated,آئٹم متغیرات {0} اپ ڈیٹ
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,آئٹم متغیرات {0} اپ ڈیٹ
 DocType: Quality Inspection Reading,Reading 6,6 پڑھنا
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,انوائس پیشگی خریداری
 DocType: Address,Shop,دکان
@@ -832,7 +836,7 @@
 DocType: POS Profile,Cash/Bank Account,کیش / بینک اکاؤنٹ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,مقدار یا قدر میں کوئی تبدیلی نہیں کے ساتھ ختم اشیاء.
 DocType: Delivery Note,Delivery To,کی ترسیل کے
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,وصف میز لازمی ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,ڈسکاؤنٹ
@@ -860,7 +864,7 @@
 DocType: Tax Rule,Shipping State,شپنگ ریاست
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,آئٹم بٹن &#39;خریداری رسیدیں سے اشیاء حاصل کا استعمال کرتے ہوئے شامل کیا جانا چاہیے
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,فروخت کے اخراجات
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,سٹینڈرڈ خرید
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,سٹینڈرڈ خرید
 DocType: GL Entry,Against,کے خلاف
 DocType: Item,Default Selling Cost Center,پہلے سے طے شدہ فروخت لاگت مرکز
 DocType: Sales Partner,Implementation Partner,نفاذ ساتھی
@@ -902,7 +906,7 @@
 DocType: Sales Partner,Distributor,ڈسٹریبیوٹر
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,خریداری کی ٹوکری شپنگ حکمرانی
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,پروڈکشن آرڈر {0} اس سیلز آرڈر منسوخ کرنے سے پہلے منسوخ کر دیا جائے ضروری ہے
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',سیٹ &#39;پر اضافی رعایت کا اطلاق کریں براہ مہربانی
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',سیٹ &#39;پر اضافی رعایت کا اطلاق کریں براہ مہربانی
 ,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.,وقت کیلیے نوشتہ جات دیکھیے کو منتخب کریں اور ایک نئے فروخت انوائس پیدا کرنے کے لئے جمع کرائیں.
@@ -970,9 +974,9 @@
 DocType: Contact,User ID,صارف کی شناخت
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,لنک لیجر
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,قدیم ترین
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group",ایک آئٹم گروپ ایک ہی نام کے ساتھ موجود ہے، شے کے نام کو تبدیل کرنے یا شے کے گروپ کو دوسرا نام کریں
 DocType: Production Order,Manufacture against Sales Order,سیلز آرڈر کے خلاف تیاری
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,باقی دنیا کے
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,مجموعی ادائیگی
@@ -1002,7 +1006,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged",معذرت، کمپنیوں ضم نہیں کیا جا سکتا
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged",معذرت، کمپنیوں ضم نہیں کیا جا سکتا
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,چھوٹے
 DocType: Employee,Employee Number,ملازم نمبر
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},کیس نہیں (ے) پہلے سے استعمال میں. کیس نہیں سے کوشش {0}
@@ -1021,7 +1025,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,زراعت
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,اپنی مصنوعات یا خدمات
 DocType: Mode of Payment,Mode of Payment,ادائیگی کا طریقہ
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,ویب سائٹ تصویری ایک عوامی فائل یا ویب سائٹ یو آر ایل ہونا چاہئے
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,ویب سائٹ تصویری ایک عوامی فائل یا ویب سائٹ یو آر ایل ہونا چاہئے
 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,گودام معلومات رابطہ کریں
@@ -1093,6 +1097,7 @@
 DocType: Address,Utilities,افادیت
 DocType: Purchase Invoice Item,Accounting,اکاؤنٹنگ
 DocType: Features Setup,Features Setup,خصوصیات سیٹ اپ
+DocType: Item,Is Service Item,سروس شے ہے
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,درخواست کی مدت کے باہر چھٹی مختص مدت نہیں ہو سکتا
 DocType: Activity Cost,Projects,منصوبوں
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,مالی سال براہ مہربانی منتخب کریں
@@ -1123,7 +1128,7 @@
 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 +465,cannot be greater than 100,زیادہ سے زیادہ 100 سے زائد نہیں ہو سکتا
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,{0} آئٹم اسٹاک شے نہیں ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,{0} آئٹم اسٹاک شے نہیں ہے
 DocType: Maintenance Visit,Unscheduled,شیڈول کا اعلان
 DocType: Employee,Owned,ملکیت
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,بغیر تنخواہ چھٹی پر منحصر ہے
@@ -1182,7 +1187,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,حکومت
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,آئٹم متغیرات
 DocType: Company,Services,خدمات
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),کل ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),کل ({0})
 DocType: Cost Center,Parent Cost Center,والدین لاگت مرکز
 DocType: Sales Invoice,Source,ماخذ
 DocType: Leave Type,Is Leave Without Pay,تنخواہ کے بغیر چھوڑ
@@ -1255,17 +1260,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ادائیگی ای میل بھیج
 DocType: Dependent Task,Dependent Task,منحصر ٹاسک
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},قسم کے حکم {0} سے زیادہ نہیں ہو سکتا {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,بسم رقم
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} دیکھیں
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,کیش میں خالص تبدیلی
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,کیش میں خالص تبدیلی
 DocType: Salary Structure Deduction,Salary Structure Deduction,تنخواہ کٹوتی کی ساخت
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,پیمائش {0} کے یونٹ تبادلوں فیکٹر ٹیبل میں ایک سے زائد بار میں داخل کر دیا گیا ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,پیمائش {0} کے یونٹ تبادلوں فیکٹر ٹیبل میں ایک سے زائد بار میں داخل کر دیا گیا ہے
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},ادائیگی کی درخواست پہلے سے موجود ہے {0}
 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 +182,Quantity must not be more than {0},مقدار سے زیادہ نہیں ہونا چاہئے {0}
@@ -1327,7 +1332,7 @@
 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: Packed Item,To Warehouse (Optional),گودام میں (اختیاری)
 DocType: Sales Invoice,Paid Amount (Company Currency),ادائیگی کی رقم (کمپنی کرنسی)
 DocType: Purchase Invoice,Additional Discount,اضافی رعایت
 DocType: Selling Settings,Selling Settings,ترتیبات فروخت
@@ -1336,7 +1341,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",کمپنی، مہینہ اور مالی سال لازمی ہے
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,مارکیٹنگ کے اخراجات
 ,Item Shortage Report,آئٹم کمی رپورٹ
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن \ n براہ مہربانی بھی &quot;وزن UOM&quot; کا ذکر، ذکر کیا جاتا ہے
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن \ n براہ مہربانی بھی &quot;وزن UOM&quot; کا ذکر، ذکر کیا جاتا ہے
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,مواد کی درخواست یہ اسٹاک اندراج کرنے کے لئے استعمال کیا جاتا ہے
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,ایک آئٹم کی سنگل یونٹ.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',وقت لاگ ان بیچ {0} &#39;پیش&#39; ہونا ضروری ہے
@@ -1347,6 +1352,7 @@
 DocType: Employee,Date Of Retirement,ریٹائرمنٹ کے تاریخ
 DocType: Upload Attendance,Get Template,سانچے حاصل
 DocType: Address,Postal,ڈاک
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext سیٹ اپ مکمل!
 DocType: Item,Weightage,اہمیت
 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,ایک گاہک گروپ ایک ہی نام کے ساتھ موجود ہے کسٹمر کا نام تبدیل کرنے یا گاہک گروپ کا نام تبدیل کریں
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,{0} پہلی منتخب کریں.
@@ -1375,12 +1381,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,بہت زیادہ کالم. رپورٹ برآمد اور ایک سپریڈ شیٹ کی درخواست کا استعمال کرتے ہوئے پرنٹ.
 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 +139,Main,مین
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,مین
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,ویرینٹ
 DocType: Naming Series,Set prefix for numbering series on your transactions,آپ کے لین دین پر سیریز تعداد کے لئے مقرر اپسرگ
 DocType: Employee Attendance Tool,Employees HTML,ملازمین ایچ ٹی ایم ایل
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,روک آرڈر منسوخ نہیں کیا جا سکتا. منسوخ کرنے کے لئے Unstop.
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,پہلے سے طے شدہ BOM ({0}) یہ آئٹم یا اس سانچے کے لئے فعال ہونا ضروری ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,متغیرات
@@ -1405,7 +1411,6 @@
 DocType: Sales Order,To Deliver and Bill,نجات اور بل میں
 DocType: GL Entry,Credit Amount in Account Currency,اکاؤنٹ کی کرنسی میں قرضے کی رقم
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,مینوفیکچرنگ کے لئے وقت کیلیے نوشتہ جات دیکھیے.
-DocType: Item,Apply Warehouse-wise Reorder Level,گودام وار ترتیب سطح کا اطلاق
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} پیش کرنا ضروری ہے
 DocType: Authorization Control,Authorization Control,اجازت کنٹرول
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},صف # {0}: گودام مسترد مسترد آئٹم خلاف لازمی ہے {1}
@@ -1503,6 +1508,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,صف # {0}: آپریشن {1} کی پیداوار میں تیار مال کی {2} مقدار کے لئے مکمل نہیں ہے آرڈر # {3}. وقت کیلیے نوشتہ جات دیکھیے ذریعے آپریشن کی حیثیت کو اپ ڈیٹ کریں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,سرمایہ کاری
 DocType: Issue,Resolution Details,قرارداد کی تفصیلات
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,تین ہلاک
 DocType: Quality Inspection Reading,Acceptance Criteria,قبولیت کا کلیہ
 DocType: Item Attribute,Attribute Name,نام وصف
 DocType: Item Group,Show In Website,ویب سائٹ میں دکھائیں
@@ -1553,7 +1559,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,اخراجات دعوی منظوری زیر التواء ہے. صرف اخراجات کی منظوری دینے والا حیثیت کو اپ ڈیٹ کر سکتے ہیں.
 DocType: Purchase Invoice,Additional Discount Amount,اضافی ڈسکاؤنٹ رقم
 DocType: Leave Block List Allow,Leave Block List Allow,بلاک فہرست اجازت دیں چھوڑ دو
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr خالی یا جگہ نہیں ہو سکتا
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr خالی یا جگہ نہیں ہو سکتا
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,غیر گروپ سے گروپ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,کھیل
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,اصل کل
@@ -1594,7 +1600,7 @@
 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**.,** مالی سال ** ایک مالی سال کی نمائندگی کرتا ہے. تمام اکاؤنٹنگ اندراجات اور دیگر اہم لین دین *** مالی سال کے ساقھ ٹریک کر رہے ہیں.
 DocType: Opportunity,Customer / Lead Address,کسٹمر / لیڈ ایڈریس
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},انتباہ: منسلکہ پر غلط SSL سرٹیفکیٹ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},انتباہ: منسلکہ پر غلط SSL سرٹیفکیٹ {0}
 DocType: Production Order Operation,Actual Operation Time,اصل آپریشن کے وقت
 DocType: Authorization Rule,Applicable To (User),لاگو (صارف)
 DocType: Purchase Taxes and Charges,Deduct,منہا
@@ -1743,7 +1749,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,کیس نمبر 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,آپ (چینل کے شراکت دار) فروخت کی ٹیم اور فروخت شراکت دار ہیں، تو وہ ٹیگ اور فروخت کی سرگرمیوں میں ان کی شراکت کو برقرار رکھنے جا سکتا ہے
 DocType: Item,Show a slideshow at the top of the page,صفحے کے سب سے اوپر ایک سلائڈ شو دکھانے کے
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,سٹورز
+DocType: Item,"Allow in Sales Order of type ""Service""",قسم &quot;سروس&quot; کی فروخت آرڈر میں اجازت دیں
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,سٹورز
 DocType: Time Log,Projects Manager,منصوبوں کے مینیجر
 DocType: Serial No,Delivery Time,ڈیلیوری کا وقت
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,کی بنیاد پر خستہ
@@ -1767,7 +1774,7 @@
 ,Financial Analytics,مالیاتی تجزیات
 DocType: Quality Inspection,Verified By,کی طرف سے تصدیق
 DocType: Address,Subsidiary,ماتحت
-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.",موجودہ لین دین موجود ہیں کیونکہ، کمپنی کی پہلے سے طے شدہ کرنسی تبدیل نہیں کر سکتے. معاملات پہلے سے طے شدہ کرنسی تبدیل کرنے منسوخ کر دیا جائے ضروری ہے.
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",موجودہ لین دین موجود ہیں کیونکہ، کمپنی کی پہلے سے طے شدہ کرنسی تبدیل نہیں کر سکتے. معاملات پہلے سے طے شدہ کرنسی تبدیل کرنے منسوخ کر دیا جائے ضروری ہے.
 DocType: Quality Inspection,Purchase Receipt No,خریداری کی رسید نہیں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,بیانا رقم
 DocType: Process Payroll,Create Salary Slip,تنخواہ پرچی بنائیں
@@ -1815,7 +1822,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,خام مال خالی نہیں ہو سکتا.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.",اسٹاک کو اپ ڈیٹ نہیں کیا جا سکا، انوائس ڈراپ شپنگ آئٹم پر مشتمل ہے.
 DocType: Newsletter,Test,ٹیسٹ
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'",موجودہ اسٹاک لین دین آپ کی اقدار کو تبدیل نہیں کر سکتے ہیں \ اس شے کے، کے لئے موجود ہیں کے طور پر &#39;سیریل نہیں ہے&#39;، &#39;بیچ ہے نہیں&#39;، &#39;اسٹاک آئٹم&#39; اور &#39;تشخیص کا طریقہ&#39;
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,فوری جرنل اندراج
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,BOM کسی بھی شے agianst ذکر اگر آپ کی شرح کو تبدیل نہیں کر سکتے ہیں
@@ -1904,7 +1911,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,براہ مہربانی سب سے پہلے ترسیل کے نوٹ
 DocType: Purchase Invoice,Currency and Price List,کرنسی اور قیمت کی فہرست
 DocType: Opportunity,Customer / Lead Name,کسٹمر / لیڈ نام
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,کلیئرنس تاریخ کا ذکر نہیں
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,کلیئرنس تاریخ کا ذکر نہیں
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,پیداوار
 DocType: Item,Allow Production Order,اجازت دیں پروڈکشن آرڈر
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,صف {0}: شروع کرنے کی تاریخ تاریخ اختتام سے پہلے ہونا ضروری ہے
@@ -1914,7 +1921,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,کل کمائی
 DocType: Purchase Receipt,Time at which materials were received,مواد موصول ہوئیں جس میں وقت
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,میرے پتے
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,میرے پتے
 DocType: Stock Ledger Entry,Outgoing Rate,سبکدوش ہونے والے کی شرح
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,تنظیم شاخ ماسٹر.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,یا
@@ -1983,7 +1990,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,گاہک گروپ درخت کا انتظام کریں.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,نیا لاگت مرکز نام
 DocType: Leave Control Panel,Leave Control Panel,کنٹرول پینل چھوڑنا
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,کوئی پہلے سے طے شدہ ایڈریس سانچے پایا. سیٹ اپ&gt; طباعت اور برانڈنگ&gt; ایڈریس سانچہ سے ایک نیا بنانے کے براہ مہربانی.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,کوئی پہلے سے طے شدہ ایڈریس سانچے پایا. سیٹ اپ&gt; طباعت اور برانڈنگ&gt; ایڈریس سانچہ سے ایک نیا بنانے کے براہ مہربانی.
 DocType: Appraisal,HR User,HR صارف
 DocType: Purchase Invoice,Taxes and Charges Deducted,ٹیکسز اور الزامات کٹوتی
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,مسائل
@@ -2000,7 +2007,7 @@
 ,Sales Browser,سیلز براؤزر
 DocType: Journal Entry,Total Credit,کل کریڈٹ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},انتباہ: ایک {0} # {1} اسٹاک داخلے کے خلاف موجود {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,مقامی
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,بڑے
@@ -2019,7 +2026,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,آپ کی مقرر کردہ اور اہداف کی نگرانی کر سکتے ہیں تاکہ تمام سیلز معاملات سے زیادہ ** سیلز افراد ** خلاف ٹیگ کیا جا سکتا.
 ,S.O. No.,تو نمبر
 DocType: Production Order Operation,Make Time Log,وقت لاگ ان کریں بنائیں
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,ترتیب مقدار مقرر کریں
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},لیڈ سے گاہک بنانے کے براہ مہربانی {0}
 DocType: Price List,Applicable for Countries,ممالک کے لئے قابل اطلاق
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,کمپیوٹر
@@ -2094,7 +2100,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,متعلقہ اندراجات حاصل
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,اسٹاک کے لئے اکاؤنٹنگ انٹری
 DocType: Sales Invoice,Sales Team1,سیلز Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,آئٹم {0} موجود نہیں ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,آئٹم {0} موجود نہیں ہے
 DocType: Sales Invoice,Customer Address,گاہک پتہ
 DocType: Payment Request,Recipient and Message,وصول کنندہ اور پیغام
 DocType: Purchase Invoice,Apply Additional Discount On,اضافی رعایت پر لاگو ہوتے ہیں
@@ -2136,7 +2142,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,تشخیص کی شرح
 apps/erpnext/erpnext/stock/get_item_details.py +274,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} اوپر &#39;خریداری رسیدیں&#39; کے ٹیبل میں موجود نہیں ہے خریداری کی رسید
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,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 +155,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,لاگ ان کا نام تبدیل کریں
@@ -2174,7 +2180,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,تاریخ حاجت کوڈ داخل کریں.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,صرف حیثیت &#39;منظور&#39; پیش کیا جا سکتا کے ساتھ درخواستیں چھوڑ دو
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,ایڈریس عنوان لازمی ہے.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,ایڈریس عنوان لازمی ہے.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,انکوائری کے ذریعہ مہم ہے تو مہم کا نام درج کریں
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,اخبار پبلیشرز
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,مالی سال کو منتخب کریں
@@ -2198,6 +2204,7 @@
 DocType: UOM,Must be Whole Number,پورے نمبر ہونا لازمی ہے
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(دنوں میں) مختص نئے پتے
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,سیریل نمبر {0} موجود نہیں ہے
+DocType: Sales Invoice Item,Customer Warehouse (Optional),کسٹمر گودام (اختیاری)
 DocType: Pricing Rule,Discount Percentage,ڈسکاؤنٹ فی صد
 DocType: Payment Reconciliation Invoice,Invoice Number,انوائس تعداد
 apps/erpnext/erpnext/hooks.py +55,Orders,احکامات
@@ -2307,7 +2314,7 @@
 DocType: Appraisal,Appraisal,تشخیص
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,تاریخ دہرایا گیا ہے
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,مجاز دستخط
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},سے ایک ہونا ضروری گواہ چھوڑ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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,وقت آغاز
@@ -2476,7 +2483,7 @@
 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 +733,Show tax break-up,دکھائیں ٹیکس بریک اپ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,دکھائیں ٹیکس بریک اپ
 apps/erpnext/erpnext/accounts/party.py +283,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',آپ مینوفیکچرنگ کی سرگرمی میں شامل تو. قابل بناتا آئٹم &#39;تیار ہے&#39;
@@ -2525,7 +2532,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,دوبارہ ٹائپ کمپنی کا نام کی توثیق کے لئے براہ کرم
@@ -2552,8 +2559,6 @@
 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,شمولیت کی تاریخ پیدائش کی تاریخ سے زیادہ ہونا چاہیے
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,تنخواہ ساخت
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}",ایک سے زیادہ قیمت حکمرانی ایک ہی معیار کے ساتھ موجود ہے، ترجیح مقرر کی طرف سے \ تنازعہ کو حل کریں. قیمت قوانین: {0}
 DocType: Account,Bank,بینک
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ایئرلائن
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,مسئلہ مواد
@@ -2578,7 +2583,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,سیکورٹیز اینڈ ایکسچینج کماڈٹی
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',مختلف کے لئے پیمائش کی پہلے سے طے شدہ یونٹ &#39;{0}&#39; سانچے میں کے طور پر ایک ہی ہونا چاہیے &#39;{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',مختلف کے لئے پیمائش کی پہلے سے طے شدہ یونٹ &#39;{0}&#39; سانچے میں کے طور پر ایک ہی ہونا چاہیے &#39;{1}
 DocType: Shipping Rule,Calculate Based On,کی بنیاد پر حساب
 DocType: Delivery Note Item,From Warehouse,گودام سے
 DocType: Purchase Taxes and Charges,Valuation and Total,تشخیص اور کل
@@ -2587,7 +2592,7 @@
 DocType: Account,Purchase User,خریداری صارف
 DocType: Notification Control,Customize the Notification,اطلاع کو حسب ضرورت
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,آپریشنز سے کیش فلو
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,پہلے سے طے شدہ ایڈریس سانچہ خارج نہیں کیا جا سکتا
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,پہلے سے طے شدہ ایڈریس سانچہ خارج نہیں کیا جا سکتا
 DocType: Sales Invoice,Shipping Rule,شپنگ حکمرانی
 DocType: Manufacturer,Limited to 12 characters,12 حروف تک محدود
 DocType: Journal Entry,Print Heading,پرنٹ سرخی
@@ -2680,7 +2685,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,پروجیکٹ وار اعداد و شمار کوٹیشن کے لئے دستیاب نہیں ہے
 DocType: Project,Expected End Date,متوقع تاریخ اختتام
 DocType: Appraisal Template,Appraisal Template Title,تشخیص سانچہ عنوان
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,کمرشل
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,بہت اچھے خدمات
@@ -2699,7 +2704,7 @@
 DocType: Customer,Default Receivable Accounts,وصولی اکاؤنٹس پہلے سے طے شدہ
 DocType: Tax Rule,Billing State,بلنگ ریاست
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,منتقلی
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),(ذیلی اسمبلیوں سمیت) پھٹا BOM آوردہ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),(ذیلی اسمبلیوں سمیت) پھٹا BOM آوردہ
 DocType: Authorization Rule,Applicable To (Employee),لاگو (ملازم)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,کی وجہ سے تاریخ لازمی ہے
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,وصف کے لئے اضافہ {0} 0 نہیں ہو سکتا
@@ -2732,7 +2737,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,منفی تشخیص کی شرح کی اجازت نہیں ہے
 DocType: Holiday List,Weekly Off,ویکلی آف
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",مثال کے طور پر 2012، 2012-13 کے لئے
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),عبوری منافع / خسارہ (کریڈٹ)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),عبوری منافع / خسارہ (کریڈٹ)
 DocType: Sales Invoice,Return Against Sales Invoice,کے خلاف فروخت انوائس واپس
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,آئٹم 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},کمپنی میں ڈیفالٹ قدر {0} مقرر کریں {1}
@@ -2763,6 +2768,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,چائلڈ شامل
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,کردار منجمد اکاؤنٹس اور ترمیم منجمد اندراجات مقرر کرنے کی اجازت
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,یہ بچے نوڈ ہے کے طور پر لیجر لاگت مرکز میں تبدیل نہیں کرسکتا
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,افتتاحی ویلیو
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,سیریل نمبر
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,فروخت پر کمیشن
 DocType: Offer Letter Term,Value / Description,ویلیو / تفصیل
@@ -2796,7 +2802,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,کامیابی کے ساتھ اس کمپنی سے متعلق تمام لین دین کو خارج کر دیا!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,تاریخ کے طور پر
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,پروبیشن
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,پہلے سے طے شدہ گودام اسٹاک شے کے لئے لازمی ہے.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},ماہ کے لئے تنخواہ کی ادائیگی {0} اور سال {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,آٹو ڈالیں قیمت کی فہرست شرح لاپتہ ہے
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,کل ادا کی گئی رقم
@@ -2832,7 +2837,7 @@
 DocType: Payment Tool,Set Matching Amounts,سیٹ ملاپ مقدار
 DocType: Purchase Invoice,Taxes and Charges Added,ٹیکس اور الزامات شامل کر دیا گیا
 ,Sales Funnel,سیلز قیف
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,مخفف لازمی ہے
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,مخفف لازمی ہے
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,ہماری اپ ڈیٹ کی رکنیت میں آپ کی دلچسپی کے لئے آپ کا شکریہ
 ,Qty to Transfer,منتقلی کی مقدار
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,لیڈز یا گاہکوں کو قیمت.
@@ -2860,7 +2865,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,پردایک کوٹیشن
 DocType: Quotation,In Words will be visible once you save the Quotation.,آپ کوٹیشن بچانے بار الفاظ میں نظر آئے گا.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} بند کردیا گیا ہے
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},بارکوڈ {0} پہلے ہی آئٹم میں استعمال {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,انے والی تقریبات
@@ -2882,7 +2887,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,مالی سال منتخب کریں ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,پی او ایس پی او ایس پروفائل اندراج کرنے کے لئے کی ضرورت ہے
 DocType: Hub Settings,Name Token,نام ٹوکن
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,سٹینڈرڈ فروخت
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,سٹینڈرڈ فروخت
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,کم سے کم ایک گودام لازمی ہے
 DocType: Serial No,Out of Warranty,وارنٹی سے باہر
 DocType: BOM Replace Tool,Replace,بدل دیں
@@ -3005,7 +3010,7 @@
 DocType: Sales Invoice,Paid Amount,ادائیگی کی رقم
 ,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,کوئی دوسرے پہلے سے طے شدہ ہے کے طور پر پہلے سے طے شدہ طور پر اس ایڈریس سانچے کی ترتیب
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,کوئی دوسرے پہلے سے طے شدہ ہے کے طور پر پہلے سے طے شدہ طور پر اس ایڈریس سانچے کی ترتیب
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",پہلے سے ڈیبٹ میں اکاؤنٹ بیلنس، آپ کو کریڈٹ &#39;کے طور پر کی بیلنس ہونا چاہئے&#39; قائم کرنے کی اجازت نہیں کر رہے ہیں
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,معیار منظم رکھنا
 DocType: Production Planning Tool,Filter based on customer,فلٹر کسٹمر کی بنیاد پر
@@ -3106,7 +3111,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",، پہلے سے طے شدہ طور پر اس مالی سال مقرر کرنے کیلئے &#39;پہلے سے طے شدہ طور پر مقرر کریں&#39; پر کلک کریں
 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 +19,Shortage Qty,کمی کی مقدار
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,آئٹم ویرینٹ {0} اسی صفات کے ساتھ موجود
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,آئٹم ویرینٹ {0} اسی صفات کے ساتھ موجود
 DocType: Salary Slip,Salary Slip,تنخواہ پرچی
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"تاریخ"" کئ ضرورت ہے To"""
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",پیکجوں پیش کی جائے کرنے کے لئے تخم پیکنگ پیدا. پیکیج کی تعداد، پیکج مندرجات اور اس کا وزن مطلع کرنے کے لئے استعمال.
@@ -3117,7 +3122,7 @@
 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.",جانچ پڑتال کے لین دین کے کسی بھی &quot;پیش&quot; کر رہے ہیں تو، ایک ای میل پاپ اپ خود کار طریقے سے منسلکہ کے طور پر لین دین کے ساتھ، کہ ٹرانزیکشن میں منسلک &quot;رابطہ&quot; کو ایک ای میل بھیجنے کے لئے کھول دیا. صارف مئی یا ای میل بھیجنے کے نہیں کر سکتے ہیں.
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,گلوبل ترتیبات
 DocType: Employee Education,Employee Education,ملازم تعلیم
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,یہ شے کی تفصیلات بازیافت کرنے کی ضرورت ہے.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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} پہلے سے حاصل کیا گیا ہے
@@ -3143,6 +3148,7 @@
 DocType: BOM,Manufacturing User,مینوفیکچرنگ صارف
 DocType: Purchase Order,Raw Materials Supplied,خام مال فراہم
 DocType: Purchase Invoice,Recurring Print Format,مکرر پرنٹ کی شکل
+DocType: C-Form,Series,سیریز
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,متوقع تاریخ کی ترسیل خریداری کے آرڈر کی تاریخ سے پہلے نہیں ہو سکتا
 DocType: Appraisal,Appraisal Template,تشخیص سانچہ
 DocType: Item Group,Item Classification,آئٹم کی درجہ بندی
@@ -3218,7 +3224,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: ایک ترتیب اندراج پہلے ہی اس گودام کے لئے موجود ہے {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.",کوٹیشن بنا دیا گیا ہے کیونکہ، کے طور پر کھو نہیں بتا سکتے.
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,خریداری ماسٹر مینیجر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,آرڈر {0} پیش کرنا ضروری ہے پیداوار
@@ -3226,7 +3232,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,اہم رپورٹیں
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,تاریخ کی تاریخ کی طرف سے پہلے نہیں ہو سکتا
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,/ ترمیم قیمتیں شامل
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,میرے حکم
@@ -3287,7 +3293,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,&#39;ہاں&#39; ہونا غیر اسٹاک شے کے لئے نہیں کر سکتے ہیں &#39;سیریل نہیں ہے&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,&#39;ہاں&#39; ہونا غیر اسٹاک شے کے لئے نہیں کر سکتے ہیں &#39;سیریل نہیں ہے&#39;
 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,اکاؤنٹ ہیڈ
@@ -3313,7 +3319,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,اکاؤنٹ {0} بند قسم ذمہ داری / اکوئٹی کا ہونا ضروری ہے
 DocType: Authorization Rule,Based On,پر مبنی
 DocType: Sales Order Item,Ordered Qty,کا حکم دیا مقدار
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,آئٹم {0} غیر فعال ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,آئٹم {0} غیر فعال ہے
 DocType: Stock Settings,Stock Frozen Upto,اسٹاک منجمد تک
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},سے اور مدت بار بار چلنے والی کے لئے لازمی تاریخوں کی مدت {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,پروجیکٹ سرگرمی / کام.
@@ -3321,7 +3327,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",قابل اطلاق کے لئے کے طور پر منتخب کیا جاتا ہے تو خریدنے، جانچ پڑتال ہونا ضروری {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ڈسکاؤنٹ کم 100 ہونا ضروری ہے
 DocType: Purchase Invoice,Write Off Amount (Company Currency),رقم لکھیں (کمپنی کرنسی)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,صف # {0}: ترتیب مقدار مقرر کریں
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,صف # {0}: ترتیب مقدار مقرر کریں
 DocType: Landed Cost Voucher,Landed Cost Voucher,لینڈڈ لاگت واؤچر
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},مقرر کریں {0}
 DocType: Purchase Invoice,Repeat on Day of Month,مہینے کا دن پر دہرائیں
@@ -3393,7 +3399,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,اب ملاحظہ
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,انوائس خود کار طریقے سے پیدا کی جائے گی جب مدت کو منتخب کریں
 DocType: BOM,Raw Material Cost,خام مواد کی لاگت
-DocType: Item,Re-Order Level,دوبارہ آرڈر کی سطح
+DocType: Item Reorder,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.,آپ کی پیداوار کے احکامات کو بڑھانے یا تجزیہ کے لئے خام مال، اتارنا کرنا چاہتے ہیں جس کے لئے اشیاء اور منصوبہ بندی کی مقدار درج کریں.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,پارٹ ٹائم
 DocType: Employee,Applicable Holiday List,قابل اطلاق چھٹیوں فہرست
@@ -3448,7 +3454,7 @@
 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 +573,Please specify Attribute Value for attribute {0},وصف کے لئے قدر وصف کی وضاحت کریں {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3527,7 +3533,7 @@
 DocType: Address,Office,آفس
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,اکاؤنٹنگ جرنل اندراج.
 DocType: Delivery Note Item,Available Qty at From Warehouse,گودام سے پر دستیاب مقدار
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,پہلی ملازم ریکارڈ منتخب کریں.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,پہلی ملازم ریکارڈ منتخب کریں.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,ایکسپینس اکاؤنٹ درج کریں
@@ -3602,7 +3608,7 @@
 DocType: Item Attribute,Numeric Values,عددی اقدار
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,علامت (لوگو) منسلک کریں
 DocType: Customer,Commission Rate,کمیشن کی شرح
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,مختلف بنائیں
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,مختلف بنائیں
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,محکمہ کی طرف سے بلاک چھٹی ایپلی کیشنز.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,ٹوکری خالی ہے
 DocType: Production Order,Actual Operating Cost,اصل آپریٹنگ لاگت
@@ -3619,15 +3625,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item",ترتیب سطح قائم کرنے، شے ایک خریداری شے یا مینوفیکچرنگ آئٹم ہونا ضروری ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),آدھا دن
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),آدھا دن
 DocType: Supplier,Credit Days,کریڈٹ دنوں
 DocType: Leave Type,Is Carry Forward,فارورڈ لے
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,BOM سے اشیاء حاصل
diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv
index 1054b21..ac6e5c6 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,Được quảng cáo%
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Tỷ giá ngoại tệ phải được giống như {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Tên khách hàng
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Tài khoản ngân hàng không có thể được đặt tên là {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Tài khoản ngân hàng không có thể được đặt tên là {0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),Xuất sắc cho {0} không thể nhỏ hơn không ({1})
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,Để lại ứng dụng mới
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,Để lại ứng dụng mới
 apps/erpnext/erpnext/setup/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
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Đăng nhập của hoạt động được thực hiện bởi người dùng chống lại tác vụ này có thể được sử dụng để theo dõi thời gian, thanh toán."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},New {0}: {1} #
 ,Sales Partners Commission,Ủy ban Đối tác bán hàng
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Tên viết tắt không thể có nhiều hơn 5 ký tự
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Tên viết tắt không thể có nhiều hơn 5 ký tự
 DocType: Payment Request,Payment Request,Yêu cầu thanh toán
 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.",Giá trị thuộc tính {0} không thể được gỡ bỏ từ {1} là biến thể mục \ tồn tại với Attribute này.
@@ -196,6 +196,7 @@
 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ệ (%)
 DocType: Offer Letter,Select Terms and Conditions,Chọn Điều khoản và Điều kiện
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,Giá trị hiện
 DocType: Production Planning Tool,Sales Orders,Đơn đặt hàng bán hàng
 DocType: Purchase Taxes and Charges,Valuation,Định giá
 ,Purchase Order Trends,Xu hướng mua hàng
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Tivi
 DocType: Production Order Operation,Updated via 'Time Log',Cập nhật thông qua 'Giờ'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Tài khoản {0} không thuộc về Công ty {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},số tiền tạm ứng không có thể lớn hơn {0} {1}
 DocType: Naming Series,Series List for this Transaction,Danh sách loạt cho các giao dịch này
 DocType: Sales Invoice,Is Opening Entry,Được mở cửa nhập
 DocType: Customer Group,Mention if non-standard receivable account applicable,Đề cập đến nếu tài khoản phải thu phi tiêu chuẩn áp dụng
@@ -227,7 +229,7 @@
 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/templates/generators/item.html +30,No description given,Không có mô tả cho
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Yêu cầu để mua hàng.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/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&gt; Cài đặt&gt; Đặt tên series
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Kho {0} không thuộc về công ty {1}
 DocType: Item Website Specification,Item Website Specification,Mục Trang Thông số kỹ thuật
 DocType: Payment Tool,Reference No,Reference No
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Lại bị chặn
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Lại bị chặn
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,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
@@ -249,7 +251,7 @@
 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 +606,Item {0} is cancelled,Mục {0} bị hủy bỏ
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Mục {0} bị hủy bỏ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,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
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Giao hàng Ghi
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Thiết lập Thuế
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} Nhập hai lần vào Mục Thuế
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} Nhập hai lần vào Mục 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
@@ -329,7 +331,7 @@
 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 +215,Please see attachment,Xin vui lòng xem file đính kèm
 DocType: Purchase Order,% Received,% Nhận
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Đã thiết lập hoàn chỉnh!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Đã thiết lập hoàn chỉnh!
 ,Finished Goods,Hoàn thành Hàng
 DocType: Delivery Note,Instructions,Hướng dẫn
 DocType: Quality Inspection,Inspected By,Kiểm tra bởi
@@ -354,14 +356,13 @@
 ,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 +169,{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 +189,{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/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
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation được đóng cửa vào các ngày sau đây theo Danh sách khách sạn Holiday: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Cơ hội
 DocType: Employee,Single,Một lần
-DocType: Issue,Attachment,File đính kèm
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Ngân sách không thể được đặt cho Trung tâm chi phí Nhóm
 DocType: Account,Cost of Goods Sold,Chi phí hàng bán
 DocType: Purchase Invoice,Yearly,Hàng năm
@@ -390,7 +391,7 @@
 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 +564,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 +550,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: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Không áp dụng
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Chủ lễ.
@@ -429,7 +430,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Mỹ phẩm
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"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: 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
@@ -440,7 +441,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Quản lý Hợp đồng phụ
 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
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Tài khoản {0} không thuộc về công ty: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Tài khoản {0} không thuộc về công ty: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Tên viết tắt đã được sử dụng cho một công ty khác
 DocType: Selling Settings,Default Customer Group,Xin vui lòng viết một cái gì đó trong chủ đề và thông điệp!
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Nếu vô hiệu hóa, trường 'Tròn Tổng số' sẽ không được nhìn thấy trong bất kỳ giao dịch"
 DocType: BOM,Operating Cost,Chi phí hoạt động
@@ -476,6 +478,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Không có hồ sơ được tìm thấy trong bảng hóa đơn
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vui lòng chọn Công ty và Đảng Loại đầu tiên
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Năm tài chính / kế toán.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Giá trị tích lũy
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Xin lỗi, Serial Nos không thể được sáp nhập"
 DocType: Project Task,Project Task,Dự án công tác
 ,Lead Id,Id dẫn
@@ -497,7 +500,7 @@
 DocType: Quotation,Quotation To,Để báo giá
 DocType: Lead,Middle Income,Thu nhập trung bình
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Mở (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Mặc định Đơn vị đo lường cho mục {0} không thể thay đổi trực tiếp bởi vì bạn đã thực hiện một số giao dịch (s) với Ươm khác. Bạn sẽ cần phải tạo ra một khoản mới để sử dụng một định Ươm khác nhau.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Mặc định Đơn vị đo lường cho mục {0} không thể thay đổi trực tiếp bởi vì bạn đã thực hiện một số giao dịch (s) với Ươm khác. Bạn sẽ cần phải tạo ra một khoản mới để sử dụng một định Ươm khác nhau.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Số lượng phân bổ không thể phủ định
 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.
@@ -575,7 +578,7 @@
 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 +543,Item has variants.,Mục có các biến thể.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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
@@ -588,6 +591,7 @@
 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 +33,Goods received from Suppliers.,Hàng nhận được từ nhà cung cấp.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,trong Value
 DocType: Lead,Campaign Name,Tên chiến dịch
 ,Reserved,Ltd
 DocType: Purchase Order,Supply Raw Materials,Cung cấp Nguyên liệu thô
@@ -602,16 +606,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Tài khoản với giao dịch hiện tại không thể được chuyển đổi sang sổ cái
 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/stock/reorder_item.py +171,Auto Material Requests Generated,Các yêu cầu tự động Chất liệu Generated
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Các yêu cầu tự động Chất liệu Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Thua
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,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/setup_wizard/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.
 DocType: Item Group,Website Specifications,Website Thông số kỹ thuật
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Có một lỗi trong Template Địa chỉ của bạn {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,Tài khoản mới
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Từ {0} của loại {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Hàng {0}: Chuyển đổi Factor là bắt buộc
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Nhiều quy Giá tồn tại với cùng một tiêu chuẩn, xin vui lòng giải quyết xung đột bằng cách gán ưu tiên. Nội quy Giá: {0}"
 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.,Kế toán Entries có thể được thực hiện đối với các nút lá. Entries chống lại nhóm không được phép.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,Không thể tắt hoặc hủy bỏ BOM như nó được liên kết với BOMs khác
 DocType: Opportunity,Maintenance,Bảo trì
@@ -673,7 +679,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,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/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Cảnh báo: Tập tin đính kèm không hợp lệ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Cảnh báo: Tập tin đính kèm không hợp lệ {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Không phép
 DocType: Company,Default Bank Account,Tài khoản Ngân hàng mặc định
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Để lọc dựa vào Đảng, Đảng chọn Gõ đầu tiên"
@@ -703,13 +709,13 @@
 DocType: Production Planning Tool,Select Items,Chọn mục
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} với Bill {1} {2} ngày
 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: Production Order,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 +50,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/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
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Lợi nhuận ròng / lỗ
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Lợi nhuận ròng / lỗ
 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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} tình trạng là {2}
@@ -717,7 +723,7 @@
 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ý
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Mục Variant {0} đã tồn tại với cùng một thuộc tính
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Mục Variant {0} đã tồn tại với cùng một thuộc tính
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Đang mở'
 DocType: Notification Control,Delivery Note Message,Giao hàng tận nơi Lưu ý tin nhắn
 DocType: Expense Claim,Expenses,Chi phí
@@ -727,7 +733,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Nghiên cứu & Phát triể
 ,Amount to Bill,Số tiền Bill
 DocType: Company,Registration Details,Thông tin chi tiết đăng ký
-DocType: Item,Re-Order Qty,Re-trật tự Qty
+DocType: Item Reorder,Re-Order Qty,Re-trật tự Qty
 DocType: Leave Block List Date,Leave Block List Date,Để lại Danh sách Chặn ngày
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Dự kiến gửi đến {0}
 DocType: Pricing Rule,Price or Discount,Giá hoặc giảm giá
@@ -770,7 +776,7 @@
 DocType: Bank Reconciliation,Total Amount,Tổng tiền
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet xuất bản
 DocType: Production Planning Tool,Production Orders,Đơn đặt hàng sản xuất
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Cân bằng giá trị gia tăng
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Cân bằng giá trị gia tăng
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Danh sách bán hàng giá
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Xuất bản để đồng bộ các hạng mục
 DocType: Bank Reconciliation,Account Currency,Tài khoản ngoại tệ
@@ -779,7 +785,7 @@
 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 +538,Item Variants {0} updated,Các biến thể mục {0} cập nhật
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -856,7 +862,7 @@
 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 +70,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 +561,Attribute table is mandatory,Bảng thuộc tính là bắt buộc
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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 thể bị âm
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Giảm giá
@@ -884,7 +890,7 @@
 DocType: Tax Rule,Shipping State,Vận Chuyển Nhà nước
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Item phải được bổ sung bằng cách sử dụng 'Nhận Items từ Mua Tiền thu' nút
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Chi phí bán hàng
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Tiêu chuẩn mua
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Tiêu chuẩn mua
 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
@@ -926,7 +932,7 @@
 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 +210,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/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Xin hãy đặt &#39;Áp dụng giảm giá bổ sung On&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Xin hãy đặt &#39;Áp dụng giảm giá bổ sung On&#39;
 ,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.
@@ -994,9 +1000,9 @@
 DocType: Contact,User ID,ID người dùng
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Xem Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Sớm nhất
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"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: Production Order,Manufacture against Sales Order,Sản xuất với bán hàng đặt hàng
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Phần còn lại của Thế giới
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1026,7 +1032,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged","Xin lỗi, công ty không thể được sáp nhập"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Xin lỗi, công ty không thể được sáp nhập"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Nhỏ
 DocType: Employee,Employee Number,Số nhân viên
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Không trường hợp (s) đã được sử dụng. Cố gắng từ Trường hợp thứ {0}
@@ -1045,7 +1051,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Nông nghiệp
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Sản phẩm hoặc dịch vụ của bạn
 DocType: Mode of Payment,Mode of Payment,Hình thức thanh toán
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Hình ảnh trang web phải là một tập tin nào hoặc URL của trang web
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Hình ảnh trang web phải là một tập tin nào hoặc URL của trang web
 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
@@ -1117,6 +1123,7 @@
 DocType: Address,Utilities,Tiện ích
 DocType: Purchase Invoice Item,Accounting,Kế toán
 DocType: Features Setup,Features Setup,Tính năng cài đặt
+DocType: Item,Is Service Item,Là dịch vụ hàng
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Kỳ ứng dụng không thể có thời gian phân bổ nghỉ bên ngoài
 DocType: Activity Cost,Projects,Dự án
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Vui lòng chọn năm tài chính
@@ -1147,7 +1154,7 @@
 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 +465,cannot be greater than 100,không có thể lớn hơn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,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 +583,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
@@ -1207,7 +1214,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Chính phủ.
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Mục Biến thể
 DocType: Company,Services,Dịch vụ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Tổng số ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Tổng số ({0})
 DocType: Cost Center,Parent Cost Center,Trung tâm Chi phí cha mẹ
 DocType: Sales Invoice,Source,Nguồn
 DocType: Leave Type,Is Leave Without Pay,Nếu không có được Leave Pay
@@ -1280,17 +1287,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Gửi lại Email Thanh toán
 DocType: Dependent Task,Dependent Task,Nhiệm vụ phụ thuộc
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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ụ
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Xem
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Thay đổi ròng trong Cash
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Thay đổi ròng trong Cash
 DocType: Salary Structure Deduction,Salary Structure Deduction,Cơ cấu tiền lương trích
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Yêu cầu thanh toán đã tồn tại {0}
 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 +182,Quantity must not be more than {0},Số lượng không phải lớn hơn {0}
@@ -1352,7 +1359,7 @@
 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: Packed 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
@@ -1361,7 +1368,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Công ty, tháng và năm tài chính là bắt buộc"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Chi phí tiếp thị
 ,Item Shortage Report,Thiếu mục Báo cáo
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Trọng lượng được đề cập, \n Xin đề cập đến ""Weight Ươm"" quá"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Trọng lượng được đề cập, \n Xin đề cập đến ""Weight Ươm"" quá"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Yêu cầu vật liệu sử dụng để làm cho nhập chứng khoán này
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Đơn vị duy nhất của một Item.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Giờ hàng loạt {0} phải được 'Gửi'
@@ -1372,6 +1379,7 @@
 DocType: Employee,Date Of Retirement,Trong ngày hưu trí
 DocType: Upload Attendance,Get Template,Nhận Mẫu
 DocType: Address,Postal,Bưu chính
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext Hoàn tất thiết lập!
 DocType: Item,Weightage,Weightage
 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
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Vui lòng chọn {0} đầu tiên.
@@ -1400,12 +1408,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Quá nhiều cột. Xuất báo cáo và in nó sử dụng một ứng dụng bảng tính.
 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 +139,Main,Chính
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Chính
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Biến thể
 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
 DocType: Employee Attendance Tool,Employees HTML,Nhân viên HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,Để dừng lại không thể bị hủy bỏ. Tháo nút để hủy bỏ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,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/stock/doctype/item/item.py +361,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ể
@@ -1430,7 +1438,6 @@
 DocType: Sales Order,To Deliver and Bill,Để Phân phối và Bill
 DocType: GL Entry,Credit Amount in Account Currency,Số tiền trong tài khoản ngoại tệ tín dụng
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Thời gian Logs cho sản xuất.
-DocType: Item,Apply Warehouse-wise Reorder Level,Áp dụng kho-khôn ngoan Reorder Cấp
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} phải được đệ trình
 DocType: Authorization Control,Authorization Control,Cho phép điều khiển
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Bị từ chối Warehouse là bắt buộc chống lại từ chối khoản {1}
@@ -1529,6 +1536,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,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} không được hoàn thành cho {2} qty thành phẩm trong sản xuất theo thứ tự # {3}. Vui lòng cập nhật trạng thái hoạt động thông qua Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Các khoản đầu tư
 DocType: Issue,Resolution Details,Độ phân giải chi tiết
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,phân bổ
 DocType: Quality Inspection Reading,Acceptance Criteria,Các tiêu chí chấp nhận
 DocType: Item Attribute,Attribute Name,Tên thuộc tính
 DocType: Item Group,Show In Website,Hiện Trong Website
@@ -1579,7 +1587,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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
 DocType: Leave Block List Allow,Leave Block List Allow,Để lại Block List phép
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr không thể để trống hoặc không gian
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr không thể để trống hoặc không gian
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Nhóm Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Thể thao
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Tổng số thực tế
@@ -1620,7 +1628,7 @@
 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 ** **.
 DocType: Opportunity,Customer / Lead Address,Khách hàng / Chì Địa chỉ
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Cảnh báo: Giấy chứng nhận SSL không hợp lệ vào luyến {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Cảnh báo: Giấy chứng nhận SSL không hợp lệ vào luyến {0}
 DocType: Production Order Operation,Actual Operation Time,Thời gian hoạt động thực tế
 DocType: Authorization Rule,Applicable To (User),Để áp dụng (Thành viên)
 DocType: Purchase Taxes and Charges,Deduct,Trích
@@ -1769,7 +1777,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Trường hợp số không thể là 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,Nếu bạn có đội ngũ bán hàng và bán Đối tác (Channel Partners) họ có thể được gắn và duy trì đóng góp của họ trong các hoạt động bán hàng
 DocType: Item,Show a slideshow at the top of the page,Hiển thị một slideshow ở trên cùng của trang
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Cửa hàng
+DocType: Item,"Allow in Sales Order of type ""Service""",Cho phép trong bán hàng đặt hàng của loại &quot;Dịch vụ&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Cửa hàng
 DocType: Time Log,Projects Manager,Quản lý dự án
 DocType: Serial No,Delivery Time,Thời gian giao hàng
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Người cao tuổi Dựa trên
@@ -1794,7 +1803,7 @@
 ,Financial Analytics,Analytics tài chính
 DocType: Quality Inspection,Verified By,Xác nhận bởi
 DocType: Address,Subsidiary,Công ty con
-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.","Không thể thay đổi tiền tệ mặc định của công ty, bởi vì có giao dịch hiện có. Giao dịch phải được hủy bỏ để thay đổi tiền tệ mặc định."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Không thể thay đổi tiền tệ mặc định của công ty, bởi vì có giao dịch hiện có. Giao dịch phải được hủy bỏ để thay đổi tiền tệ mặc định."
 DocType: Quality Inspection,Purchase Receipt No,Mua hóa đơn Không
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Tiền một cách nghiêm túc
 DocType: Process Payroll,Create Salary Slip,Tạo Mức lương trượt
@@ -1842,14 +1851,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Nguyên liệu thô không thể để trống.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Không thể cập nhật cổ phiếu, hóa đơn chứa chi tiết vận chuyển thả."
 DocType: Newsletter,Test,K.tra
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 &#39;Có tiếp Serial No&#39;, &#39;Có hàng loạt No&#39;, &#39;Liệu Cổ Mã&#39; và &#39;Phương pháp định giá&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Tạp chí nhanh chóng nhập
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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 +215,{0} {1} is not submitted,{0} {1} không nộp
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +215,{0} {1} is not submitted,{0} {1} chưa ghi sổ
 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
@@ -1951,7 +1960,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Hãy Delivery Note đầu tiên
 DocType: Purchase Invoice,Currency and Price List,Tiền tệ và Bảng giá
 DocType: Opportunity,Customer / Lead Name,Khách hàng / chì Tên
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Giải phóng mặt bằng ngày không được đề cập
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Giải phóng mặt bằng ngày không được đề cập
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Sản xuất
 DocType: Item,Allow Production Order,Cho phép sản xuất hàng
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Hàng {0}: Ngày bắt đầu phải trước khi kết thúc ngày
@@ -1961,7 +1970,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 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 +118,My Addresses,Địa chỉ của tôi
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Địa chỉ của tôi
 DocType: Stock Ledger Entry,Outgoing Rate,Tỷ Outgoing
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Chủ chi nhánh tổ chức.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,hoặc
@@ -2030,7 +2039,7 @@
 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 +302,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 +95,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.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,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
 DocType: Purchase Invoice,Taxes and Charges Deducted,Thuế và lệ phí được khấu trừ
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Vấn đề
@@ -2047,7 +2056,7 @@
 ,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 +499,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/setup_wizard/setup_wizard.py +392,Local,địa phương
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,Lớn
@@ -2066,7 +2075,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Tất cả mọi giao dịch bán hàng có thể được gắn với nhiều ** ** Người bán hàng để bạn có thể thiết lập và giám sát các mục tiêu.
 ,S.O. No.,SO số
 DocType: Production Order Operation,Make Time Log,Hãy Giờ
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Hãy thiết lập số lượng đặt hàng
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Hãy tạo khách hàng từ chì {0}
 DocType: Price List,Applicable for Countries,Áp dụng đối với các nước
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Máy tính
@@ -2153,7 +2161,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Được viết liên quan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Nhập kế toán cho Stock
 DocType: Sales Invoice,Sales Team1,Team1 bán hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Mục {0} không tồn tại
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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
 DocType: Payment Request,Recipient and Message,Người nhận và tin nhắn
 DocType: Purchase Invoice,Apply Additional Discount On,Áp dụng khác Giảm Ngày
@@ -2195,7 +2203,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Tỷ lệ định giá
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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
@@ -2233,7 +2241,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Vui lòng nhập ngày giảm.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Để lại chỉ ứng dụng với tình trạng 'chấp nhận' có thể được gửi
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Địa chỉ Tiêu đề là bắt buộc.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Địa chỉ Tiêu đề là bắt buộc.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Nhập tên của chiến dịch nếu nguồn gốc của cuộc điều tra là chiến dịch
 apps/erpnext/erpnext/setup/setup_wizard/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
@@ -2257,6 +2265,7 @@
 DocType: UOM,Must be Whole Number,Phải có nguyên số
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Lá mới phân bổ (Trong ngày)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Không nối tiếp {0} không tồn tại
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Kho hàng (Tùy chọn)
 DocType: Pricing Rule,Discount Percentage,Tỷ lệ phần trăm giảm giá
 DocType: Payment Reconciliation Invoice,Invoice Number,Số hóa đơn
 apps/erpnext/erpnext/hooks.py +55,Orders,Đơn đặt hàng
@@ -2366,7 +2375,7 @@
 DocType: Appraisal,Appraisal,Thẩm định
 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/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Ký Ủy quyền
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,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 +184,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
@@ -2535,7 +2544,7 @@
 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
 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 +733,Show tax break-up,Hiện thuế break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Hiện thuế break-up
 apps/erpnext/erpnext/accounts/party.py +283,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 '
@@ -2585,7 +2594,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,Hãy gõ lại tên công ty để xác nhận
@@ -2612,9 +2621,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Cơ cấu tiền lương
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Nhiều Giá Rule tồn tại với cùng một tiêu chí, xin vui lòng giải quyết xung đột bằng cách gán \
- ưu tiên. Quy định giá: {0}"
 DocType: Account,Bank,Tài khoản
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Hãng hàng không
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Vấn đề liệu
@@ -2639,7 +2645,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Chứng khoán và Sở Giao dịch hàng hóa
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Mặc định Đơn vị đo lường cho Variant &#39;{0}&#39; phải giống như trong Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Mặc định Đơn vị đo lường cho Variant &#39;{0}&#39; phải giống như trong Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Dựa trên tính toán
 DocType: Delivery Note Item,From Warehouse,Từ kho
 DocType: Purchase Taxes and Charges,Valuation and Total,Định giá và Tổng
@@ -2648,7 +2654,7 @@
 DocType: Account,Purchase User,Mua tài khoản
 DocType: Notification Control,Customize the Notification,Tùy chỉnh thông báo
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Lưu chuyển tiền tệ từ hoạt động
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Địa chỉ mặc định mẫu không thể bị xóa
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Địa chỉ mặc định mẫu không thể bị xóa
 DocType: Sales Invoice,Shipping Rule,Này ! Đi trước và thêm một địa chỉ
 DocType: Manufacturer,Limited to 12 characters,Hạn chế đến 12 ký tự
 DocType: Journal Entry,Print Heading,In nhóm
@@ -2742,7 +2748,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,Thương mại
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,Dịch vụ tuyệt vời
@@ -2761,7 +2767,7 @@
 DocType: Customer,Default Receivable Accounts,Mặc định thu khoản
 DocType: Tax Rule,Billing State,Thanh toán Nhà nước
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Truyền
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,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 +642,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 +95,Due Date is mandatory,Due Date là bắt buộc
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Tăng cho Attribute {0} không thể là 0
@@ -2794,7 +2800,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,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"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Lợi nhuận tạm thời / lỗ (tín dụng)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Lợi nhuận tạm thời / lỗ (tín dụng)
 DocType: Sales Invoice,Return Against Sales Invoice,Return Against Sales Invoice
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Mục 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Xin hãy thiết lập giá trị mặc định {0} trong Công ty {1}
@@ -2825,6 +2831,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Thêm trẻ em
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Vai trò Được phép Thiết lập Frozen Accounts & Edit Frozen Entries
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Không thể chuyển đổi Trung tâm Chi phí sổ cái vì nó có các nút con
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Giá trị khai mạc
 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,Hoa hồng trên doanh
 DocType: Offer Letter Term,Value / Description,Giá trị / Mô tả
@@ -2858,7 +2865,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Xóa thành công tất cả các giao dịch liên quan đến công ty này!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Như trên ngày
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Quản chế
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,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/hr/doctype/process_payroll/process_payroll.py +173,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}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto chèn tỷ Bảng giá nếu mất tích
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Tổng số tiền trả
@@ -2894,7 +2900,7 @@
 DocType: Payment Tool,Set Matching Amounts,Đặt khoản Matching
 DocType: Purchase Invoice,Taxes and Charges Added,Thuế và lệ phí nhập
 ,Sales Funnel,Kênh bán hàng
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Tên viết tắt là bắt buộc
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Tên viết tắt là bắt buộc
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Cảm ơn bạn đã quan tâm của bạn trong việc đăng ký vào các bản cập nhật của chúng tôi
 ,Qty to Transfer,Số lượng để chuyển
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Giá để chào hoặc khách hàng.
@@ -2921,8 +2927,8 @@
 ,Item-wise Price List Rate,Item-khôn ngoan Giá liệt kê Tỷ giá
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} là dừng lại
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,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 +221,{0} {1} is stopped,{0} {1} đã ngưng
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,sự kiện sắp tới
@@ -2945,7 +2951,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Chọn năm tài chính ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS hồ sơ cần thiết để làm cho POS nhập
 DocType: Hub Settings,Name Token,Tên Mã
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Tiêu chuẩn bán hàng
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Tiêu chuẩn bán hàng
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,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ế
@@ -3068,7 +3074,7 @@
 DocType: Sales Invoice,Paid Amount,Số tiền thanh toán
 ,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
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,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
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Số dư tài khoản đã được ghi nợ, bạn không được phép để thiết lập 'cân Must Be' là 'tín dụng'"
 apps/erpnext/erpnext/setup/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
@@ -3169,7 +3175,7 @@
 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 +19,Shortage Qty,Thiếu Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,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/doctype/item/item.py +564,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/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,Phải điền mục 'Đến ngày'
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Tạo phiếu đóng gói các gói sẽ được chuyển giao. Được sử dụng để thông báo cho số gói phần mềm, nội dung gói và trọng lượng của nó."
@@ -3180,7 +3186,7 @@
 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 +749,It is needed to fetch Item Details.,Nó là cần thiết để lấy hàng Chi tiết.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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
@@ -3206,6 +3212,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: C-Form,Series,Tùng thư
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,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: Item Group,Item Classification,Phân mục
@@ -3292,7 +3299,7 @@
 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 +434,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 +420,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."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Thạc sĩ Quản lý mua hàng
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Đặt hàng sản xuất {0} phải được gửi
@@ -3300,7 +3307,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Báo cáo chính
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Cho đến nay không có thể trước khi từ ngày
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Thêm / Sửa giá
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Đơn hàng của tôi
@@ -3348,7 +3355,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Row # {0}: Thiết lập Nhà cung cấp cho mặt hàng {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Hình ảnh trang web {0} đính kèm vào khoản {1} không thể được tìm thấy
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Hình ảnh trang web {0} đính kèm vào khoản {1} không thể được tìm thấy
 DocType: Issue,Content Type,Loại nội dung
 apps/erpnext/erpnext/setup/setup_wizard/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.
@@ -3362,7 +3369,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,'Có số serial' không thể 'Có' cho hàng hóa không nhập kho
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,'Có số serial' không thể 'Có' cho hàng hóa không nhập kho
 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
@@ -3388,7 +3395,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Đóng tài khoản {0} phải được loại trách nhiệm pháp lý / Vốn chủ sở hữu
 DocType: Authorization Rule,Based On,Dựa trên
 DocType: Sales Order Item,Ordered Qty,Số lượng đặt hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Mục {0} bị vô hiệu hóa
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +168,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ụ.
@@ -3396,7 +3403,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Mua phải được kiểm tra, nếu áp dụng Đối với được chọn là {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Giảm giá phải được ít hơn 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Viết Tắt Số tiền (Công ty tiền tệ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Row # {0}: Hãy thiết lập số lượng đặt hàng
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Row # {0}: Hãy thiết lập số lượng đặt hàng
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Chi phí hạ cánh
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Hãy đặt {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Lặp lại vào ngày của tháng
@@ -3469,7 +3476,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Bây giờ xem
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Chọn khoảng thời gian khi hóa đơn sẽ được tạo tự động
 DocType: BOM,Raw Material Cost,Chi phí nguyên liệu thô
-DocType: Item,Re-Order Level,Re-tự cấp
+DocType: Item Reorder,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.
 apps/erpnext/erpnext/setup/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
@@ -3524,7 +3531,7 @@
 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 +573,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 +559,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}
@@ -3603,7 +3610,7 @@
 DocType: Address,Office,Văn phòng
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Sổ nhật ký kế toán.
 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 +226,Please select Employee Record first.,Vui lòng chọn nhân viên ghi đầu tiên.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,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 +191,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 +240,Please enter Expense Account,Vui lòng nhập tài khoản chi phí
@@ -3678,7 +3685,7 @@
 DocType: Item Attribute,Numeric Values,Giá trị Số
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Logo đính kèm
 DocType: Customer,Commission Rate,Tỷ lệ hoa hồng
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Hãy Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Hãy Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Ngăn chặn các ứng dụng của bộ phận nghỉ.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Giỏ hàng rỗng
 DocType: Production Order,Actual Operating Cost,Thực tế Chi phí điều hành
@@ -3695,15 +3702,14 @@
 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 +380,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 +419,"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 +408,"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 +380, (Half Day),(Nửa ngày)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Được mục từ BOM
diff --git a/erpnext/translations/zh-cn.csv b/erpnext/translations/zh-cn.csv
index 9d69263..c0361ea 100644
--- a/erpnext/translations/zh-cn.csv
+++ b/erpnext/translations/zh-cn.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,％已记账
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),汇率必须一致{0} {1}（{2}）
 DocType: Sales Invoice,Customer Name,客户名称
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},银行账户不能命名为{0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},银行账户不能命名为{0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),杰出的{0}不能小于零（ {1} ）
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,新建假期申请
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,新建假期申请
 apps/erpnext/erpnext/setup/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,付款方式账户
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",用户对任务的操作记录，可以用来追踪时间和付款。
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},新{0}：#{1}
 ,Sales Partners Commission,销售合作伙伴佣金
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,缩写不能超过5个字符
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,缩写不能超过5个字符
 DocType: Payment Request,Payment Request,付钱请求
 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.",属性值{0}无法从{1}作为项目变体\删除存在这个属性。
@@ -195,6 +195,7 @@
 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 (%),折扣价目表率（％）
 DocType: Offer Letter,Select Terms and Conditions,选择条款和条件
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,输出值
 DocType: Production Planning Tool,Sales Orders,销售订单
 DocType: Purchase Taxes and Charges,Valuation,估值
 ,Purchase Order Trends,采购订单趋势
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,电视
 DocType: Production Order Operation,Updated via 'Time Log',通过“时间日志”更新
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},科目{0}不属于公司{1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},提前量不能大于{0} {1}
 DocType: Naming Series,Series List for this Transaction,此交易的系列列表
 DocType: Sales Invoice,Is Opening Entry,是否期初分录
 DocType: Customer Group,Mention if non-standard receivable account applicable,何况，如果不规范应收账款适用
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,依上述条件创建工资单
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,未提供描述
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,请求您的报价。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,只有选择的休假审批者可以提交此请假
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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}通过设置&gt;设置&gt;命名系列
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},仓库{0}不属于公司{1}
 DocType: Item Website Specification,Item Website Specification,品目网站规格
 DocType: Payment Tool,Reference No,参考编号
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,已禁止请假
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},品目{0}已经到达寿命终止日期{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,已禁止请假
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},品目{0}已经到达寿命终止日期{1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,全年
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,库存盘点品目
 DocType: Stock Entry,Sales Invoice No,销售发票编号
@@ -248,7 +250,7 @@
 DocType: Pricing Rule,Supplier Type,供应商类型
 DocType: Item,Publish in Hub,在发布中心
 ,Terretory,区域
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,品目{0}已取消
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,品目{0}已取消
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,物料申请
 DocType: Bank Reconciliation,Update Clearance Date,更新清拆日期
 DocType: Item,Purchase Details,购买详情
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,送货单
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,建立税
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,付款项被修改，你把它之后。请重新拉。
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0}输入两次税项
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,请选择年份和月份
@@ -327,7 +329,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,您的电子邮件地址
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,请参阅附件
 DocType: Purchase Order,% Received,％已收货
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,安装已经完成！
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,安装已经完成！
 ,Finished Goods,成品
 DocType: Delivery Note,Instructions,说明
 DocType: Quality Inspection,Inspected By,验货人
@@ -352,14 +354,13 @@
 ,Purchase Register,购买注册
 DocType: Landed Cost Item,Applicable Charges,适用费用
 DocType: Workstation,Consumable Cost,耗材成本
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} {1}必须有“假期审批人”的角色
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} {1}必须有“假期审批人”的角色
 DocType: Purchase Receipt,Vehicle Date,车日期
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,医药
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,原因丢失
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},工作站在以下假期关闭：{0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,机会
 DocType: Employee,Single,单身
-DocType: Issue,Attachment,附件
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,预算不能为集团成本中心成立
 DocType: Account,Cost of Goods Sold,销货成本
 DocType: Purchase Invoice,Yearly,每年
@@ -388,7 +389,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
 DocType: HR Settings,Employee record is created using selected field. ,使用所选字段创建员工记录。
 DocType: Sales Order,Not Applicable,不适用
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,假期大师
@@ -427,7 +428,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,化妆品
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
 DocType: Shipping Rule,Net Weight,净重
 DocType: Employee,Emergency Phone,紧急电话
 ,Serial No Warranty Expiry,序列号/保修到期
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,管理转包
 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,价目表货币转换为公司的基础货币后的单价
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},科目{0}不属于公司：{1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},科目{0}不属于公司：{1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,缩写已用于另一家公司
 DocType: Selling Settings,Default Customer Group,默认客户群组
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",如果禁用，“舍入总计”字段将不在交易中显示
 DocType: BOM,Operating Cost,营业成本
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,没有在发票表中找到记录
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,请选择公司和党的第一型
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,财务/会计年度。
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,累积值
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",抱歉，序列号无法合并
 DocType: Project Task,Project Task,项目任务
 ,Lead Id,线索ID
@@ -492,7 +495,7 @@
 DocType: Quotation,Quotation To,报价对象
 DocType: Lead,Middle Income,中等收入
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),开幕（CR ）
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,测度项目的默认单位{0}不能直接改变，因为你已经做了一些交易（S）与其他计量单位。您将需要创建一个新的项目，以使用不同的默认计量单位。
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,测度项目的默认单位{0}不能直接改变，因为你已经做了一些交易（S）与其他计量单位。您将需要创建一个新的项目，以使用不同的默认计量单位。
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,调配数量不能为负
 DocType: Purchase Order Item,Billed Amt,已开票金额
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,创建库存记录所依赖的逻辑仓库。
@@ -570,7 +573,7 @@
 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 +543,Item has variants.,项目已变种。
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,树类型
@@ -583,6 +586,7 @@
 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 +33,Goods received from Suppliers.,来自供应商的已收入成品。
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,在数值
 DocType: Lead,Campaign Name,活动名称
 ,Reserved,保留的
 DocType: Purchase Order,Supply Raw Materials,供应原料
@@ -597,16 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,有交易的科目不能被转换为分类账
 DocType: Delivery Note,Customer's Purchase Order No,客户的采购订单号
 DocType: Employee,Cell Number,手机号码
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,汽车材料的要求生成
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,汽车材料的要求生成
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丧失
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,您不能在“对日记账分录”列中选择此凭证。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,能源
 DocType: Opportunity,Opportunity From,从机会
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,月度工资结算
 DocType: Item Group,Website Specifications,网站规格
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},有一个在你的地址模板错误{0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,新建账户
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}：申请者{0} 假期类型{1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,行{0}：转换系数是强制性的
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海报价格规则，同样的标准存在，请分配优先级解决冲突。价格规则：{0}
 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.,会计分录可对叶节点。对组参赛作品是不允许的。
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,无法停用或取消BOM，因为它被其他BOM引用。
 DocType: Opportunity,Maintenance,维护
@@ -660,7 +666,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,价格列表没有选择
 DocType: Employee,Family Background,家庭背景
 DocType: Process Payroll,Send Email,发送电子邮件
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},警告：无效的附件{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},警告：无效的附件{0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,无此权限
 DocType: Company,Default Bank Account,默认银行账户
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",要根据党的筛选，选择党第一类型
@@ -690,13 +696,13 @@
 DocType: Production Planning Tool,Select Items,选择品目
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0}对日期为{2}的账单{1}
 DocType: Maintenance Visit,Completion Status,完成状态
-DocType: Sales Invoice Item,Target Warehouse,目标仓库
+DocType: Production Order,Target Warehouse,目标仓库
 DocType: Item,Allow over delivery or receipt upto this percent,允许在交付或接收高达百分之这
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,预计交货日期不能早于销售订单日期
 DocType: Upload Attendance,Import Attendance,导入考勤记录
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,所有品目群组
 DocType: Process Payroll,Activity Log,活动日志
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,净利润/亏损
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,净利润/亏损
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,在提交交易时自动编写信息。
 DocType: Production Order,Item To Manufacture,要生产的品目
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1}的状态为{2}
@@ -704,7 +710,7 @@
 DocType: Sales Order Item,Projected Qty,预计数量
 DocType: Sales Invoice,Payment Due Date,付款到期日
 DocType: Newsletter,Newsletter Manager,通讯经理
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,项目变种{0}已经具有相同属性的存在
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,项目变种{0}已经具有相同属性的存在
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',“打开”
 DocType: Notification Control,Delivery Note Message,送货单留言
 DocType: Expense Claim,Expenses,开支
@@ -714,7 +720,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,研究与发展
 ,Amount to Bill,帐单数额
 DocType: Company,Registration Details,报名详情
-DocType: Item,Re-Order Qty,再次订货数量
+DocType: Item Reorder,Re-Order Qty,再次订货数量
 DocType: Leave Block List Date,Leave Block List Date,禁离日日期
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},计划发送到{0}
 DocType: Pricing Rule,Price or Discount,价格或折扣
@@ -757,7 +763,7 @@
 DocType: Bank Reconciliation,Total Amount,总金额
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,互联网出版
 DocType: Production Planning Tool,Production Orders,生产订单
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,余额值
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,余额值
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,销售价格表
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,发布同步项目
 DocType: Bank Reconciliation,Account Currency,账户币种
@@ -766,7 +772,7 @@
 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 +538,Item Variants {0} updated,品目变种{0}已更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,品目变种{0}已更新
 DocType: Quality Inspection Reading,Reading 6,阅读6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,购买发票提前
 DocType: Address,Shop,商店
@@ -843,7 +849,7 @@
 DocType: POS Profile,Cash/Bank Account,现金/银行账户
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,删除的项目在数量或价值没有变化。
 DocType: Delivery Note,Delivery To,交货对象
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,属性表是强制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,折扣
@@ -871,7 +877,7 @@
 DocType: Tax Rule,Shipping State,运输状态
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,品目必须要由“从采购收据获取品目”添加
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,销售费用
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,标准采购
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,标准采购
 DocType: GL Entry,Against,针对
 DocType: Item,Default Selling Cost Center,默认销售成本中心
 DocType: Sales Partner,Implementation Partner,实施合作伙伴
@@ -913,7 +919,7 @@
 DocType: Sales Partner,Distributor,经销商
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,购物车配送规则
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,生产订单{0}必须取消这个销售订单之前被取消
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',请设置“收取额外折扣”
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',请设置“收取额外折扣”
 ,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.,选择时间记录然后提交来创建一个新的销售发票。
@@ -981,9 +987,9 @@
 DocType: Contact,User ID,用户ID
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,查看总帐
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已存在，请修改品目名或群组名
 DocType: Production Order,Manufacture against Sales Order,按销售订单生产
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,世界其他地区
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,工资总额
@@ -1013,7 +1019,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged",抱歉，公司不能合并
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged",抱歉，公司不能合并
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,小
 DocType: Employee,Employee Number,雇员编号
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},箱号已被使用，请尝试从{0}开始
@@ -1032,7 +1038,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,农业
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,您的产品或服务
 DocType: Mode of Payment,Mode of Payment,付款方式
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
 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,仓库联系方式
@@ -1104,6 +1110,7 @@
 DocType: Address,Utilities,公用事业
 DocType: Purchase Invoice Item,Accounting,会计
 DocType: Features Setup,Features Setup,功能设置
+DocType: Item,Is Service Item,是否服务品目
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,申请期间不能请假外分配周期
 DocType: Activity Cost,Projects,项目
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,请选择会计年度
@@ -1134,7 +1141,7 @@
 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 +465,cannot be greater than 100,不能大于100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,品目{0}不是库存品目
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,品目{0}不是库存品目
 DocType: Maintenance Visit,Unscheduled,计划外
 DocType: Employee,Owned,资
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,依赖于无薪休假
@@ -1193,7 +1200,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,政府
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,项目变体
 DocType: Company,Services,服务
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),总计（{0}）
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),总计（{0}）
 DocType: Cost Center,Parent Cost Center,父成本中心
 DocType: Sales Invoice,Source,源
 DocType: Leave Type,Is Leave Without Pay,是无薪休假
@@ -1266,17 +1273,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,重新发送付款电子邮件
 DocType: Dependent Task,Dependent Task,相关任务
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},类型为{0}的假期不能长于{1}天
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,消耗量
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0}查看
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,现金净变动
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,现金净变动
 DocType: Salary Structure Deduction,Salary Structure Deduction,薪酬结构扣款
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},付款申请已经存在{0}
 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 +182,Quantity must not be more than {0},数量不能超过{0}
@@ -1338,7 +1345,7 @@
 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: Packed Item,To Warehouse (Optional),仓库（可选）
 DocType: Sales Invoice,Paid Amount (Company Currency),支付的金额（公司货币）
 DocType: Purchase Invoice,Additional Discount,更多优惠
 DocType: Selling Settings,Selling Settings,销售设置
@@ -1347,7 +1354,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",公司，月度和财年是必须项
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,市场营销开支
 ,Item Shortage Report,品目短缺报告
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，\n请注明“重量计量单位”
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，\n请注明“重量计量单位”
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,创建此库存记录的物料申请
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,此品目的一件。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',时间日志批量{0}必须是'提交'
@@ -1358,6 +1365,7 @@
 DocType: Employee,Date Of Retirement,退休日期
 DocType: Upload Attendance,Get Template,获取模板
 DocType: Address,Postal,邮政
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext设置完成！
 DocType: Item,Weightage,权重
 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,同名的客户组已经存在，请更改客户姓名或重命名该客户组
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,请选择{0}第一。
@@ -1386,12 +1394,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,太多的列。导出报表，并使用电子表格应用程序进行打印。
 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 +139,Main,主
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,主
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,变体
 DocType: Naming Series,Set prefix for numbering series on your transactions,为交易设置编号系列的前缀
 DocType: Employee Attendance Tool,Employees HTML,HTML员工
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,已停止的订单无法取消，请先点击“重新开始”
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,默认BOM（{0}）必须是活动的这个项目或者其模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,变种
@@ -1416,7 +1424,6 @@
 DocType: Sales Order,To Deliver and Bill,为了提供与比尔
 DocType: GL Entry,Credit Amount in Account Currency,在账户币金额
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,时间日志制造。
-DocType: Item,Apply Warehouse-wise Reorder Level,使用仓库的再订购水平
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM{0}未提交
 DocType: Authorization Control,Authorization Control,授权控制
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒绝仓库是强制性的反对否决项{1}
@@ -1515,6 +1522,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,行＃{0}：操作{1}未完成的成品{2}在生产数量订单{3}。请通过时间日志更新运行状态
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,投资
 DocType: Issue,Resolution Details,详细解析
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,分配
 DocType: Quality Inspection Reading,Acceptance Criteria,验收标准
 DocType: Item Attribute,Attribute Name,属性名称
 DocType: Item Group,Show In Website,在网站上显示
@@ -1565,7 +1573,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,报销正在等待批准。只有开支审批人才能更改其状态。
 DocType: Purchase Invoice,Additional Discount Amount,额外的折扣金额
 DocType: Leave Block List Allow,Leave Block List Allow,例外用户
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,缩写不能为空或空格
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,缩写不能为空或空格
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,集团以非组
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,体育
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,实际总
@@ -1606,7 +1614,7 @@
 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**.,**财年**表示财政年度。所有的会计分录和其他重大交易将根据**财年**跟踪。
 DocType: Opportunity,Customer / Lead Address,客户/潜在客户地址
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},警告：附件无效的SSL证书{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},警告：附件无效的SSL证书{0}
 DocType: Production Order Operation,Actual Operation Time,实际操作时间
 DocType: Authorization Rule,Applicable To (User),适用于(用户)
 DocType: Purchase Taxes and Charges,Deduct,扣款
@@ -1755,7 +1763,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,箱号不能为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,如果你有销售团队和销售合作伙伴（渠道合作伙伴），你可以对其进行标记，同时管理他们的贡献。
 DocType: Item,Show a slideshow at the top of the page,在页面顶部显示幻灯片
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,仓库
+DocType: Item,"Allow in Sales Order of type ""Service""",允许在销售订单式“服务”
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,仓库
 DocType: Time Log,Projects Manager,项目经理
 DocType: Serial No,Delivery Time,交货时间
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,账龄基于
@@ -1780,7 +1789,7 @@
 ,Financial Analytics,财务分析
 DocType: Quality Inspection,Verified By,认证机构
 DocType: Address,Subsidiary,子机构
-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.",因为已有交易不能改变公司的默认货币，请先取消交易。
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",因为已有交易不能改变公司的默认货币，请先取消交易。
 DocType: Quality Inspection,Purchase Receipt No,购买收据号码
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,保证金
 DocType: Process Payroll,Create Salary Slip,建立工资单
@@ -1828,7 +1837,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,原材料不能为空。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.",无法更新库存，发票包含下降航运项目。
 DocType: Newsletter,Test,测试
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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 +459,Quick Journal Entry,快速日记帐分录
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,如果任何条目中引用了BOM，你不能更改其税率
@@ -1929,7 +1938,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,请送货单第一
 DocType: Purchase Invoice,Currency and Price List,货币和价格表
 DocType: Opportunity,Customer / Lead Name,客户/潜在客户名称
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,清拆日期未提及
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,清拆日期未提及
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,生产
 DocType: Item,Allow Production Order,允许生产订单
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,行{0} ：开始日期必须是之前结束日期
@@ -1939,7 +1948,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,总盈利
 DocType: Purchase Receipt,Time at which materials were received,收到材料在哪个时间
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,我的地址
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,我的地址
 DocType: Stock Ledger Entry,Outgoing Rate,传出率
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,组织分支主。
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,或
@@ -2008,7 +2017,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,管理客户群组
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,新建成本中心名称
 DocType: Leave Control Panel,Leave Control Panel,假期控制面板
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,没有找到默认的地址模板。请从设置 > 打印和品牌 >地址模板中创建一个。
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,没有找到默认的地址模板。请从设置 > 打印和品牌 >地址模板中创建一个。
 DocType: Appraisal,HR User,HR用户
 DocType: Purchase Invoice,Taxes and Charges Deducted,已扣除税费
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,问题
@@ -2025,7 +2034,7 @@
 ,Sales Browser,销售列表
 DocType: Journal Entry,Total Credit,总积分
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},警告：针对库存记录{2}存在另一个{0}＃{1}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,当地
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,大
@@ -2044,7 +2053,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的销售交易都可以标记多个**销售人员**，方便你设置和监控目标。
 ,S.O. No.,销售订单号
 DocType: Production Order Operation,Make Time Log,创建时间日志
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,请设置再订购数量
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},请牵头建立客户{0}
 DocType: Price List,Applicable for Countries,适用于国家
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,电脑
@@ -2119,7 +2127,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,获取相关条目
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,库存的会计分录
 DocType: Sales Invoice,Sales Team1,销售团队1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,品目{0}不存在
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,品目{0}不存在
 DocType: Sales Invoice,Customer Address,客户地址
 DocType: Payment Request,Recipient and Message,收件人和消息
 DocType: Purchase Invoice,Apply Additional Discount On,收取额外折扣
@@ -2161,7 +2169,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,估值率
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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,重命名日志
@@ -2199,7 +2207,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,请输入解除日期。
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,金额
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,只留下带有状态的应用“已批准” ，可以提交
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,地址标题是必须项。
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,地址标题是必须项。
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,如果询价的来源是活动的话请输入活动名称。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,报纸出版商
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,选择财政年度
@@ -2223,6 +2231,7 @@
 DocType: UOM,Must be Whole Number,必须是整数
 DocType: Leave Control Panel,New Leaves Allocated (In Days),新调配的假期(天数)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,序列号{0}不存在
+DocType: Sales Invoice Item,Customer Warehouse (Optional),客户仓库（可选）
 DocType: Pricing Rule,Discount Percentage,折扣百分比
 DocType: Payment Reconciliation Invoice,Invoice Number,发票号码
 apps/erpnext/erpnext/hooks.py +55,Orders,订单
@@ -2332,7 +2341,7 @@
 DocType: Appraisal,Appraisal,评估
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,日期重复
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,授权签字人
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},假期审批人有{0}的角色
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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,开始时间
@@ -2501,7 +2510,7 @@
 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 +733,Show tax break-up,展会税分手
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,展会税分手
 apps/erpnext/erpnext/accounts/party.py +283,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',如果贵司涉及生产活动，将启动品目的“是否生产”属性
@@ -2551,7 +2560,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,请确认重新输入公司名称
@@ -2578,8 +2587,6 @@
 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,入职日期必须大于出生日期
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,薪酬结构
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}",存在多个符合条件的价格列表，请指定优先级来解决冲突。价格列表{0}
 DocType: Account,Bank,银行
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空公司
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,发料
@@ -2604,7 +2611,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,证券及商品交易
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',测度变异的默认单位“{0}”必须是相同模板“{1}”
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',测度变异的默认单位“{0}”必须是相同模板“{1}”
 DocType: Shipping Rule,Calculate Based On,计算基于
 DocType: Delivery Note Item,From Warehouse,从仓库
 DocType: Purchase Taxes and Charges,Valuation and Total,估值与总计
@@ -2613,7 +2620,7 @@
 DocType: Account,Purchase User,购买用户
 DocType: Notification Control,Customize the Notification,自定义通知
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,运营现金流
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,默认地址模板不能删除
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,默认地址模板不能删除
 DocType: Sales Invoice,Shipping Rule,配送规则
 DocType: Manufacturer,Limited to 12 characters,限12个字符
 DocType: Journal Entry,Print Heading,打印标题
@@ -2706,7 +2713,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,项目明智的数据不适用于报价
 DocType: Project,Expected End Date,预计结束日期
 DocType: Appraisal Template,Appraisal Template Title,评估模板标题
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,广告
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,优质服务
@@ -2725,7 +2732,7 @@
 DocType: Customer,Default Receivable Accounts,默认应收账户(多个)
 DocType: Tax Rule,Billing State,计费状态
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,转让
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
 DocType: Authorization Rule,Applicable To (Employee),适用于(员工)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,截止日期是强制性的
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,增量属性{0}不能为0
@@ -2758,7 +2765,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,负评估价格是不允许的
 DocType: Holiday List,Weekly Off,周末
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",对例如2012，2012-13
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),临时溢利/（亏损）（信用）
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),临时溢利/（亏损）（信用）
 DocType: Sales Invoice,Return Against Sales Invoice,射向销售发票
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,项目5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},请设置在公司默认值{0} {1}
@@ -2789,6 +2796,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,添加子项
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,角色允许设置冻结帐户和编辑冷冻项
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,不能将成本中心转换为总账，因为它有子项。
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,开度值
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,序列号
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,销售佣金
 DocType: Offer Letter Term,Value / Description,值/说明
@@ -2822,7 +2830,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,成功删除与该公司相关的所有交易！
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,随着对日
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,缓刑
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,库存品目必须指定默认仓库。
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},支付工资的月{0}和年{1}
 DocType: Stock Settings,Auto insert Price List rate if missing,自动插入价目表率，如果丢失
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,总支付金额
@@ -2858,7 +2865,7 @@
 DocType: Payment Tool,Set Matching Amounts,设置相同的金额
 DocType: Purchase Invoice,Taxes and Charges Added,已添加的税费
 ,Sales Funnel,销售管道
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,缩写是强制性的
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,缩写是强制性的
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,感谢您的关注中订阅我们的更新
 ,Qty to Transfer,转移数量
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,向潜在客户或客户发出的报价。
@@ -2886,7 +2893,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,供应商报价
 DocType: Quotation,In Words will be visible once you save the Quotation.,大写金额将在报价单保存后显示。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1}已停止
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,即将举行的活动
@@ -2908,7 +2915,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,选择财政年度...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,需要POS资料，使POS进入
 DocType: Hub Settings,Name Token,名称令牌
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,标准销售
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,标准销售
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,必须选择至少一个仓库
 DocType: Serial No,Out of Warranty,超出保修期
 DocType: BOM Replace Tool,Replace,更换
@@ -3031,7 +3038,7 @@
 DocType: Sales Invoice,Paid Amount,支付的金额
 ,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,将此地址模板设置为默认，因为没有其他的默认项
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,将此地址模板设置为默认，因为没有其他的默认项
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",账户余额已设置为'借方'，不能设置为'贷方'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,质量管理
 DocType: Production Planning Tool,Filter based on customer,根据客户筛选
@@ -3132,7 +3139,7 @@
 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 +19,Shortage Qty,短缺数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,项目变种{0}存在具有相同属性
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,项目变种{0}存在具有相同属性
 DocType: Salary Slip,Salary Slip,工资单
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,“结束日期”必需设置
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",生成要发货品目的装箱单，包括包号，内容和重量。
@@ -3143,7 +3150,7 @@
 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 +749,It is needed to fetch Item Details.,这是需要获取项目详细信息。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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}已收到过
@@ -3169,6 +3176,7 @@
 DocType: BOM,Manufacturing User,生产用户
 DocType: Purchase Order,Raw Materials Supplied,供应的原料
 DocType: Purchase Invoice,Recurring Print Format,常用打印格式
+DocType: C-Form,Series,系列
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,预计交货日期不能早于采购订单日期
 DocType: Appraisal,Appraisal Template,评估模板
 DocType: Item Group,Item Classification,品目分类
@@ -3255,7 +3263,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.",不能更改状态为丧失，因为已有报价。
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,采购经理大师
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,生产订单{0}必须提交
@@ -3263,7 +3271,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,主报告
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,无效的主名称
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc的DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,添加/编辑价格
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,我的订单
@@ -3311,7 +3319,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},行＃{0}：设置供应商项目{1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物品{1}无法找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物品{1}无法找到
 DocType: Issue,Content Type,内容类型
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,电脑
 DocType: Item,List this Item in multiple groups on the website.,在网站上的多个组中显示此品目
@@ -3325,7 +3333,7 @@
 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},财年{1}中已多次输入科目{0}
 ,Average Commission Rate,平均佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'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,账户头
@@ -3351,7 +3359,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,关闭帐户{0}的类型必须是负债/权益
 DocType: Authorization Rule,Based On,基于
 DocType: Sales Order Item,Ordered Qty,订购数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,项目{0}无效
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,项目{0}无效
 DocType: Stock Settings,Stock Frozen Upto,库存冻结止
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},期间从和周期要日期强制性的经常性{0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,项目活动/任务。
@@ -3359,7 +3367,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",“适用于”为{0}时必须勾选“采购”
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,折扣必须小于100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),核销金额（公司货币）
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,行＃{0}：请设置再订购数量
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,行＃{0}：请设置再订购数量
 DocType: Landed Cost Voucher,Landed Cost Voucher,到岸成本凭证
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},请设置{0}
 DocType: Purchase Invoice,Repeat on Day of Month,重复上月的日
@@ -3432,7 +3440,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,立即查看
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,选择周期性发票生成的时间间隔
 DocType: BOM,Raw Material Cost,原材料成本
-DocType: Item,Re-Order Level,再次订货级别
+DocType: Item Reorder,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.,输入要生产的品目和数量或者下载物料清单。
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,兼任
 DocType: Employee,Applicable Holiday List,可申请假期列表
@@ -3487,7 +3495,7 @@
 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 +573,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3566,7 +3574,7 @@
 DocType: Address,Office,办公室
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,会计记账分录。
 DocType: Delivery Note Item,Available Qty at From Warehouse,可用数量从仓库
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,请选择员工记录第一。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,请选择员工记录第一。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,请输入您的费用帐户
@@ -3641,7 +3649,7 @@
 DocType: Item Attribute,Numeric Values,数字值
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,附加标志
 DocType: Customer,Commission Rate,佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,在Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,在Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,按部门禁止假期申请。
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,车是空的
 DocType: Production Order,Actual Operating Cost,实际运行成本
@@ -3658,15 +3666,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要设置订货点水平，项目必须购买项目或生产项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),（半天）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),（半天）
 DocType: Supplier,Credit Days,信用期
 DocType: Leave Type,Is Carry Forward,是否顺延假期
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,从物料清单获取品目
diff --git a/erpnext/translations/zh-tw.csv b/erpnext/translations/zh-tw.csv
index f91f9b7..5852f0a 100644
--- a/erpnext/translations/zh-tw.csv
+++ b/erpnext/translations/zh-tw.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,％已開立帳單
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),匯率必須一致{0} {1}（{2}）
 DocType: Sales Invoice,Customer Name,客戶名稱
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},銀行賬戶不能命名為{0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},銀行賬戶不能命名為{0}
 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 +173,Outstanding for {0} cannot be less than zero ({1}),傑出的{0}不能小於零（ {1} ）
@@ -47,7 +47,7 @@
 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/utilities/transaction_base.py +107,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 +206,New Leave Application,新假期申請
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,新假期申請
 apps/erpnext/erpnext/setup/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,支付帳戶模式
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",活動日誌由用戶對任務可用於跟踪時間，計費執行。
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},新{0}：＃{1}
 ,Sales Partners Commission,銷售合作夥伴佣金
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,縮寫不能有超過5個字符
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,縮寫不能有超過5個字符
 DocType: Payment Request,Payment Request,付錢請求
 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.",屬性值{0}無法從{1}作為項目變體\刪除存在這個屬性。
@@ -196,6 +196,7 @@
 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 (%),折扣價目表率（％）
 DocType: Offer Letter,Select Terms and Conditions,選擇條款和條件
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,輸出值
 DocType: Production Planning Tool,Sales Orders,銷售訂單
 DocType: Purchase Taxes and Charges,Valuation,計價
 ,Purchase Order Trends,採購訂單趨勢
@@ -208,6 +209,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,電視
 DocType: Production Order Operation,Updated via 'Time Log',通過“時間日誌”更新
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},帳戶{0}不屬於公司{1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},提前量不能大於{0} {1}
 DocType: Naming Series,Series List for this Transaction,本交易系列表
 DocType: Sales Invoice,Is Opening Entry,是開放報名
 DocType: Customer Group,Mention if non-standard receivable account applicable,何況，如果不規範應收賬款適用
@@ -227,7 +229,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,建立工資單上面提到的標準。
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,未提供描述
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,請求您的報價。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,只有選擇的休假審批者可以提交此請假
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,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/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}通過設置&gt;設置&gt;命名系列
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},倉庫{0}不屬於公司{1}
 DocType: Item Website Specification,Item Website Specification,項目網站規格
 DocType: Payment Tool,Reference No,參考編號
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,禁假的
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,禁假的
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,全年
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,庫存調整項目
 DocType: Stock Entry,Sales Invoice No,銷售發票號碼
@@ -249,7 +251,7 @@
 DocType: Pricing Rule,Supplier Type,供應商類型
 DocType: Item,Publish in Hub,在發布中心
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,項{0}將被取消
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,項{0}將被取消
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,物料需求
 DocType: Bank Reconciliation,Update Clearance Date,更新日期間隙
 DocType: Item,Purchase Details,採購詳情
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,送貨單
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,建立稅
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,付款項被修改，你把它之後。請重新拉。
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0}輸入兩次項目稅
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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,請選擇年份和月份
@@ -329,7 +331,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,您的電子郵件地址
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,請參閱附件
 DocType: Purchase Order,% Received,％ 已收
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,安裝已經完成！
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,安裝已經完成！
 ,Finished Goods,成品
 DocType: Delivery Note,Instructions,說明
 DocType: Quality Inspection,Inspected By,視察
@@ -354,14 +356,13 @@
 ,Purchase Register,購買註冊
 DocType: Landed Cost Item,Applicable Charges,相關費用
 DocType: Workstation,Consumable Cost,耗材成本
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',"{0}（{1}）必須有權限 ""假期審批“"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) 必須有權限 ""假期審批“"
 DocType: Purchase Receipt,Vehicle Date,車日期
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,醫療
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,原因丟失
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},工作站在以下日期關閉按假日列表：{0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,機會
 DocType: Employee,Single,單
-DocType: Issue,Attachment,附件
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,預算不能為集團成本中心成立
 DocType: Account,Cost of Goods Sold,銷貨成本
 DocType: Purchase Invoice,Yearly,每年
@@ -390,7 +391,7 @@
 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 +564,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
 DocType: HR Settings,Employee record is created using selected field. ,使用所選欄位創建員工記錄。
 DocType: Sales Order,Not Applicable,不適用
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,假日高手。
@@ -429,7 +430,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,化妝品
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items",若要合併，以下屬性必須為這兩個項目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items",若要合併，以下屬性必須為這兩個項目是相同的
 DocType: Shipping Rule,Net Weight,淨重
 DocType: Employee,Emergency Phone,緊急電話
 ,Serial No Warranty Expiry,序列號保修到期
@@ -440,7 +441,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,管理轉包
 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,價目表貨幣被換算成公司基礎貨幣的匯率
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},帳戶{0}不屬於公司：{1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},帳戶{0}不屬於公司：{1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,縮寫已用在另一家公司
 DocType: Selling Settings,Default Customer Group,預設客戶群組
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",如果禁用，“圓角總計”字段將不可見的任何交易
 DocType: BOM,Operating Cost,營業成本
@@ -452,7 +454,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +190,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0}在“通知\
 電子郵件地址”中是無效的電子郵件地址"
-DocType: Purchase Receipt,Add / Edit Taxes and Charges,新增／編輯稅金及費用
+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}，因為它採用的是現貨交易
@@ -476,6 +478,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,沒有在發票表中找到記錄
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,請選擇公司和黨的第一型
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,財務／會計年度。
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,累積值
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",對不起，序列號無法合併
 DocType: Project Task,Project Task,項目任務
 ,Lead Id,潛在客戶標識
@@ -497,7 +500,7 @@
 DocType: Quotation,Quotation To,報價到
 DocType: Lead,Middle Income,中等收入
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),開啟（Cr ）
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,測度項目的默認單位{0}不能直接改變，因為你已經做了一些交易（S）與其他計量單位。您將需要創建一個新的項目，以使用不同的默認計量單位。
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,測度項目的默認單位{0}不能直接改變，因為你已經做了一些交易（S）與其他計量單位。您將需要創建一個新的項目，以使用不同的默認計量單位。
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,分配金額不能為負
 DocType: Purchase Order Item,Billed Amt,已結算額
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,對這些庫存分錄帳進行的邏輯倉庫。
@@ -575,7 +578,7 @@
 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 +543,Item has variants.,項目已變種。
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,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,樹類型
@@ -588,6 +591,7 @@
 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 +33,Goods received from Suppliers.,從供應商收到貨。
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,在數值
 DocType: Lead,Campaign Name,活動名稱
 ,Reserved,保留的
 DocType: Purchase Order,Supply Raw Materials,供應原料
@@ -602,16 +606,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,帳戶與現有的交易不能被轉換為總賬
 DocType: Delivery Note,Customer's Purchase Order No,客戶的採購訂單編號
 DocType: Employee,Cell Number,手機號碼
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,汽車材料的要求生成
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,汽車材料的要求生成
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丟失
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,在您不能輸入電流券“對日記帳分錄”專欄
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,能源
 DocType: Opportunity,Opportunity From,機會從
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,月薪聲明。
 DocType: Item Group,Website Specifications,網站規格
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},有一個在你的地址模板錯誤{0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,新帳號
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}：從{0}類型{1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,列#{0}：轉換係數是強制性的
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海報價格規則，同樣的標準存在，請通過分配優先解決衝突。價格規則：{0}
 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.,會計分錄可針對葉節點。不允許針對組的分錄。
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,無法關閉或取消BOM，因為它是與其他材料明細表鏈接
 DocType: Opportunity,Maintenance,維護
@@ -673,7 +679,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,未選擇價格列表
 DocType: Employee,Family Background,家庭背景
 DocType: Process Payroll,Send Email,發送電子郵件
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},警告：無效的附件{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},警告：無效的附件{0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,無權限
 DocType: Company,Default Bank Account,預設銀行帳戶
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",要根據黨的篩選，選擇黨第一類型
@@ -703,13 +709,13 @@
 DocType: Production Planning Tool,Select Items,選擇項目
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0}針對帳單{1}日期{2}
 DocType: Maintenance Visit,Completion Status,完成狀態
-DocType: Sales Invoice Item,Target Warehouse,目標倉庫
+DocType: Production Order,Target Warehouse,目標倉庫
 DocType: Item,Allow over delivery or receipt upto this percent,允許在交付或接收高達百分之這
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,預計交貨日期不能早於銷售訂單日期
 DocType: Upload Attendance,Import Attendance,進口出席
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,所有項目群組
 DocType: Process Payroll,Activity Log,活動日誌
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,淨利／虧損
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,淨利／虧損
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,自動編寫郵件在提交交易。
 DocType: Production Order,Item To Manufacture,產品製造
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1}的狀態為{2}
@@ -717,7 +723,7 @@
 DocType: Sales Order Item,Projected Qty,預計數量
 DocType: Sales Invoice,Payment Due Date,付款到期日
 DocType: Newsletter,Newsletter Manager,通訊經理
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,項目變種{0}已經具有相同屬性的存在
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,項目變種{0}已經具有相同屬性的存在
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',“開放”
 DocType: Notification Control,Delivery Note Message,送貨單留言
 DocType: Expense Claim,Expenses,開支
@@ -727,7 +733,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,研究與發展
 ,Amount to Bill,帳單數額
 DocType: Company,Registration Details,註冊細節
-DocType: Item,Re-Order Qty,重新排序數量
+DocType: Item Reorder,Re-Order Qty,重新排序數量
 DocType: Leave Block List Date,Leave Block List Date,休假區塊清單日期表
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},要寄送給{0}的排程
 DocType: Pricing Rule,Price or Discount,價格或折扣
@@ -770,7 +776,7 @@
 DocType: Bank Reconciliation,Total Amount,總金額
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,互聯網出版
 DocType: Production Planning Tool,Production Orders,生產訂單
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,平衡值
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,平衡值
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,銷售價格表
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,發布同步項目
 DocType: Bank Reconciliation,Account Currency,賬戶幣種
@@ -779,7 +785,7 @@
 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 +538,Item Variants {0} updated,項目變種{0}更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,項目變種{0}更新
 DocType: Quality Inspection Reading,Reading 6,6閱讀
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,購買發票提前
 DocType: Address,Shop,店
@@ -856,7 +862,7 @@
 DocType: POS Profile,Cash/Bank Account,現金／銀行帳戶
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,刪除的項目在數量或價值沒有變化。
 DocType: Delivery Note,Delivery To,交貨給
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,屬性表是強制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,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/public/js/pos/pos.html +28,Discount,折扣
@@ -884,7 +890,7 @@
 DocType: Tax Rule,Shipping State,運輸狀態
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,項目必須使用'從採購入庫“按鈕進行添加
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,銷售費用
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,標準採購
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,標準採購
 DocType: GL Entry,Against,針對
 DocType: Item,Default Selling Cost Center,預設銷售成本中心
 DocType: Sales Partner,Implementation Partner,實施合作夥伴
@@ -926,7 +932,7 @@
 DocType: Sales Partner,Distributor,經銷商
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,購物車運輸規則
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,{0}生產單必須早於售貨單前取消
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',請設置“收取額外折扣”
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',請設置“收取額外折扣”
 ,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.,選擇時間日誌並提交以創建一個新的銷售發票。
@@ -994,9 +1000,9 @@
 DocType: Contact,User ID,使用者 ID
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,查看總帳
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"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 +431,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在，請更改項目名稱或重新命名該項目群組
 DocType: Production Order,Manufacture against Sales Order,對製造銷售訂單
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,世界其他地區
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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,工資總額
@@ -1026,7 +1032,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,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 +159,"Sorry, companies cannot be merged",對不起，企業不能合併
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged",對不起，企業不能合併
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,小
 DocType: Employee,Employee Number,員工人數
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},案例編號已在使用中（ S） 。從案例沒有嘗試{0}
@@ -1045,7 +1051,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,農業
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,您的產品或服務
 DocType: Mode of Payment,Mode of Payment,付款方式
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,網站形象應該是一個公共文件或網站網址
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,網站形象應該是一個公共文件或網站網址
 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,倉庫聯繫方式
@@ -1117,6 +1123,7 @@
 DocType: Address,Utilities,公用事業
 DocType: Purchase Invoice Item,Accounting,會計
 DocType: Features Setup,Features Setup,功能設置
+DocType: Item,Is Service Item,是服務項目
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,申請期間不能請假外分配週期
 DocType: Activity Cost,Projects,專案
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,請選擇會計年度
@@ -1147,7 +1154,7 @@
 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 +465,cannot be greater than 100,不能大於100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,項{0}不是缺貨登記
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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 +1213,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,政府
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,項目變體
 DocType: Company,Services,服務
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),總計（{0}）
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),總計（{0}）
 DocType: Cost Center,Parent Cost Center,父成本中心
 DocType: Sales Invoice,Source,源
 DocType: Leave Type,Is Leave Without Pay,是無薪休假
@@ -1279,17 +1286,17 @@
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,重新發送付款電子郵件
 DocType: Dependent Task,Dependent Task,相關任務
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,Leave of type {0} cannot be longer than {1},請假類型{0}不能長於{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +177,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,消耗量
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0}查看
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,現金淨變動
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,現金淨變動
 DocType: Salary Structure Deduction,Salary Structure Deduction,薪酬結構演繹
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},付款申請已經存在{0}
 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 +182,Quantity must not be more than {0},數量必須不超過{0}
@@ -1351,7 +1358,7 @@
 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: Packed Item,To Warehouse (Optional),倉庫（可選）
 DocType: Sales Invoice,Paid Amount (Company Currency),支付的金額（公司貨幣）
 DocType: Purchase Invoice,Additional Discount,更多優惠
 DocType: Selling Settings,Selling Settings,銷售設置
@@ -1360,7 +1367,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",公司、月分與財務年度是必填的
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,市場推廣開支
 ,Item Shortage Report,商品短缺報告
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，請同時註明“重量計量單位”
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，請同時註明“重量計量單位”
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,做此存貨分錄所需之物料需求
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,該產品的一個單元。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',時間日誌批量{0}必須是'提交'
@@ -1371,6 +1378,7 @@
 DocType: Employee,Date Of Retirement,退休日
 DocType: Upload Attendance,Get Template,獲取模板
 DocType: Address,Postal,郵政
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext設置完成！
 DocType: Item,Weightage,權重
 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,客戶群組存在相同名稱，請更改客戶名稱或重新命名客戶群組
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,請先選擇{0}。
@@ -1399,12 +1407,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,過多的列數。請導出報表，並使用試算表程式進行列印。
 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 +139,Main,主頁
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,主頁
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,變種
 DocType: Naming Series,Set prefix for numbering series on your transactions,為你的交易編號序列設置的前綴
 DocType: Employee Attendance Tool,Employees HTML,員工HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,已停止訂單無法取消。 撤銷停止再取消。
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,預設BOM（{0}）必須是活動的這個項目或者其模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,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,變種
@@ -1429,7 +1437,6 @@
 DocType: Sales Order,To Deliver and Bill,準備交貨及開立發票
 DocType: GL Entry,Credit Amount in Account Currency,在賬戶幣金額
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,時間日誌製造。
-DocType: Item,Apply Warehouse-wise Reorder Level,適用於倉庫明智的重新排序水平
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0}必須提交
 DocType: Authorization Control,Authorization Control,授權控制
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒絕倉庫是強制性的反對否決項{1}
@@ -1528,6 +1535,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,行＃{0}：操作{1}未完成的成品{2}在生產數量訂單{3}。請通過時間日誌更新運行狀態
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,投資
 DocType: Issue,Resolution Details,詳細解析
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,分配
 DocType: Quality Inspection Reading,Acceptance Criteria,驗收標準
 DocType: Item Attribute,Attribute Name,屬性名稱
 DocType: Item Group,Show In Website,顯示在網站
@@ -1546,7 +1554,7 @@
 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/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,重複客戶收入
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0}（{1}）必須有權限 “費用審批”
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 必須有權限 “支出審批”
 apps/erpnext/erpnext/public/js/setup_wizard.js +292,Pair,對
 DocType: Bank Reconciliation Detail,Against Account,針對帳戶
 DocType: Maintenance Schedule Detail,Actual Date,實際日期
@@ -1578,7 +1586,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,使項目所需的質量保證和質量保證在沒有採購入庫單
 DocType: Purchase Invoice,Additional Discount Amount,額外的折扣金額
 DocType: Leave Block List Allow,Leave Block List Allow,休假區塊清單准許
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,縮寫不能為空或空間
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,縮寫不能為空或空間
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,集團以非組
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,體育
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,實際總計
@@ -1619,7 +1627,7 @@
 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**.,**財年**表示財政年度。所有的會計輸入項目和其他重大交易針對**財年**進行追蹤。
 DocType: Opportunity,Customer / Lead Address,客戶/鉛地址
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},警告：附件無效的SSL證書{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},警告：附件無效的SSL證書{0}
 DocType: Production Order Operation,Actual Operation Time,實際操作時間
 DocType: Authorization Rule,Applicable To (User),適用於（用戶）
 DocType: Purchase Taxes and Charges,Deduct,扣除
@@ -1768,7 +1776,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,案號不能為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,如果你有銷售團隊和銷售合作夥伴（渠道合作夥伴），他們可以被標記，並維持其在銷售貢獻活動
 DocType: Item,Show a slideshow at the top of the page,顯示幻燈片在頁面頂部
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,商店
+DocType: Item,"Allow in Sales Order of type ""Service""",允許在銷售訂單式“服務”
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,商店
 DocType: Time Log,Projects Manager,項目經理
 DocType: Serial No,Delivery Time,交貨時間
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,老齡化基於
@@ -1793,7 +1802,7 @@
 ,Financial Analytics,財務分析
 DocType: Quality Inspection,Verified By,認證機構
 DocType: Address,Subsidiary,副
-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.",不能改變公司的預設貨幣，因為有存在的交易。交易必須取消更改預設貨幣。
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",不能改變公司的預設貨幣，因為有存在的交易。交易必須取消更改預設貨幣。
 DocType: Quality Inspection,Purchase Receipt No,採購入庫單編號
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,保證金
 DocType: Process Payroll,Create Salary Slip,建立工資單
@@ -1836,12 +1845,13 @@
 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.,請確保你真的要刪除這家公司的所有交易。主數據將保持原樣。這個動作不能撤消。
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},無效的參考{0} {1}
 DocType: Payment Tool,Total Payment Amount,總付款金額
-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}）不能大於計劃數量（{2}）生產訂單的{3}
+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})不能大於計劃數量
+({2})生產訂單的 {3}"
 DocType: Shipping Rule,Shipping Rule Label,送貨規則標籤
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,原材料不能為空。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.",無法更新庫存，發票包含下降航運項目。
 DocType: Newsletter,Test,測試
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'",由於有存量交易為這個項目，\你不能改變的值&#39;有序列號&#39;，&#39;有批號&#39;，&#39;是股票項目“和”評估方法“
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,快速日記帳分錄
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,你不能改變速度，如果BOM中提到反對的任何項目
@@ -1863,7 +1873,7 @@
 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 +736,Item or Warehouse for row {0} does not match Material Request,行{0}的項目或倉庫不符合物料需求
 apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,計量單位
-DocType: Fiscal Year,Year End Date,年結日
+DocType: Fiscal Year,Year End Date,年結結束日期
 DocType: Task Depends On,Task Depends On,任務取決於
 DocType: Lead,Opportunity,機會
 DocType: Salary Structure Earning,Salary Structure Earning,薪酬結構盈利
@@ -1950,7 +1960,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,請送貨單第一
 DocType: Purchase Invoice,Currency and Price List,貨幣和價格表
 DocType: Opportunity,Customer / Lead Name,客戶/鉛名稱
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,清拆日期未提及
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,清拆日期未提及
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,生產
 DocType: Item,Allow Production Order,允許生產訂單
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,列#{0}：開始日期必須早於結束日期
@@ -1960,7 +1970,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,總盈利
 DocType: Purchase Receipt,Time at which materials were received,物料收到的時間
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,我的地址
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,我的地址
 DocType: Stock Ledger Entry,Outgoing Rate,傳出率
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,組織分支主檔。
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,或
@@ -2029,7 +2039,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,管理客戶群組樹。
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,新的成本中心名稱
 DocType: Leave Control Panel,Leave Control Panel,休假控制面板
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,無預設的地址模板。請從設定＞列印與品牌＞地址模板 新增之。
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,無預設的地址模板。請從設定＞列印與品牌＞地址模板 新增之。
 DocType: Appraisal,HR User,HR用戶
 DocType: Purchase Invoice,Taxes and Charges Deducted,稅收和費用扣除
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,問題
@@ -2046,7 +2056,7 @@
 ,Sales Browser,銷售瀏覽器
 DocType: Journal Entry,Total Credit,貸方總額
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},警告：另一個{0}＃{1}存在對股票入門{2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,當地
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,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/setup_wizard/install_fixtures.py +147,Large,大
@@ -2065,7 +2075,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的銷售交易，可以用來標記針對多個**銷售**的人，這樣你可以設置和監控目標。
 ,S.O. No.,SO號
 DocType: Production Order Operation,Make Time Log,讓時間日誌
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,請設置再訂購數量
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},請牽頭建立客戶{0}
 DocType: Price List,Applicable for Countries,適用於國家
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,電腦
@@ -2152,7 +2161,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,獲取相關條目
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,存貨的會計分錄
 DocType: Sales Invoice,Sales Team1,銷售團隊1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,項目{0}不存在
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,項目{0}不存在
 DocType: Sales Invoice,Customer Address,客戶地址
 DocType: Payment Request,Recipient and Message,收件人和消息
 DocType: Purchase Invoice,Apply Additional Discount On,收取額外折扣
@@ -2194,7 +2203,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,估值率
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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,重命名日誌
@@ -2232,7 +2241,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,請輸入解除日期。
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,AMT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,只允許提交狀態為「已批准」的休假申請
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,地址標題是強制性的。
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,地址標題是強制性的。
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,輸入活動的名稱，如果查詢來源是運動
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,報紙出版商
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,選擇財政年度
@@ -2256,6 +2265,7 @@
 DocType: UOM,Must be Whole Number,必須是整數
 DocType: Leave Control Panel,New Leaves Allocated (In Days),新的排假（天）
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,序列號{0}不存在
+DocType: Sales Invoice Item,Customer Warehouse (Optional),客戶倉庫（可選）
 DocType: Pricing Rule,Discount Percentage,折扣百分比
 DocType: Payment Reconciliation Invoice,Invoice Number,發票號碼
 apps/erpnext/erpnext/hooks.py +55,Orders,訂單
@@ -2365,7 +2375,7 @@
 DocType: Appraisal,Appraisal,評價
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,日期重複
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,授權簽字人
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},休假審批人必須是一個{0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,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,開始時間
@@ -2534,7 +2544,7 @@
 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 +733,Show tax break-up,展會稅分手
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,展會稅分手
 apps/erpnext/erpnext/accounts/party.py +283,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',如果您涉及製造活動。啟動項目「製造的」
@@ -2584,7 +2594,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,請確認重新輸入公司名稱
@@ -2611,9 +2621,6 @@
 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,加入日期必須大於出生日期
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,薪酬結構
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","多次價格規則存在著同樣的標準，請解決衝突\
-通過分配優先級。價格規則：{0}"
 DocType: Account,Bank,銀行
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空公司
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,發行材料
@@ -2628,7 +2635,7 @@
 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",如果你有很長的列印格式，這個功能可以被用來分割要列印多個頁面，每個頁面上的所有頁眉和頁腳的頁
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,所有的領土
 DocType: Purchase Invoice,Items,項目
-DocType: Fiscal Year,Year Name,今年名稱
+DocType: Fiscal Year,Year Name,年結名稱
 DocType: Process Payroll,Process Payroll,處理工資
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +77,There are more holidays than working days this month.,還有比這個月工作日更多的假期。
 DocType: Product Bundle Item,Product Bundle Item,產品包項目
@@ -2638,7 +2645,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/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,證券及商品交易所
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',測度變異的默認單位“{0}”必須是相同模板“{1}”
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',測度變異的默認單位“{0}”必須是相同模板“{1}”
 DocType: Shipping Rule,Calculate Based On,計算的基礎上
 DocType: Delivery Note Item,From Warehouse,從倉庫
 DocType: Purchase Taxes and Charges,Valuation and Total,估值與總計
@@ -2647,7 +2654,7 @@
 DocType: Account,Purchase User,購買用戶
 DocType: Notification Control,Customize the Notification,自定義通知
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,運營現金流
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,預設地址模板不能被刪除
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,預設地址模板不能被刪除
 DocType: Sales Invoice,Shipping Rule,送貨規則
 DocType: Manufacturer,Limited to 12 characters,限12個字符
 DocType: Journal Entry,Print Heading,列印標題
@@ -2741,7 +2748,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,項目明智的數據不適用於報價
 DocType: Project,Expected End Date,預計結束日期
 DocType: Appraisal Template,Appraisal Template Title,評估模板標題
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,商業
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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/setup_wizard/data/sample_home_page.html +14,Awesome Services,真棒服務
@@ -2760,7 +2767,7 @@
 DocType: Customer,Default Receivable Accounts,預設應收帳款
 DocType: Tax Rule,Billing State,計費狀態
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,轉讓
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM（包括子組件）
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM（包括子組件）
 DocType: Authorization Rule,Applicable To (Employee),適用於（員工）
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,截止日期是強制性的
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,增量屬性{0}不能為0
@@ -2793,7 +2800,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,負面評價率是不允許的
 DocType: Holiday List,Weekly Off,每週關閉
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",對於例如2012、2012-13
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),臨時溢利/（虧損）（信用）
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),臨時溢利/（虧損）（信用）
 DocType: Sales Invoice,Return Against Sales Invoice,射向銷售發票
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,項目5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},請在公司{1}下設定預設值{0}
@@ -2824,6 +2831,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,新增子項目
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,允許設定凍結帳戶和編輯凍結分錄的角色
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,不能成本中心轉換為總賬，因為它有子節點
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,開度值
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,序列號
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,銷售佣金
 DocType: Offer Letter Term,Value / Description,值/說明
@@ -2857,7 +2865,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,成功刪除與該公司相關的所有交易！
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,隨著對日
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,緩刑
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,預設倉庫對庫存項目是強制性的。
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},{1}年{0}月的薪資支付
 DocType: Stock Settings,Auto insert Price List rate if missing,自動插入價目表率，如果丟失
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,總支付金額
@@ -2893,7 +2900,7 @@
 DocType: Payment Tool,Set Matching Amounts,設置相同的金額
 DocType: Purchase Invoice,Taxes and Charges Added,稅費上架
 ,Sales Funnel,銷售漏斗
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,縮寫是強制性的
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,縮寫是強制性的
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,感謝您的關注中訂閱我們的更新
 ,Qty to Transfer,轉移數量
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,行情到引線或客戶。
@@ -2921,7 +2928,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,供應商報價
 DocType: Quotation,In Words will be visible once you save the Quotation.,報價一被儲存，就會顯示出來。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1}已停止
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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 +40,Upcoming Events,活動預告
@@ -2944,7 +2951,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,選擇會計年度...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,所需的POS資料，使POS進入
 DocType: Hub Settings,Name Token,名令牌
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,標準銷售
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,標準銷售
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,至少要有一間倉庫
 DocType: Serial No,Out of Warranty,超出保修期
 DocType: BOM Replace Tool,Replace,更換
@@ -3014,7 +3021,7 @@
 DocType: Opportunity,Opportunity Date,機會日期
 DocType: Purchase Receipt,Return Against Purchase Receipt,採購入庫的退貨
 DocType: Purchase Order,To Bill,發票待輸入
-DocType: Material Request,% Ordered,％有序
+DocType: Material Request,% Ordered,% 已排序
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,計件工作
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,平均。買入價
 DocType: Task,Actual Time (in Hours),實際時間（小時）
@@ -3041,7 +3048,7 @@
 DocType: Production Order Operation,Production Order Operation,生產訂單操作
 DocType: Pricing Rule,Disable,關閉
 DocType: Project Task,Pending Review,待審核
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +122, Click here to pay,點擊這裡要
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +122, Click here to pay,點擊這裡付款
 DocType: Task,Total Expense Claim (via Expense Claim),總費用報銷（通過費用報銷）
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,客戶ID
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,馬克缺席
@@ -3067,7 +3074,7 @@
 DocType: Sales Invoice,Paid Amount,支付的金額
 ,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,設置此地址模板為預設當沒有其它的預設值
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,設置此地址模板為預設當沒有其它的預設值
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",帳戶餘額已歸為借記帳戶，不允許設為信用帳戶
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,品質管理
 DocType: Production Planning Tool,Filter based on customer,過濾器可根據客戶
@@ -3168,7 +3175,7 @@
 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 +19,Shortage Qty,短缺數量
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
 DocType: Salary Slip,Salary Slip,工資單
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,“至日期”是必需填寫的
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",產生交貨的包裝單。用於通知箱號，內容及重量。
@@ -3179,7 +3186,7 @@
 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 +749,It is needed to fetch Item Details.,這是需要獲取項目詳細信息。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,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}已收到
@@ -3205,6 +3212,7 @@
 DocType: BOM,Manufacturing User,製造業用戶
 DocType: Purchase Order,Raw Materials Supplied,提供供應商
 DocType: Purchase Invoice,Recurring Print Format,經常打印格式
+DocType: C-Form,Series,系列
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,預計交貨日期不能早於採購訂單日期
 DocType: Appraisal,Appraisal Template,評估模板
 DocType: Item Group,Item Classification,項目分類
@@ -3291,7 +3299,7 @@
 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 +434,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一個重新排序條目已存在這個倉庫{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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.",不能聲明為丟失，因為報價已經取得進展。
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,採購主檔經理
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,生產訂單{0}必須提交
@@ -3299,7 +3307,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,主報告
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,無效的主名稱
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc的DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,新增/編輯價格
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,我的訂單
@@ -3347,7 +3355,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},行＃{0}：設置供應商項目{1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,網站圖像{0}附加到物品{1}無法找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,網站圖像{0}附加到物品{1}無法找到
 DocType: Issue,Content Type,內容類型
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,電腦
 DocType: Item,List this Item in multiple groups on the website.,列出這個項目在網站上多個組。
@@ -3361,7 +3369,7 @@
 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 +357,'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'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,帳戶頭
@@ -3387,7 +3395,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,關閉帳戶{0}的類型必須是負債/權益
 DocType: Authorization Rule,Based On,基於
 DocType: Sales Order Item,Ordered Qty,訂購數量
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,項目{0}無效
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,項目{0}無效
 DocType: Stock Settings,Stock Frozen Upto,存貨凍結到...為止
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},期間從和週期要日期強制性的經常性{0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,專案活動／任務。
@@ -3395,7 +3403,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",採購必須進行檢查，如果適用於被選擇為{0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,折扣必須小於100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),核銷金額（公司貨幣）
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,行＃{0}：請設置再訂購數量
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,行＃{0}：請設置再訂購數量
 DocType: Landed Cost Voucher,Landed Cost Voucher,到岸成本憑證
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},請設置{0}
 DocType: Purchase Invoice,Repeat on Day of Month,在月內的一天重複
@@ -3468,7 +3476,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,立即觀看
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,選擇發票會自動生成期間
 DocType: BOM,Raw Material Cost,原材料成本
-DocType: Item,Re-Order Level,重新排序級別
+DocType: Item Reorder,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.,輸入您想要提高生產訂單或下載的原材料進行分析的項目和計劃數量。
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,兼任
 DocType: Employee,Applicable Holiday List,適用假期表
@@ -3523,7 +3531,7 @@
 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 +573,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,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}
@@ -3557,7 +3565,7 @@
 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 +95,{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),根據活動類型計費率（每小時）
@@ -3566,12 +3574,12 @@
 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 +462,Debit Account,借方科目
-DocType: Fiscal Year,Year Start Date,今年開始日期
+DocType: Fiscal Year,Year Start Date,年結開始日期
 DocType: Attendance,Employee Name,員工姓名
 DocType: Sales Invoice,Rounded Total (Company Currency),整數總計（公司貨幣）
 apps/erpnext/erpnext/accounts/doctype/account/account.py +95,Cannot covert to Group because Account Type is selected.,不能隱蔽到組，因為帳戶類型選擇的。
 DocType: Purchase Common,Purchase Common,採購普通
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +94,{0} {1} has been modified. Please refresh.,{0} {1}已修改。請更新。
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +94,{0} {1} has been modified. Please refresh.,{0} {1} 已修改。請更新。
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,停止用戶在下面日期提出休假申請。
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,員工福利
 DocType: Sales Invoice,Is POS,是POS機
@@ -3602,7 +3610,7 @@
 DocType: Address,Office,辦公室
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,會計日記帳分錄。
 DocType: Delivery Note Item,Available Qty at From Warehouse,可用數量從倉庫
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,請選擇員工記錄第一。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,請選擇員工記錄第一。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,請輸入您的費用帳戶
@@ -3677,7 +3685,7 @@
 DocType: Item Attribute,Numeric Values,數字值
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,附加標誌
 DocType: Customer,Commission Rate,佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,在Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,在Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,按部門封鎖請假申請。
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,車是空的
 DocType: Production Order,Actual Operating Cost,實際運行成本
@@ -3694,15 +3702,14 @@
 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 +380,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 +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要設置訂貨點水平，項目必須購買項目或生產項目
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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 +380, (Half Day),（半天）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),（半天）
 DocType: Supplier,Credit Days,信貸天
 DocType: Leave Type,Is Carry Forward,是弘揚
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,從物料清單獲取項目