[translations]
diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv
index cb07383..0f570c1 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Плата режим
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Изаберите мјесечни, ако желите да пратите на основу сезонског."
 DocType: Employee,Divorced,Разведен
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Упозорење: Исти предмет је ушао више пута.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Упозорење: Исти предмет је ушао више пута.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Ставке које се већ синхронизовано
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Дозволите тачка треба додати више пута у трансакцији
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Одбацити Материјал Посетите {0} пре отказивања ове гаранцији
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Производи широке потрошње
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Производи широке потрошње
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Молимо Вас да одаберете Парти Типе први
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Прекаљивање
 DocType: Item,Customer Items,Предмети Цустомер
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Рачун {0}: {1 Родитељ рачун} не може бити књига
 DocType: Item,Publish Item to hub.erpnext.com,Објављивање ставку да хуб.ерпнект.цом
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Вебсајт
 DocType: POS Profile,Applicable for User,Важи за кориснике
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Стоппед Производња поредак не може бити поништен, то Унстоп прво да откажете"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Набијања плус синтерирање
 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/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Од материјала захтеву
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,Од материјала захтеву
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Дрво
 DocType: Job Applicant,Job Applicant,Посао захтева
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Нема више резултата.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,правни
+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,Обавезно Би
@@ -43,7 +41,6 @@
 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,Серия Обновлено Успешно
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Шивење
 DocType: Pricing Rule,Apply On,Нанесите на
 DocType: Item Price,Multiple Item prices.,Више цене аукцији .
 ,Purchase Order Items To Be Received,Налог за куповину ставке које се примају
@@ -51,8 +48,8 @@
 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 +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ред # {0}: курс мора да буде исти као {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Нова апликација одсуство
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Банка Нацрт
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,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,Начин плаћања налог
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Схов Варијанте
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Производња план шифра
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Пользователь {0} уже назначен Employee {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Направите нови ПОС Профиле
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,здравство
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,здравство
 DocType: Purchase Invoice,Monthly,Месечно
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Кашњење у плаћању (Дани)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичност
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Е-маил адреса
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,одбрана
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Е-маил адреса
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,одбрана
 DocType: Company,Abbr,Аббр
 DocType: Appraisal Goal,Score (0-5),Оцена (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Ров {0}: {1} {2} не поклапа са {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Ров # {0}:
 DocType: Delivery Note,Vehicle No,Нема возила
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Изаберите Ценовник
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Обрада дрвета
 DocType: Production Order Operation,Work In Progress,Ворк Ин Прогресс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3Д штампање
 DocType: Employee,Holiday List,Холидаи Листа
 DocType: Time Log,Time Log,Време Лог
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,рачуновођа
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,рачуновођа
 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.","Лог активности обављају корисници против Задаци који се могу користити за праћење времена, наплату."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Количина Затражено за куповину
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Причврстите .цсв датотеку са две колоне, једна за старим именом и један за ново име"
 DocType: Packed Item,Parent Detail docname,Родитељ Детаљ доцнаме
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,кг
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,кг
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Отварање за посао.
 DocType: Item Attribute,Increment,Повећање
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Изабери Варехоусе ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,оглашавање
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,оглашавање
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Иста компанија је ушла у више наврата
 DocType: Employee,Married,Ожењен
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
 DocType: Payment Reconciliation,Reconcile,помирити
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,бакалница
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,бакалница
 DocType: Quality Inspection Reading,Reading 1,Читање 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Маке Банк Ентри
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Пензиони фондови
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пензиони фондови
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Магацин је обавезна ако аццоунт типе Магацин
 DocType: SMS Center,All Sales Person,Све продаје Особа
 DocType: Lead,Person Name,Особа Име
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Гет Детаљи Спецификација
 DocType: Lead,Interested,Заинтересован
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Счет за материалы
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Отварање
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Отварање
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Од {0} {1} да
 DocType: Item,Copy From Item Group,Копирање из ставке групе
 DocType: Journal Entry,Opening Entry,Отварање Ентри
@@ -145,23 +141,22 @@
 DocType: Employee Education,Under Graduate,Под Дипломац
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Циљна На
 DocType: BOM,Total Cost,Укупни трошкови
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Развртање
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Активност Пријављивање :
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,"Пункт {0} не существует в системе, или истек"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Некретнине
+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/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Фармација
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Фармација
 DocType: Expense Claim Detail,Claim Amount,Захтев Износ
 DocType: Employee,Mr,Господин
 DocType: Custom Script,Client,Клијент
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Добављач Тип / Добављач
 DocType: Naming Series,Prefix,Префикс
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,потребляемый
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,потребляемый
 DocType: Upload Attendance,Import Log,Увоз се
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Послати
 DocType: Sales Invoice Item,Delivered By Supplier,Деливеред добављач
 DocType: SMS Center,All Contact,Све Контакт
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Годишња плата
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Годишња плата
 DocType: Period Closing Voucher,Closing Fiscal Year,Затварање Фискална година
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Акции Расходы
 DocType: Newsletter,Email Sent?,Емаил Сент?
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Схов Тиме Протоколи
 DocType: Journal Entry Account,Credit in Company Currency,Кредит у валути Компанија
 DocType: Delivery Note,Installation Status,Инсталација статус
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Принято + Отклоненные Кол-во должно быть равно полученного количества по пункту {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Принято + Отклоненные Кол-во должно быть равно полученного количества по пункту {0}
 DocType: Item,Supply Raw Materials for Purchase,Набавка сировина за куповину
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Пункт {0} должен быть Покупка товара
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  Све датуми и запослени комбинација у одабраном периоду ће доћи у шаблону, са постојећим евиденцију"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Пункт {0} не является активным или конец жизни был достигнут
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Да ли ће бити ажурирани након продаје Рачун се подноси.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item , налоги в строках должны быть также включены {1}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item , налоги в строках должны быть также включены {1}"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Настройки для модуля HR
 DocType: SMS Center,SMS Center,СМС центар
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Исправљање
 DocType: BOM Replace Tool,New BOM,Нови БОМ
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Батцх Тиме трупци за наплату.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Цоунтергравити ливење
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Информационный бюллетень уже был отправлен
 DocType: Lead,Request Type,Захтев Тип
 DocType: Leave Application,Reason,Разлог
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,радиодифузија
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,извршење
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Први корисник ће постати систем менаџер (можете променити ово касније).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,радиодифузија
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,извршење
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Први корисник ће постати систем менаџер (можете променити ово касније).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Детаљи о пословању спроведена.
 DocType: Serial No,Maintenance Status,Одржавање статус
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Предмети и цене
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Попуст на цену Лист стопа (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,старт
 DocType: User,First Name,Име
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Пуно радно калупима
 DocType: Offer Letter,Select Terms and Conditions,Изаберите Услови
 DocType: Production Planning Tool,Sales Orders,Салес Ордерс
 DocType: Purchase Taxes and Charges,Valuation,Вредновање
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,Банковни рачун
 DocType: Leave Type,Allow Negative Balance,Дозволи негативан салдо
 DocType: Selling Settings,Default Territory,Уобичајено Територија
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,телевизија
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Гасхинг
+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}
 DocType: Naming Series,Series List for this Transaction,Серија Листа за ову трансакције
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Додај неискоришћене листове из претходних алокација
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Следећа Поновни {0} ће бити креирана на {1}
 DocType: Newsletter List,Total Subscribers,Укупно Претплатници
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Контакт Име
+,Contact Name,Контакт Име
 DocType: Production Plan Item,SO Pending Qty,СО чекању КТИ
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Ствара плата листић за горе наведених критеријума.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Захтев за куповину.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Дупли становање
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Освобождение Дата должна быть больше даты присоединения
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Леавес по години
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Леавес по години
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Молимо поставите Именовање серију за {0} подешавањем> Сеттингс> именовања серије
 DocType: Time Log,Will be updated when batched.,Да ли ће се ажурирати када дозирају.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ров {0}: Проверите 'Да ли је напредно ""против налог {1} ако је ово унапред унос."
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,Ставка Сајт Спецификација
 DocType: Dropbox Backup,Dropbox Access Key,Дропбок Приступни тастер
 DocType: Payment Tool,Reference No,Референца број
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Оставите Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Оставите Блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,годовой
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Стоцк Помирење артикла
 DocType: Stock Entry,Sales Invoice No,Продаја Рачун Нема
 DocType: Material Request Item,Min Order Qty,Минимална количина за поручивање
 DocType: Lead,Do Not Contact,Немојте Контакт
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Стеам ИД за праћење свих понавља фактуре. Генерише се на субмит.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Софтваре Девелопер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Софтваре Девелопер
 DocType: Item,Minimum Order Qty,Минимална количина за поручивање
 DocType: Pricing Rule,Supplier Type,Снабдевач Тип
 DocType: Item,Publish in Hub,Објављивање у Хуб
 ,Terretory,Терретори
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,Пункт {0} отменяется
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Материјал Захтев
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Материјал Захтев
 DocType: Bank Reconciliation,Update Clearance Date,Упдате Дате клиренс
 DocType: Item,Purchase Details,Куповина Детаљи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Ставка {0} није пронађен у "сировине Испоручује се 'сто у нарудзбенице {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Металном жицом
 DocType: Employee,Relation,Однос
 DocType: Shipping Rule,Worldwide Shipping,Широм света Достава
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Потврђена наређења од купаца.
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,Адреса ХТМЛ
 DocType: Lead,Mobile No.,Мобиле Но
 DocType: Maintenance Schedule,Generate Schedule,Генериши Распоред
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Хуббинг
 DocType: Purchase Invoice Item,Expense Head,Расходи шеф
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Изаберите Тип пуњења први
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,најновији
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Макс 5 знакова
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Выбор языка
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Макс 5 знакова
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Выбор языка
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Први одсуство одобраватељ на листи ће бити постављен као подразумевани Аппровер Леаве
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Онемогућава стварање временских трупаца против производних налога. Операције неће бити праћени против Продуцтион Ордер
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Пункт {0} должно быть Service Элемент
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Завршен ком не може бити већи од 'Количина за производњу'
 DocType: DocType,Administrator,Администратор
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Ласерски бушење
-DocType: Stock UOM Replace Utility,New Stock UOM,Нова берза УОМ
 DocType: Period Closing Voucher,Closing Account Head,Затварање рачуна Хеад
 DocType: Employee,External Work History,Спољни власници
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Циркуларне референце Грешка
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,Индустрија
 DocType: Employee,Job Profile,Профиль работы
 DocType: Newsletter,Newsletter,Билтен
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Хидроформинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Љубакање
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Обавестити путем емаила на стварању аутоматског материјала захтеву
 DocType: Journal Entry,Multi Currency,Тема Валута
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Пункт обновляется
 DocType: Async Task,System Manager,Систем менаџер
 DocType: Payment Reconciliation Invoice,Invoice Type,Фактура Тип
 DocType: Sales Invoice Item,Delivery Note,Обавештење о пријему пошиљке
 DocType: Dropbox Backup,Allow Dropbox Access,Дозволи Дропбок Аццесс
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Подешавање Порези
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Плаћање Ступање је модификована након што га извукао. Молимо вас да га опет повуците.
-apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0} вводится дважды в пункт налоге
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} вводится дважды в пункт налоге
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Преглед за ову недељу и чекају активности
 DocType: Workstation,Rent Cost,Издавање Трошкови
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Изаберите месец и годину
@@ -339,24 +322,22 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Стопа по којој Купац Валута се претварају у основне валуте купца
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Доступный в спецификации , накладной , счете-фактуре, производственного заказа , заказа на поставку , покупка получение, счет-фактура , заказ клиента , фондовой въезда, расписания"
 DocType: Item Tax,Tax Rate,Пореска стопа
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Избор артикла
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Избор артикла
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Итем: {0} је успео серија-мудар, не може да се помири користећи \
  Стоцк помирење, уместо коришћење Сток Ентри"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Серијски бр морају бити исти као {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Претвори у не-Гроуп
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Куповина Потврда мора да се поднесе
-DocType: Stock UOM Replace Utility,Current Stock UOM,Тренутне залихе УОМ
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Групно (много) од стране јединице.
 DocType: C-Form Invoice Detail,Invoice Date,Фактуре
 DocType: GL Entry,Debit Amount,Износ задужења
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Може постојати само 1 налог за предузеће у {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Ваша имејл адреса
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Молимо погледајте прилог
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,Молимо погледајте прилог
 DocType: Purchase Order,% Received,% Примљено
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Воденим млазом
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Подешавање Већ Комплетна !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Подешавање Већ Комплетна !
 ,Finished Goods,готове робе
 DocType: Delivery Note,Instructions,Инструкције
 DocType: Quality Inspection,Inspected By,Контролисано Би
@@ -371,6 +352,7 @@
 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,Назив
+DocType: Authorization Rule,Approving User  (above authorized value),Одобравање Корисник (изнад овлашћеног вредности)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Кредитни биланс
 DocType: Employee,Widowed,Удовички
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",Ставке се тражени који су "Оут оф Стоцк" с обзиром на све магацине засноване на пројектованом Кти и Минимална количина за поручивање
@@ -380,11 +362,10 @@
 ,Purchase Register,Куповина Регистрација
 DocType: Landed Cost Item,Applicable Charges,Накнаде применљиво
 DocType: Workstation,Consumable Cost,Потрошни трошкова
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора имати улогу 'Напусти Аппровер
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора имати улогу 'Напусти Аппровер
 DocType: Purchase Receipt,Vehicle Date,Датум возила
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,медицинский
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,медицинский
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Разлог за губљење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Тубе извлачење
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Радна станица је затворена на следеће датуме по Холидаи Лист: {0}
 DocType: Employee,Single,Самац
 DocType: Issue,Attachment,Прилог
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,Је група
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Аутоматски подешава серијски бр на основу ФИФО
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Одлазак добављача Фактура број јединственост
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Термоформирање
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Резање
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Да Предмет бр' не може бити мањи од 'Од Предмет бр'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Некоммерческое
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Некоммерческое
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Није Стартед
 DocType: Lead,Channel Partner,Цханнел Партнер
 DocType: Account,Old Parent,Стари Родитељ
@@ -417,13 +396,12 @@
 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 +512,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
+apps/erpnext/erpnext/stock/doctype/item/item.py +516,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
 DocType: Sales Order,Not Applicable,Није применљиво
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Мастер отдыха .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Схелл лајсне
 DocType: Material Request Item,Required Date,Потребан датум
 DocType: Delivery Note,Billing Address,Адреса за наплату
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Унесите Шифра .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,Унесите Шифра .
 DocType: BOM,Costing,Коштање
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ако је проверен, порески износ ће се сматрати као што је већ укључена у Принт Рате / Штампа Износ"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Укупно ком
@@ -433,7 +411,7 @@
 DocType: Item Attribute,To Range,У распону
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Ценные бумаги и депозиты
 DocType: Features Setup,Imports,Увоз
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Лепљења
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Укупно лишће издвојена обавезна
 DocType: Job Opening,Description of a Job Opening,Опис посао Отварање
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Пендинг активности за данас
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Гледалаца рекорд.
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,Користи се за производни план
 DocType: System Settings,Loading...,Учитавање ...
 DocType: DocField,Password,Шифра
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Фусед таложење моделирање
 DocType: Manufacturing Settings,Time Between Operations (in mins),Време између операција (у минута)
 DocType: Customer,Buyer of Goods and Services.,Купац робе и услуга.
 DocType: Journal Entry,Accounts Payable,Обавезе према добављачима
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Додај претплатника
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Не постоји"
 DocType: Pricing Rule,Valid Upto,Важи до
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Листанеколико ваших клијената . Они могу бити организације и појединци .
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,List a few of your customers. They could be organizations or individuals.,Листанеколико ваших клијената . Они могу бити организације и појединци .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Прямая прибыль
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Не можете да филтрирате на основу налога , ако груписани по налогу"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Административни службеник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Административни службеник
 DocType: Payment Tool,Received Or Paid,Прими или исплати
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Молимо изаберите Цомпани
 DocType: Stock Entry,Difference Account,Разлика налог
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Не можете да затворите задатак као њен задатак зависи {0} није затворен.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Унесите складиште за које Материјал Захтев ће бити подигнута
 DocType: Production Order,Additional Operating Cost,Додатни Оперативни трошкови
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,козметика
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,козметика
 DocType: DocField,Type,Тип
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items","Да бисте објединили , следеће особине морају бити исти за обе ставке"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Да бисте објединили , следеће особине морају бити исти за обе ставке"
 DocType: Communication,Subject,Предмет
 DocType: Shipping Rule,Net Weight,Нето тежина
 DocType: Employee,Emergency Phone,Хитна Телефон
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Разлика ( др - Кр )
 DocType: Account,Profit and Loss,Прибыль и убытки
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Управљање Подуговарање
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Новый UOM НЕ должен иметь тип целого числа
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Мебель и приспособления
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Стопа по којој се Ценовник валута претвара у основну валуту компаније
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Рачун {0} не припада компанији: {1}
@@ -490,14 +466,14 @@
 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/public/js/account_tree_grid.js +52,Closing (Cr),Затварање (Цр)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Затварање (Цр)
 DocType: Serial No,Warranty Period (Days),Гарантни период (дани)
 DocType: Installation Note Item,Installation Note Item,Инсталација Напомена Ставка
 ,Pending Qty,Кол чекању
 DocType: Job Applicant,Thread 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 +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Поставщик Склад обязательным для субподрядчиком ТОВАРНЫЙ ЧЕК
+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,Укупно Комисија
 DocType: Pricing Rule,Sales Partner,Продаја Партнер
@@ -507,7 +483,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Месечна Дистрибуција** помаже распоредите свој буџет по месецима ако је ваш посао сезонског типа.
 
  Да распоредите буџет користећи ову расподелу, поставите **Месечна расподела** у **Трошковни Центар**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Нема резултата у фактури табели записи
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,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 +84,Financial / accounting year.,Финансовый / отчетного года .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Извини , Серијски Нос не може да се споје"
@@ -523,25 +499,25 @@
 DocType: Sales Order,Billing and Delivery Status,Обрачун и Статус испоруке
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Репеат Купци
 DocType: Leave Control Panel,Allocate,Доделити
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,предыдущий
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,предыдущий
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Продаја Ретурн
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Изаберите продајних налога из које желите да креирате налоге производњу.
 DocType: Item,Delivered by Supplier (Drop Ship),Деливеред би добављача (Дроп Схип)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Плата компоненте.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,База потенцијалних купаца.
+DocType: Authorization Rule,Customer or Item,Кориснички или артикла
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Кориснички базе података.
 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/accounts/utils.py +193,Allocated amount can not be negative,Додељена сума не може бити негативан
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Гимнастика
 DocType: Purchase Order Item,Billed Amt,Фактурисане Амт
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Логичан Магацин против које уноси хартије су направљени.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Ссылка № & Ссылка Дата необходим для {0}
 DocType: Event,Wednesday,Среда
 DocType: Sales Invoice,Customer's Vendor,Купца Продавац
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Производња налог обавезујући
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Писање предлога
+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 +336,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,Фискална година Компанија
@@ -564,7 +540,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Онда Ценовник Правила се филтрирају на основу клијента, корисника услуга Група, Територија, добављача, добављач Тип, кампање, продаја партнер итд"
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Молимо вас да инсталирате Дропбок питон модул
 DocType: Employee,Passport Number,Пасош Број
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,менаџер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,менаџер
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Од рачуном
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Исто аукција је ушао више пута.
 DocType: SMS Settings,Receiver Parameter,Пријемник Параметар
@@ -572,10 +548,9 @@
 DocType: Sales Person,Sales Person Targets,Продаја Персон Мете
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,на
 apps/frappe/frappe/templates/base.html +145,Please enter email address,"Пожалуйста, введите адрес электронной почты,"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Крај цеви формирање
 DocType: Production Order Operation,In minutes,У минута
 DocType: Issue,Resolution Date,Резолуција Датум
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
 DocType: Selling Settings,Customer Naming By,Кориснички назив под
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Претвори у групи
 DocType: Activity Cost,Activity Type,Активност Тип
@@ -583,12 +558,12 @@
 DocType: Customer,Fixed Days,Фиксни дана
 DocType: Sales Invoice,Packing List,Паковање Лист
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Куповина наређења према добављачима.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,објављивање
+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 +198,{0}: {1} not found in Invoice Details table,{0}: {1} није пронађен у табели Фактура Детаљи
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{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 +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Техническое обслуживание Посетить {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,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}
@@ -600,7 +575,6 @@
 DocType: Pricing Rule,Sales Manager,Менаџер продаје
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Преименовање
 DocType: Journal Entry,Write Off Amount,Отпис Износ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Савијање
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Дозволите кориснику
 DocType: Journal Entry,Bill No,Бил Нема
 DocType: Purchase Invoice,Quarterly,Тромесечни
@@ -610,17 +584,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Пожалуйста, введите детали деталя"
 DocType: Purchase Receipt,Other Details,Остали детаљи
 DocType: Account,Accounts,Рачуни
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,маркетинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Равно сечење
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,маркетинг
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Да бисте пратили ставку у продаји и куповини докумената на основу њихових серијских бр. Ово се такође може користити за праћење детаље гаранције производа.
 DocType: Purchase Receipt Item Supplied,Current Stock,Тренутне залихе
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Одбијен Магацин је обавезна против регецтед ставке
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Одбијен Магацин је обавезна против регецтед ставке
 DocType: Account,Expenses Included In Valuation,Трошкови укључени у процене
 DocType: Employee,Provide email id registered in company,Обезбедити ид е регистрован у предузећу
 DocType: Hub Settings,Seller City,Продавац Град
 DocType: Email Digest,Next email will be sent on:,Следећа порука ће бити послата на:
 DocType: Offer Letter Term,Offer Letter Term,Понуда Леттер Терм
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,Тачка има варијанте.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,Тачка има варијанте.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Пункт {0} не найден
 DocType: Bin,Stock Value,Вредност акције
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Дрво Тип
@@ -629,10 +602,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Количина и Магацин
 DocType: Sales Invoice,Commission Rate (%),Комисија Стопа (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Против Ваучер Тип мора бити један од продаје Реда, продаја Фактура или Јоурнал Ентри"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Биомацхининг
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Није могуће пронаћи курса
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,ваздушно-космички простор
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,добро пожаловать
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,ваздушно-космички простор
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,добро пожаловать
 DocType: Journal Entry,Credit Card Entry,Кредитна картица Ступање
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Задатак Предмет
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Роба примљена од добављача.
@@ -655,19 +627,19 @@
 DocType: Employee,Cell Number,Мобилни број
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,изгубљен
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Не можете ући у тренутну ваучер 'против' Јоурнал Ентри колону
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,енергија
+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/accounts/page/accounts_browser/accounts_browser.js +205,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 +283,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор конверзије је обавезно
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ред {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.,Аццоунтинг прилога може се против листа чворова. Записи против групе нису дозвољени.
 DocType: ToDo,High,Висок
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не можете деактивирати или отказати БОМ јер је повезан са другим саставница
 DocType: Opportunity,Maintenance,Одржавање
 DocType: User,Male,Мушки
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},"Покупка Получение число , необходимое для Пункт {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,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.
@@ -715,10 +687,9 @@
 DocType: Address,Personal,Лични
 DocType: Expense Claim Detail,Expense Claim Type,Расходи потраживање Тип
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Дефаулт сеттингс фор Корпа
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Јоурнал Ентри {0} је повезан против Реда {1}, проверите да ли треба издвајали као унапред у овом рачуну."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,биотехнологија
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Јоурнал Ентри {0} је повезан против Реда {1}, проверите да ли треба издвајали као унапред у овом рачуну."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,биотехнологија
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Офис эксплуатационные расходы
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Хемминг
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Молимо унесите прва тачка
 DocType: Account,Liability,одговорност
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционисани износ не може бити већи од износ потраживања у низу {0}.
@@ -731,10 +702,10 @@
 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},"'Ажурирање Сток "не може се проверити, јер ствари нису достављене преко {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Нос
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Nos,Нос
 DocType: Item,Items with higher weightage will be shown higher,Предмети са вишим веигхтаге ће бити приказано више
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банка помирење Детаљ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Моји рачуни
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Моји рачуни
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Не работник не найдено
 DocType: Purchase Order,Stopped,Заустављен
 DocType: Item,If subcontracted to a vendor,Ако подизвођење на продавца
@@ -753,35 +724,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Да бисте омогућили "Поинт оф Сале" Феатурес
 DocType: Bin,Moving Average Rate,Мовинг Авераге рате
 DocType: Production Planning Tool,Select Items,Изаберите ставке
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} против Предлога закона {1} {2} од
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} против Предлога закона {1} {2} од
 DocType: Comment,Reference Name,Референтни Име
 DocType: Maintenance Visit,Completion Status,Завршетак статус
 DocType: Sales Invoice Item,Target Warehouse,Циљна Магацин
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволите преко испоруку или пријем упто овом одсто
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Ожидаемая дата поставки не может быть до даты заказа на продажу
 DocType: Upload Attendance,Import Attendance,Увоз Гледалаца
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Все Группы товаров
+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/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматически создавать сообщение о подаче сделок .
 DocType: Production Order,Item To Manufacture,Ставка за производњу
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Стална калупима
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статус {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Налог за куповину на исплату
 DocType: Sales Order Item,Projected Qty,Пројектовани Кол
 DocType: Sales Invoice,Payment Due Date,Плаћање Дуе Дате
 DocType: Newsletter,Newsletter Manager,Билтен директор
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,Тачка Варијанта {0} већ постоји са истим атрибутима
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,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,расходы
 DocType: Item Variant Attribute,Item Variant Attribute,Тачка Варијанта Атрибут
 ,Purchase Receipt Trends,Куповина Трендови Пријем
 DocType: Appraisal,Select template from which you want to get the Goals,Изаберите шаблон из којег желите да добијете циљеве
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Истраживање и развој
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Истраживање и развој
 ,Amount to Bill,Износ на Предлог закона
 DocType: Company,Registration Details,Регистрација Детаљи
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Стакинг
 DocType: Item,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}
@@ -792,18 +761,16 @@
 DocType: Sales Invoice Item,Stock Details,Сток Детаљи
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Пројекат Вредност
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Место продаје
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Не можете переносить {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Стања на рачуну већ у Кредит, није вам дозвољено да поставите 'биланс треба да се' као 'Дебит """
 DocType: Account,Balance must be,Баланс должен быть
 DocType: Hub Settings,Publish Pricing,Објављивање Цене
 DocType: Notification Control,Expense Claim Rejected Message,Расходи потраживање Одбијен поруку
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Закуцавање
 ,Available Qty,Доступно ком
 DocType: Purchase Taxes and Charges,On Previous Row Total,На претходни ред Укупно
 DocType: Salary Slip,Working Days,Радних дана
 DocType: Serial No,Incoming Rate,Долазни Оцени
 DocType: Packing Slip,Gross Weight,Бруто тежина
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Име ваше компаније за коју сте се постављање овог система .
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Име ваше компаније за коју сте се постављање овог система .
 DocType: HR Settings,Include holidays in Total no. of Working Days,Укључи одмор у Укупан бр. радних дана
 DocType: Job Applicant,Hold,Држати
 DocType: Employee,Date of Joining,Датум Придруживање
@@ -813,7 +780,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Погледај Претплатници
 DocType: Purchase Invoice Item,Purchase Receipt,Куповина Пријем
 ,Received Items To Be Billed,Примљени артикала буду наплаћени
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Брусни минирања
 DocType: Employee,Ms,Мс
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Мастер Валютный курс .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Није могуће пронаћи време за наредних {0} дана за рад {1}
@@ -825,7 +791,7 @@
 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,Обавезно Кол
 DocType: Bank Reconciliation,Total Amount,Укупан износ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Интернет издаваштво
+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/item_prices/item_prices.py +38,Sales Price List,Продаја Ценовник
@@ -836,7 +802,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 +487,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
 DocType: Quality Inspection Reading,Reading 6,Читање 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Фактури Адванце
 DocType: Address,Shop,Продавница
@@ -845,7 +811,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Уобичајено банка / Готовина налог ће аутоматски бити ажуриран у ПОС фактура, када је овај режим изабран."
 DocType: Employee,Permanent Address Is,Стална адреса је
 DocType: Production Order Operation,Operation completed for how many finished goods?,Операција завршена за колико готове робе?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Бренд
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,Бренд
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Исправка за преко-{0} прешао за пункт {1}.
 DocType: Employee,Exit Interview Details,Екит Детаљи Интервју
 DocType: Item,Is Purchase Item,Да ли је куповина артикла
@@ -865,16 +831,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Косвенная прибыль
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Сет износ уплате преостали износ =
 DocType: Contact Us Settings,Address Line 1,Аддресс Лине 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Варијација
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Име компаније
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Варијација
+,Company Name,Име компаније
 DocType: SMS Center,Total Message(s),Всего сообщений (ы)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Избор тачка за трансфер
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Избор тачка за трансфер
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Погледајте листу сву помоћ видео
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Изаберите главу рачуна банке у којој је депонован чек.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Дозволите кориснику да измените Рате Ценовник у трансакцијама
 DocType: Pricing Rule,Max Qty,Макс Кол-во
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ров {0}: Плаћање по куповном / продајном Реда треба увек бити означен као унапред
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,хемијски
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,хемијски
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Сви артикли су већ пребачени за ову производњу Реда.
 DocType: Process Payroll,Select Payroll Year and Month,Изабери Паиролл година и месец
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Иди на одговарајуће групе (обично Примена средстава> обртна имовина> банковне рачуне и креирати нови налог (кликом на Додај Цхилд) типа "Банка"
@@ -885,12 +851,12 @@
 DocType: Item,Inspection Criteria,Инспекцијски Критеријуми
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Дерево finanial центры Стоимость .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Преносе
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Уплоад главу писмо и лого. (Можете их уредити касније).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Бео
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,Upload your letter head and logo. (you can edit them later).,Уплоад главу писмо и лого. (Можете их уредити касније).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Бео
 DocType: SMS Center,All Lead (Open),Све Олово (Опен)
 DocType: Purchase Invoice,Get Advances Paid,Гет аванси
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Прикрепите свою фотографию
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Правити
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Прикрепите свою фотографию
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Правити
 DocType: Journal Entry,Total Amount in Words,Укупан износ у речи
 DocType: Workflow State,Stop,стани
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Дошло је до грешке . Један могући разлог би могао бити да нисте сачували форму . Молимо контактирајте суппорт@ерпнект.цом акопроблем и даље постоји .
@@ -899,14 +865,13 @@
 DocType: Lead,Next Contact Date,Следеће Контакт Датум
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Отварање Кол
 DocType: Holiday List,Holiday List Name,Холидаи Листа Име
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Сток Опције
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Сток Опције
 DocType: Journal Entry Account,Expense Claim,Расходи потраживање
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Количина за {0}
 DocType: Leave Application,Leave Application,Оставите апликацију
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Оставите Тоол доделе
 DocType: Leave Block List,Leave Block List Dates,Оставите Датуми листу блокираних
 DocType: Company,If Monthly Budget Exceeded (for expense account),Ако Месечни буџет Прекорачено (за расход рачун)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Скраћивање
 DocType: Workstation,Net Hour Rate,Нет час курс
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Слетео набавну Пријем
 DocType: Company,Default Terms,Уобичајено Правила
@@ -914,10 +879,9 @@
 DocType: POS Profile,Cash/Bank Account,Готовина / банковног рачуна
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Уклоњене ствари без промене у количини или вриједности.
 DocType: Delivery Note,Delivery To,Достава Да
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,Атрибут сто је обавезно
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,Атрибут сто је обавезно
 DocType: Production Planning Tool,Get Sales Orders,Гет продајних налога
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може бити негативан
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Подношење
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Попуст
 DocType: Features Setup,Purchase Discounts,Куповина Попусти
 DocType: Workstation,Wages,Плате
@@ -934,6 +898,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ви стеТрошак одобраватељ за овај запис . Молимо Ажурирајте 'статус' и Саве
 DocType: Serial No,Creation Document No,Стварање документ №
 DocType: Issue,Issue,Емисија
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Рачун не одговара Цомпани
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути за тачка варијанти. нпр Величина, Боја итд"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,ВИП Магацин
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Серийный номер {0} находится под контрактом на техническое обслуживание ДО {1}
@@ -942,7 +907,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/page/setup_wizard/setup_wizard.py +182,Standard Buying,Стандардна Куповина
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Стандардна Куповина
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,По умолчанию Продажа Стоимость центр
 DocType: Sales Partner,Implementation Partner,Имплементација Партнер
@@ -963,29 +928,29 @@
 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,Ваш продавац који ће контактирати купца у будућности
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Листанеколико ваших добављача . Они могу бити организације и појединци .
+apps/erpnext/erpnext/public/js/setup_wizard.js +326,List a few of your suppliers. They could be organizations or individuals.,Листанеколико ваших добављача . Они могу бити организације и појединци .
 DocType: Company,Default Currency,Уобичајено валута
 DocType: Contact,Enter designation of this Contact,Унесите назив овог контакта
 DocType: Contact Us Settings,Address,Адреса
 DocType: Expense Claim,From Employee,Од запосленог
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
+apps/erpnext/erpnext/controllers/accounts_controller.py +339,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,Кључна Перформансе Област
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,транспорт
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,транспорт
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,и година:
 DocType: Email Digest,Annual Expense,Годишњи трошак
 DocType: SMS Center,Total Characters,Укупно Карактери
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Молимо Вас да изаберете БОМ БОМ у пољу за ставку {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Молимо Вас да изаберете БОМ БОМ у пољу за ставку {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Ц-Форм Рачун Детаљ
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Плаћање Помирење Фактура
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Допринос%
 DocType: Item,website page link,веб страница веза
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Хајде да припреми систем за прве употребе.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Хајде да припреми систем за прве употребе.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,. Компанија регистарски бројеви за референцу Порески бројеви итд
 DocType: Sales Partner,Distributor,Дистрибутер
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корпа Достава Правило
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
 ,Ordered Items To Be Billed,Ж артикала буду наплаћени
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Од Опсег мора да буде мањи од у распону
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Изаберите Протоколи време и слање да створи нову продајну фактуру.
@@ -1005,14 +970,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Продаја Рачун Адванце
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Ништа се захтевати
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Стварни датум почетка"" не може бити већи од ""Стварни датум завршетка"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,управљање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,управљање
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Врсте активности за време Схеетс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Ливење
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Либо дебетовая или кредитная сумма необходима для {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ово ће бити прикључена на Кодекса тачка на варијанте. На пример, ако је ваш скраћеница је ""СМ"", а код ставка је ""МАЈИЦА"", ставка код варијанте ће бити ""МАЈИЦА-СМ"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Нето плата (у речи) ће бити видљив када сачувате Слип плату.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Активан
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Плава
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Плава
 DocType: Purchase Invoice,Is Return,Да ли је Повратак
 DocType: Price List Country,Price List Country,Ценовник Земља
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Даље чворови могу бити само створена под ' групе' типа чворова
@@ -1021,18 +985,16 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Шифра не може се мењати за серијским бројем
 DocType: Purchase Order Item,UOM Conversion Factor,УОМ конверзије фактор
 DocType: Stock Settings,Default Item Group,Уобичајено тачка Група
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Ламинирано објекат производња
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Снабдевач базе података.
 DocType: Account,Balance Sheet,баланс
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Цост Центер За ставку са Код товара '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Пружи формирање
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Ваша особа продаја ће добити подсетник на овај датум да се контактира купца
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Даље рачуни могу бити у групама, али уноса можете извршити над несрпским групама"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Порески и други плата одбитака.
 DocType: Lead,Lead,Довести
 DocType: Email Digest,Payables,Обавезе
 DocType: Account,Warehouse,Магацин
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Одбијен количина не може се уписати у откупу Повратак
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Одбијен количина не може се уписати у откупу Повратак
 ,Purchase Order Items To Be Billed,Налог за куповину артикала буду наплаћени
 DocType: Purchase Invoice Item,Net Rate,Нето курс
 DocType: Purchase Invoice Item,Purchase Invoice Item,Фактури Итем
@@ -1047,13 +1009,13 @@
 DocType: Global Defaults,Current Fiscal Year,Текуће фискалне године
 DocType: Global Defaults,Disable Rounded Total,Онемогући Роундед Укупно
 DocType: Lead,Call,Позив
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"""Уноси"" не могу бити празни"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,"""Уноси"" не могу бити празни"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Дубликат строка {0} с же {1}
 ,Trial Balance,Пробни биланс
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Подешавање Запослени
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Мрежа """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Пожалуйста, выберите префикс первым"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,истраживање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,истраживање
 DocType: Maintenance Visit Purpose,Work Done,Рад Доне
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Наведите бар један атрибут у табели Атрибутима
 DocType: Contact,User ID,Кориснички ИД
@@ -1061,10 +1023,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Погледај Леџер
 DocType: File,Lft,ЛФТ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Најраније
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"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 +398,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем , пожалуйста, измените имя элемента или переименовать группу товаров"
 DocType: Communication,Delivery Status,Статус испоруке
 DocType: Production Order,Manufacture against Sales Order,Производња против налога за продају
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Остальной мир
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,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,Бруто Паи
@@ -1075,13 +1037,11 @@
 DocType: BOM Item,Item Description,Ставка Опис
 DocType: Payment Tool,Payment Mode,Режим плаћања
 DocType: Purchase Invoice,Is Recurring,Је се понавља
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Директан метални ласерски синтерирање
 DocType: Purchase Order,Supplied Items,Додатна артикала
 DocType: Production Order,Qty To Manufacture,Кол Да Производња
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Одржавајте исту стопу током куповине циклуса
 DocType: Opportunity Item,Opportunity Item,Прилика шифра
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Привремени Отварање
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Цриороллинг
 ,Employee Leave Balance,Запослени одсуство Биланс
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Весы для счета {0} должен быть всегда {1}
 DocType: Address,Address Type,Врста адресе
@@ -1097,23 +1057,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Гет неплаћене рачуне
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Жао нам је , компаније не могу да се споје"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Мали
+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}
 ,Invoiced Amount (Exculsive Tax),Износ фактуре ( Екцулсиве Пореска )
 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/page/setup_wizard/install_fixtures.py +153,Green,Зелен
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Зелен
 DocType: Item,Auto re-order,Ауто поново реда
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Укупно Постигнута
+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/page/setup_wizard/install_fixtures.py +59,Contract,уговор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,уговор
 DocType: Report,Disabled,Онеспособљен
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},УОМ цоверсион фактор потребан за УЦГ: {0} тачке: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,косвенные расходы
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ред {0}: Кол је обавезно
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,пољопривреда
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Ваши производи или услуге
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,пољопривреда
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Ваши производи или услуге
 DocType: Mode of Payment,Mode of Payment,Начин плаћања
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,То јекорен ставка група и не може се мењати .
 DocType: Journal Entry Account,Purchase Order,Налог за куповину
@@ -1125,7 +1085,7 @@
 DocType: Serial No,Serial No Details,Серијска Нема детаља
 DocType: Purchase Invoice Item,Item Tax Rate,Ставка Пореска стопа
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитне рачуни могу бити повезани против неке друге ставке дебитне"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капитальные оборудование
 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.","Правилник о ценама је први изабран на основу 'Примени на ""терену, који могу бити артикла, шифра групе или Марка."
@@ -1135,7 +1095,7 @@
 DocType: Appraisal Goal,Goal,Циљ
 DocType: Sales Invoice Item,Edit Description,Измени опис
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Очекивани Датум испоруке је мањи од планираног почетка Датум.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,За добављача
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,For Supplier,За добављача
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Подешавање Тип налога помаже у одабиру овог рачуна у трансакцијама.
 DocType: Purchase Invoice,Grand Total (Company Currency),Гранд Укупно (Друштво валута)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Укупно Одлазећи
@@ -1161,10 +1121,10 @@
 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} за све ставке је нула, може ли треба променити "дистрибуира пријава по '"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Порези и накнаде израчунавање
 DocType: BOM Operation,Workstation,Воркстатион
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,аппаратные средства
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,аппаратные средства
 DocType: Attendance,HR Manager,ХР Менаџер
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Изаберите Цомпани
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Привилегированный Оставить
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Привилегированный Оставить
 DocType: Purchase Invoice,Supplier Invoice Date,Датум фактуре добављача
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Потребно је да омогућите Корпа
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Нема података
@@ -1177,7 +1137,7 @@
 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 +168,Against Journal Entry {0} is already adjusted against some other voucher,Против часопису Ступање {0} је већ прилагођен против неког другог ваучера
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Укупна вредност поруџбине
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,еда
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,еда
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Старење Опсег 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Можете направити временску дневник само против поднетом производног како
 DocType: Maintenance Schedule Item,No of Visits,Број посета
@@ -1197,6 +1157,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Погледај Понуда Писмо
 DocType: Communication,Communication,Комуникација
 DocType: Item,Is Service Item,Да ли је услуга шифра
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,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}
@@ -1215,7 +1176,7 @@
 DocType: Item,Maintain Stock,Одржавајте Стоцк
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Сток уноси већ створене за производно Реда
 DocType: Leave Control Panel,Leave blank if considered for all designations,Оставите празно ако се сматра за све ознакама
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные ' в строке {0} не могут быть включены в пункт Оценить
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные ' в строке {0} не могут быть включены в пункт Оценить
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Мак: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Од датетиме
 DocType: Email Digest,For Company,За компаније
@@ -1225,7 +1186,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 +471,cannot be greater than 100,не може бити већи од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Неплански
 DocType: Employee,Owned,Овнед
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Зависи оставити без Паи
@@ -1239,31 +1200,29 @@
 DocType: HR Settings,Employee Settings,Подешавања запослених
 ,Batch-Wise Balance History,Групно-Висе Стање Историја
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,То до лист
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,шегрт
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,шегрт
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Негативна Количина није дозвољено
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Пореска детаљ сто учитани из тачка мајстора у виду стринг и складиште у овој области.
  Користи се за таксама и накнадама"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Ланцинг
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Запослени не може пријавити за себе.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Аконалог је замрзнут , уноси могу да ограничене корисницима ."
 DocType: Email Digest,Bank Balance,Стање на рачуну
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Књиговодство Ступање на {0}: {1} може се вршити само у валути: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},Књиговодство Ступање на {0}: {1} може се вршити само у валути: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,Не активна структура плата фоунд фор запосленом {0} и месец
 DocType: Job Opening,"Job profile, qualifications required etc.","Профиль работы , квалификация , необходимые т.д."
 DocType: Journal Entry Account,Account Balance,Рачун Биланс
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Пореска Правило за трансакције.
 DocType: Rename Tool,Type of document to rename.,Врста документа да преименујете.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Купујемо ову ставку
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Купујемо ову ставку
 DocType: Address,Billing,Обрачун
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Флангинг
 DocType: Bulk Email,Not Sent,Није Сент
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Експлозив формирање
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Укупни порези и таксе (Друштво валута)
 DocType: Shipping Rule,Shipping Account,Достава рачуна
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Планируется отправить {0} получателей
 DocType: Quality Inspection,Readings,Читања
 DocType: Stock Entry,Total Additional Costs,Укупно Додатни трошкови
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub сборки
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Sub сборки
 DocType: Shipping Rule Condition,To Value,Да вредност
 DocType: Supplier,Stock Manager,Сток директор
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Источник склад является обязательным для ряда {0}
@@ -1273,44 +1232,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Увоз није успело !
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Адреса додао.
 DocType: Workstation Working Hour,Workstation Working Hour,Воркстатион радни сат
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,аналитичар
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Ред {0}: Додељени износ {1} мора бити мања или једнака количини ЈВ {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,аналитичар
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Ред {0}: Додељени износ {1} мора бити мања или једнака количини ЈВ {2}
 DocType: Item,Inventory,Инвентар
 DocType: Features Setup,"To enable ""Point of Sale"" view",Да бисте омогућили "Поинт Оф Сале" поглед
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Плаћање не може се за празан корпу
 DocType: Item,Sales Details,Детаљи продаје
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Пиннинг
 DocType: Opportunity,With Items,Са ставкама
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,У Кол
 DocType: Notification Control,Expense Claim Rejected,Расходи потраживање Одбијен
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Датум који ће бити генерисан следећи рачун. То се генерише на достави.
 DocType: Item Attribute,Item Attribute,Итем Атрибут
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,правительство
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,правительство
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Ставка Варијанте
 DocType: Company,Services,Услуге
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Укупно ({0})
 DocType: Cost Center,Parent Cost Center,Родитељ Трошкови центар
 DocType: Sales Invoice,Source,Извор
 DocType: Leave Type,Is Leave Without Pay,Да ли је Оставите без плате
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Нема резултата у табели плаћања записи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Финансовый год Дата начала
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Нема резултата у табели плаћања записи
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Финансовый год Дата начала
 DocType: Employee External Work History,Total Experience,Укупно Искуство
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Упуштања
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы
 DocType: Material Request Item,Sales Order No,Продаја Наручите Нема
 DocType: Item Group,Item Group Name,Ставка Назив групе
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Такен
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Такен
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Трансфер материјал за производњу
 DocType: Pricing Rule,For Price List,Для Прейскурантом
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Екецутиве Сеарцх
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Екецутиве Сеарцх
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Куповина стопа за ставку: {0} није пронађен, који је потребан да резервишете рачуноводствене унос (расход). Молимо вас да позовете цену артикла, против листе куповна цена."
 DocType: Maintenance Schedule,Schedules,Распореди
 DocType: Purchase Invoice Item,Net Amount,Нето износ
 DocType: Purchase Order Item Supplied,BOM Detail No,БОМ Детаљ Нема
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Додатне Износ попуста (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Ошибка: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Ошибка: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Молимо креирајте нови налог из контном оквиру .
 DocType: Maintenance Visit,Maintenance Visit,Одржавање посета
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Кориснички> Кориснички Група> Територија
@@ -1332,15 +1289,14 @@
 DocType: ToDo,Due Date,Дуе Дате
 DocType: Sales Invoice Item,Brand Name,Бранд Наме
 DocType: Purchase Receipt,Transporter Details,Транспортер Детаљи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,коробка
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Организација
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,коробка
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Организација
 DocType: Monthly Distribution,Monthly Distribution,Месечни Дистрибуција
 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 +113,Accounting Entry for {0} can only be made in currency: {1},Књиговодство Ступање на {0} може се вршити само у валути: {1}
 DocType: Pricing Rule,Pricing Rule,Цены Правило
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Угаоно исецање
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Материјал захтјев за откуп Ордер
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Ред # {0}: враћено артикла {1} не постоји у {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Банковни рачуни
@@ -1357,20 +1313,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Износи не огледа у банци
 DocType: Quality Inspection Reading,Reading 4,Читање 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Захтеви за рачун предузећа.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Центрифугална ливење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Магнетно поље уз помоћ завршни
 DocType: Company,Default Holiday List,Уобичајено Холидаи Лист
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Акции Обязательства
 DocType: Purchase Receipt,Supplier Warehouse,Снабдевач Магацин
 DocType: Opportunity,Contact Mobile No,Контакт Мобиле Нема
 DocType: Production Planning Tool,Select Sales Orders,Избор продајних налога
 ,Material Requests for which Supplier Quotations are not created,Материјални Захтеви за који Супплиер Цитати нису створени
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Дан (и) на коју се пријављујете за дозволу су празници. Не морате пријавити за одмор.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Да бисте пратили ставки помоћу баркод. Моћи ћете да унесете ставке у испоруци напомени и продаје фактуру за скенирање баркода на ставке.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Означи као Деливеред
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Означи као Деливеред
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Направи понуду
 DocType: Dependent Task,Dependent Task,Зависна Задатак
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,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 +155,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,Пријемник Листа
@@ -1378,15 +1333,14 @@
 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 +491,{0} View,{0} Погледај
 DocType: Salary Structure Deduction,Salary Structure Deduction,Плата Структура Одбитак
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Селективно ласерски синтерирање
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Увоз Успешна !
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Трошкови издатих ставки
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Количина не сме бити више од {0}
 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/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Од датума не може бити већа него до сада
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,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,Снабдевач Број дела
@@ -1395,14 +1349,14 @@
 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 +197,Purchase Receipt {0} is not submitted,Покупка Получение {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,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/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Завершение установки
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Завершение установки
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Приходована
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Резервисано Кол
 DocType: Party Account,Party Account,Странка налог
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Человеческие ресурсы
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Человеческие ресурсы
 DocType: Lead,Upper Income,Горња прихода
 DocType: Journal Entry Account,Debit in Company Currency,Дебитна у Компанија валути
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Моји проблеми
@@ -1411,11 +1365,9 @@
 DocType: Company,Default Values,Уобичајено Вредности
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Ров {0}: Плаћање износ не може бити негативан
 DocType: Expense Claim,Total Amount Reimbursed,Укупан износ рефундирају
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Притисните Фиттинг
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Против добављача Фактура {0} {1} од
 DocType: Customer,Default Price List,Уобичајено Ценовник
 DocType: Payment Reconciliation,Payments,Исплате
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Хот изостатичко пресовање
 DocType: ToDo,Medium,Средњи
 DocType: Budget Detail,Budget Allocated,Буџет Издвојена
 DocType: Journal Entry,Entry Type,Ступање Тип
@@ -1428,9 +1380,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ниједан од ставки имају било какву промену у количини или вриједности.
 DocType: Warranty Claim,Warranty Claim,Гаранција Цлаим
 ,Lead Details,Олово Детаљи
-DocType: Authorization Rule,Approving User,Одобравање корисника
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Фалсификовање
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Позлаћивање
 DocType: Purchase Invoice,End date of current invoice's period,Крајњи датум периода актуелне фактуре за
 DocType: Pricing Rule,Applicable For,Применимо для
 DocType: Bank Reconciliation,From Date,Од датума
@@ -1452,31 +1401,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Уплаћеног износа (Фирма валута)
 DocType: Purchase Invoice,Additional Discount,Додатни попуст
 DocType: Selling Settings,Selling Settings,Продаја Сеттингс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Онлине Аукције
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Онлине Аукције
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Наведите било Количина или вредновања оцену или обоје
 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 +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се спомиње, \n Молимо вас да се позовете на ""Тежина УОМ"" превише"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"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 +212,Time Log Batch {0} must be 'Submitted',Время входа Пакетная {0} должен быть ' Представленные '
 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 +384,Warehouse required at Row No {0},Магацин потребно на Ров Но {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Магацин потребно на Ров Но {0}
 DocType: Employee,Date Of Retirement,Датум одласка у пензију
 DocType: Upload Attendance,Get Template,Гет шаблона
 DocType: Address,Postal,Поштански
 DocType: Item,Weightage,Веигхтаге
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Рударство
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Смола ливење
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов существует с тем же именем , пожалуйста изменить имя клиентов или переименовать группу клиентов"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Изаберите {0} прво.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Текст {0}
 DocType: Territory,Parent Territory,Родитељ Територија
 DocType: Quality Inspection Reading,Reading 2,Читање 2
 DocType: Stock Entry,Material Receipt,Материјал Пријем
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Продукты
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Продукты
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Странка Тип и Странка је потребан за примања / обавезе обзир {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ако ова ставка има варијанте, онда не може бити изабран у налозима продаје итд"
 DocType: Lead,Next Contact By,Следеће Контакт По
@@ -1486,13 +1433,13 @@
 DocType: Purchase Invoice,Notification Email Address,Обавештење е-маил адреса
 DocType: Payment Tool,Find Invoices to Match,Пронађи фактуре да одговара
 ,Item-wise Sales Register,Предмет продаје-мудре Регистрација
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","нпр ""КСИЗ Народна банка """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","нпр ""КСИЗ Народна банка """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Да ли је то такса у Основном Рате?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Укупно Циљна
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Укупно Циљна
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,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 +131,Salary Slip of employee {0} already created for this month,Зарплата скольжения работника {0} уже создано за этот месяц
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Зарплата скольжения работника {0} уже создано за этот месяц
 DocType: Stock Reconciliation,Reconciliation 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,Групно Нема
@@ -1502,14 +1449,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Варијанта
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Нови {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Сет префикс за нумерисање серију на својим трансакцијама
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Остановился заказ не может быть отменен. Unstop отменить .
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,Default BOM ({0}) must be active for this item or its template,Уобичајено БОМ ({0}) мора бити активан за ову ставку или његовог шаблон
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Остановился заказ не может быть отменен. Unstop отменить .
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,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,Варијанте
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Маке наруџбенице
 DocType: SMS Center,Send To,Пошаљи
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
 DocType: Sales Team,Contribution to Net Total,Допринос нето укупни
 DocType: Sales Invoice Item,Customer's Item Code,Шифра купца
 DocType: Stock Reconciliation,Stock Reconciliation,Берза помирење
@@ -1546,11 +1493,11 @@
 DocType: Sales Order Item,Actual Qty,Стварна Кол
 DocType: Sales Invoice Item,References,Референце
 DocType: Quality Inspection Reading,Reading 10,Читање 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Наведите своје производе или услуге које купују или продају .
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Наведите своје производе или услуге које купују или продају .
 DocType: Hub Settings,Hub Node,Хуб Ноде
 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 +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Вредност {0} за Аттрибуте {1} не постоји у листи важећег тачке вредности атрибута
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,помоћник
+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,Направите листу пријемника
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Истекло
@@ -1559,7 +1506,7 @@
 DocType: Warranty Claim,Issue Date,Датум емитовања
 DocType: Activity Cost,Activity Cost,Активност Трошкови
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Потрошено Кол
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,телекомуникација
+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}
@@ -1576,10 +1523,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Продаја се мора проверити, ако је применљиво Јер је изабрана као {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Снабдевач Понуда шифра
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Маке плата Структура
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Стрижа
 DocType: Item,Has Variants,Хас Варијанте
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Кликните на 'да продаје Фактура' дугме да бисте креирали нову продајну фактуру.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Паковање и етикетирање
 DocType: Monthly Distribution,Name of the Monthly Distribution,Назив мјесечни
 DocType: Sales Person,Parent Sales Person,Продаја Родитељ Особа
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Пожалуйста, сформулируйте Базовая валюта в компании Мастер и общие настройки по умолчанию"
@@ -1590,19 +1535,18 @@
 DocType: Budget Detail,Fiscal Year,Фискална година
 DocType: Cost Center,Budget,Буџет
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Буџет не може се одредити према {0}, јер то није прихода или расхода рачун"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Постигнута
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Постигнута
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Територија / Кориснички
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,например 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Ред {0}: Додељени износ {1} мора бити мања или једнака фактурише изузетну количину {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,например 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Ред {0}: Додељени износ {1} мора бити мања или једнака фактурише изузетну количину {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,У речи ће бити видљив када сачувате продаје фактуру.
 DocType: Item,Is Sales Item,Да ли продаје артикла
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Ставка Група дрво
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Пункт {0} не установка для мастера серийные номера Проверить товара
 DocType: Maintenance Visit,Maintenance Time,Одржавање време
 ,Amount to Deliver,Износ на Избави
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Продукт или сервис
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Било је грешака .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Таппинг
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Продукт или сервис
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Било је грешака .
 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,Против продаје налога
@@ -1616,7 +1560,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Впритык не может быть , прежде чем отправлять Дата"
 DocType: Website Item Group,Website Item Group,Сајт тачка Група
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Пошлины и налоги
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} уноса плаћања не може да се филтрира од {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Табела за ставку која ће бити приказана у веб сајта
 DocType: Purchase Order Item Supplied,Supplied Qty,Додатна количина
@@ -1624,7 +1568,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Дерево товарные группы .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можете обратиться номер строки , превышающую или равную текущему номеру строки для этого типа зарядки"
 ,Item-wise Purchase History,Тачка-мудар Историја куповине
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Црвен
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Црвен
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Пожалуйста, нажмите на кнопку "" Generate Расписание "" , чтобы принести Серийный номер добавлен для Пункт {0}"
 DocType: Account,Frozen,Фрозен
 ,Open Production Orders,Отворена Продуцтион Поруџбине
@@ -1639,7 +1583,7 @@
 DocType: Item Attribute,Attribute Name,Назив атрибута
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Пункт {0} должно быть продажи или в пункте СЕРВИС {1}
 DocType: Item Group,Show In Website,Схов у сајт
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Група
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Група
 DocType: Task,Expected Time (in hours),Очекивано време (у сатима)
 ,Qty to Order,Количина по поруџбини
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Да бисте пратили бренд име у следећим документима испоруци, прилика, материјалној Захтев тачка, нарудзбенице, купите ваучер, Наручилац пријему, цитат, Продаја фактура, Производ Бундле, Салес Ордер, Сериал Но"
@@ -1649,6 +1593,7 @@
 DocType: Features Setup,Brands,Брендови
 DocType: C-Form Invoice Detail,Invoice No,Рачун Нема
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Од наруџбеницу
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"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,Оставка Писмо Датум
@@ -1656,35 +1601,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Нот Сет
 DocType: Communication,Date,Датум
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Поновите Кориснички Приход
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Стрпите се док ваш систем бити подешавање . Ово може да потраје неколико тренутака .
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,Стрпите се док ваш систем бити подешавање . Ово може да потраје неколико тренутака .
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) мора имати улогу 'Екпенсе одобраватељ'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,пара
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,пара
 DocType: Bank Reconciliation Detail,Against Account,Против налога
 DocType: Maintenance Schedule Detail,Actual Date,Стварни датум
 DocType: Item,Has Batch No,Има Батцх Нема
 DocType: Delivery Note,Excise Page Number,Акцизе Број странице
 DocType: Employee,Personal Details,Лични детаљи
 ,Maintenance Schedules,Планове одржавања
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Ембоссинг
 ,Quotation Trends,Котировочные тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Ставка група не помиње у тачки мајстор за ставку {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Дебитна Да рачуну мора бити потраживања рачун
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.","Как Производственный заказ можно сделать по этой статье, он должен быть запас пункт ."
 DocType: Shipping Rule Condition,Shipping Amount,Достава Износ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Спајање
-DocType: Authorization Rule,Above Value,Изнад Вредност
 ,Pending Amount,Чека Износ
 DocType: Purchase Invoice Item,Conversion Factor,Конверзија Фактор
 DocType: Purchase Order,Delivered,Испоручено
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Настройка сервера входящей подрабатывать электронный идентификатор . (например jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Број возила
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Датум на који се понавља фактура ће бити зауставити
+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,Овај формат се користи ако земља специфична формат није пронађен
 DocType: Custom Field,Custom,Обичај
 DocType: Production Order,Use Multi-Level BOM,Користите Мулти-Левел бом
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Бризгање
 DocType: Bank Reconciliation,Include Reconciled Entries,Укључи помирили уносе
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Дерево finanial счетов.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Оставите празно ако се сматра за све типове запослених
@@ -1694,30 +1635,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Штампање
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Расходи Тужба се чека на одобрење . СамоРасходи одобраватељ да ажурирате статус .
 DocType: Purchase Invoice,Additional Discount Amount,Додатне Износ попуста
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"День (дни) , на котором вы подаете заявление на отпуск , отпуск . Вам не нужно обратиться за разрешением ."
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,и
 DocType: Leave Block List Allow,Leave Block List Allow,Оставите листу блокираних Аллов
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Аббр не може бити празно или простор
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,спортски
+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,Укупно Стварна
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,блок
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,блок
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Пожалуйста, установите ключи доступа Dropbox на своем сайте конфигурации"
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Молимо наведите фирму
 ,Customer Acquisition and Loyalty,Кориснички Стицање и лојалности
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Магацин где се одржава залихе одбачених предмета
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Ваша финансијска година се завршава
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Ваша финансијска година се завршава
 DocType: POS Profile,Price List,Ценовник
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} теперь используется по умолчанию финансовый год . Пожалуйста, обновите страницу в браузере , чтобы изменения вступили в силу."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Расходи Потраживања
 DocType: Issue,Support,Подршка
-DocType: Authorization Rule,Approving Role,Одобравање улоге
 ,BOM Search,БОМ Тражи
 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.","Показать / скрыть функции, такие как последовательный Нос, POS и т.д."
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Рачун {0} је неважећа. Рачун валута мора да буде {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +237,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},Фактор Единица измерения преобразования требуется в строке {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Дата просвет не может быть до даты регистрации в строке {0}
 DocType: Salary Slip,Deduction,Одузимање
@@ -1736,13 +1675,13 @@
 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 +112,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,Одбити
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Опис посла
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Опис посла
 DocType: Purchase Order Item,Qty as per Stock UOM,Кол по залихама ЗОЦГ
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,"Пожалуйста, выберите правильный файл CSV с данными"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Превлака
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специјални знакови осим ""-"" ""."", ""#"", и ""/"" није дозвољено у именовању серије"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Пратите продајне акције. Пратите води, Куотатионс, продаја Ордер итд из кампање да измери повраћај инвестиције. "
 DocType: Expense Claim,Approver,Одобраватељ
@@ -1752,12 +1691,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Производња директор
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Серийный номер {0} находится на гарантии ДО {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Сплит Напомена Испорука у пакетима.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Пошиљке
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Дип лајсне
+apps/erpnext/erpnext/hooks.py +68,Shipments,Пошиљке
 DocType: Purchase Order,To be delivered to customer,Који ће бити достављен купца
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Време Пријави статус мора да се поднесе.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Серијски број {0} не припада ниједној Варехоусе
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Подешавање
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Подешавање
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Ров #
 DocType: Purchase Invoice,In Words (Company Currency),Речима (Друштво валута)
 DocType: Pricing Rule,Supplier,Добављач
@@ -1777,27 +1715,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
 DocType: Currency Exchange,From Currency,Од валутног
 DocType: DocField,Name,Име
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Молимо Вас да изаберете издвајају, Тип фактуре и број фактуре у атлеаст једном реду"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Заказать продаж требуется для Пункт {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Молимо Вас да изаберете издвајају, Тип фактуре и број фактуре у атлеаст једном реду"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Заказать продаж требуется для Пункт {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Износи не огледа у систему
 DocType: Purchase Invoice Item,Rate (Company Currency),Стопа (Друштво валута)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,другие
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,другие
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Не могу да нађем ставку која се подудара. Молимо Вас да одаберете неку другу вредност за {0}.
 DocType: POS Profile,Taxes and Charges,Порези и накнаде
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Производ или сервис који се купити, продати или држати у складишту."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Невозможно выбрать тип заряда , как «О предыдущего ряда Сумма » или « О предыдущего ряда Всего 'для первой строки"
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Завршен
 DocType: Web Form,Select DocType,Изаберите ДОЦТИПЕ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Броацхинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,банкарство
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,банкарство
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Пожалуйста, нажмите на кнопку "" Generate Расписание "" , чтобы получить график"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Нови Трошкови Центар
 DocType: Bin,Ordered Quantity,Наручено Количина
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","например ""Build инструменты для строителей """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","например ""Build инструменты для строителей """
 DocType: Quality Inspection,In Process,У процесу
 DocType: Authorization Rule,Itemwise Discount,Итемвисе Попуст
 DocType: Purchase Order Item,Reference Document Type,Референтна Тип документа
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} против Салес Ордер {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} против Салес Ордер {1}
 DocType: Account,Fixed Asset,Исправлена ​​активами
 apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Серијализоване Инвентар
 DocType: Activity Type,Default Billing Rate,Уобичајено обрачуна курс
@@ -1812,14 +1749,13 @@
 DocType: Purchase Invoice Item,Page Break,Страна Пауза
 DocType: Production Order Operation,Pending,Нерешен
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Корисници који могу одобри одсуство апликације у конкретној запосленог
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Ви не можете да промените подразумевани УЦГ варијанте. Да бисте променили подразумевани УЦГ за варијанту промене подразумевани УЦГ на Шаблон
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,оборудование офиса
 DocType: Purchase Invoice Item,Qty,Кол
 DocType: Fiscal Year,Companies,Компаније
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,електроника
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,електроника
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Подигните захтев залиха материјала када достигне ниво поновно наручивање
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Од распореду одржавања
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Пуно радно време
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Пуно радно време
 DocType: Purchase Invoice,Contact Details,Контакт Детаљи
 DocType: C-Form,Received Date,Примљени Датум
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Ако сте направили стандардни образац у продаји порези и таксе Темплате, изаберите један и кликните на дугме испод."
@@ -1831,11 +1767,12 @@
 DocType: Job Applicant,Job Opening,Посао Отварање
 DocType: Payment Reconciliation,Payment Reconciliation,Плаћање Помирење
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Пожалуйста, выберите имя InCharge Лица"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,технологија
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,технологија
 DocType: Offer Letter,Offer Letter,Понуда Леттер
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Генеришите Захтеви материјал (МРП) и производних налога.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Укупно фактурисано Амт
 DocType: Time Log,To Time,За време
+DocType: Authorization Rule,Approving Role (above authorized value),Одобравање улога (изнад овлашћеног вредности)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Да бисте додали дете чворове , истражују дрво и кликните на чвору под којим желите да додате још чворова ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Кредит на рачун мора бити Плаћа рачун
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия : {0} не может быть родитель или ребенок {2}
@@ -1848,10 +1785,8 @@
 DocType: Item,Customer Item Codes,Кориснички кодова
 DocType: Opportunity,Lost Reason,Лост Разлог
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Направи Оплата записи против налога или фактурама.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Заваривање
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Новый фонда Единица измерения требуется
 DocType: Quality Inspection,Sample Size,Величина узорка
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Све ставке су већ фактурисано
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Све ставке су већ фактурисано
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Наведите тачну 'Од Предмет бр'
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Даље трошкова центри могу да буду под групама, али уноса можете извршити над несрпским групама"
 DocType: Project,External,Спољни
@@ -1863,8 +1798,7 @@
 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/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Ваши Купци
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Компресија лајсне
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Ваши Купци
 DocType: Leave Block List Date,Block Date,Блоцк Дате
 DocType: Sales Order,Not Delivered,Није Испоручено
 ,Bank Clearance Summary,Банка Чишћење Резиме
@@ -1885,10 +1819,10 @@
 DocType: SMS Log,Sent To,Послат
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Маке Салес фактура
 DocType: Company,For Reference Only.,За справки.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Неважећи {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Неважећи {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Унапред Износ
 DocType: Manufacturing Settings,Capacity Planning,Капацитет Планирање
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"""Од датума"" је обавезно"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""Од датума"" је обавезно"
 DocType: Journal Entry,Reference Number,Референтни број
 DocType: Employee,Employment Details,Детаљи за запошљавање
 DocType: Employee,New Workplace,Новом радном месту
@@ -1903,7 +1837,7 @@
 DocType: Serial No,Delivery Time,Време испоруке
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Старење Басед Он
 DocType: Item,End of Life,Крај живота
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,путешествие
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,путешествие
 DocType: Leave Block List,Allow Users,Дозволи корисницима
 DocType: Purchase Order,Customer Mobile No,Кориснички Мобилни број
 DocType: Sales Invoice,Recurring,Који се враћа
@@ -1917,7 +1851,7 @@
 DocType: Naming Series,User must always select,Корисник мора увек изабрати
 DocType: Stock Settings,Allow Negative Stock,Дозволи Негативно Стоцк
 DocType: Installation Note,Installation Note,Инсталација Напомена
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Додај Порези
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Додај Порези
 ,Financial Analytics,Финансијски Аналитика
 DocType: Quality Inspection,Verified By,Верифиед би
 DocType: Address,Subsidiary,Подружница
@@ -1927,7 +1861,6 @@
 DocType: System Settings,In Hours,У часовима
 DocType: Process Payroll,Create Salary Slip,Направи Слип платама
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Очекује стање као по банци
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Брушење
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Источник финансирования ( обязательства)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Количество в строке {0} ( {1} ) должна быть такой же, как изготавливается количество {2}"
 DocType: Appraisal,Employee,Запосленик
@@ -1944,11 +1877,11 @@
 DocType: Rename Tool,File to Rename,Филе Ренаме да
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Число Purchse Заказать требуется для Пункт {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Схов Плаћања
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Указано БОМ {0} не постоји за ставку {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График обслуживания {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Указано БОМ {0} не постоји за ставку {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График обслуживания {0} должно быть отменено до отмены этого заказ клиента
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Величина
 DocType: Notification Control,Expense Claim Approved,Расходи потраживање одобрено
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,фармацевтический
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,фармацевтический
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Трошкови Купљено
 DocType: Selling Settings,Sales Order Required,Продаја Наручите Обавезно
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Креирање корисника
@@ -1958,7 +1891,6 @@
 DocType: Quality Inspection Reading,Reading 9,Читање 9
 DocType: Supplier,Is Frozen,Је замрзнут
 DocType: Buying Settings,Buying Settings,Куповина Сеттингс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Маса обрада
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,БОМ Но за готових добре тачке
 DocType: Upload Attendance,Attendance To Date,Присуство Дате
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Настройка сервера входящей для продажи электронный идентификатор . (например sales@example.com )
@@ -1966,7 +1898,7 @@
 DocType: Payment Tool,Payment Account,Плаћање рачуна
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Наведите компанија наставити
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Нацрт
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсационные Выкл
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсационные Выкл
 DocType: Quality Inspection Reading,Accepted,Примљен
 DocType: User,Female,Женски
 DocType: Journal Entry Account,Debit in Account Currency,Дебитна у обзир Валута
@@ -1978,7 +1910,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Достава Правило Лабел
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Сировине не може бити празан.
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Као што постоје постојеће трансакције стоцк за ову ставку, \ не можете променити вредности 'има серијски Не', 'Има серијски бр', 'Да ли лагеру предмета' и 'Процена Метод'"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Брзо Јоурнал Ентри
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Не можете променити стопу ако бом помиње агианст било које ставке
@@ -1989,13 +1921,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Захтеви за ставке.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Одвојена производња поруџбина ће бити направљен за сваку готовог добар ставке.
 DocType: Purchase Invoice,Terms and Conditions1,Услови и Цондитионс1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,завершение установки
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,завершение установки
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Рачуноводствени унос замрзнуте до овог датума, нико не може / изменити унос осим улоге доле наведеном."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Сачувајте документ пре генерисања план одржавања
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус пројекта
 DocType: UOM,Check this to disallow fractions. (for Nos),Проверите то тако да одбаци фракција. (За НОС)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Билтен Маилинг листа
 DocType: Delivery Note,Transporter Name,Транспортер Име
+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 +746,Item or Warehouse for row {0} does not match Material Request,Пункт или Склад для строки {0} не соответствует запросу материал
@@ -2020,16 +1953,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Основни курс (по Стоцк УЦГ)
 DocType: SMS Log,No of Requested SMS,Нема тражених СМС
 DocType: Campaign,Campaign-.####,Кампания - . # # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Продоран
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следећи кораци
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Треће лице дистрибутер / дилер / заступника / сарадник / дистрибутер који продаје компанијама производе за провизију.
 DocType: Customer Group,Has Child Node,Има деце Ноде
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} против нарудзбенице {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} против нарудзбенице {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Унесите статичке параметре овде УРЛ адресу (нпр. пошиљалац = ЕРПНект, усернаме = ЕРПНект, лозинком = 1234 итд)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ни на који активно фискалној години. За више детаља проверите {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Это пример сайт автоматически сгенерированный из ERPNext
+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,Старење Опсег 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Фотохемијског машинска обрада
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2075,7 +2007,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Рецд Количина
 DocType: Email Account,Email Ids,Е-маил Идс
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете производить больше элемент {0} , чем количество продаж Заказать {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Сток Ступање {0} не поднесе
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Сток Ступање {0} не поднесе
 DocType: Payment Reconciliation,Bank / Cash Account,Банка / готовински рачун
 DocType: Tax Rule,Billing City,Биллинг Цити
 DocType: Global Defaults,Hide Currency Symbol,Сакриј симбол валуте
@@ -2091,7 +2023,7 @@
 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/setup/page/setup_wizard/install_fixtures.py +71,Production,производња
+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} : Датум почетка мора да буде пре крајњег датума
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Укупно (ком)
@@ -2104,7 +2036,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Моје адресе
 DocType: Stock Ledger Entry,Outgoing Rate,Одлазећи курс
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Организация филиал мастер .
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,или
 DocType: Sales Order,Billing Status,Обрачун статус
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Коммунальные расходы
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Изнад
@@ -2131,6 +2063,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Серијски бр / Серије
 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',"График обслуживания не генерируется для всех элементов . Пожалуйста, нажмите на кнопку "" Generate Расписание """
 ,To Produce,за производњу
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","За редом {0} у {1}. Да бисте укључили {2} У тачки стопе, редови {3} морају бити укључени"
@@ -2138,10 +2071,7 @@
 DocType: Bin,Reserved Quantity,Резервисани Количина
 DocType: Landed Cost Voucher,Purchase Receipt Items,Куповина Ставке пријема
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Прилагођавање Облици
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Сечење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Равнање
 DocType: Account,Income Account,Приходи рачуна
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Обликовање
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Испорука
 DocType: Stock Reconciliation Item,Current Qty,Тренутни ком
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Погледајте "стопа материјала на бази" у Цостинг одељак
@@ -2151,20 +2081,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Документи
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Реф
 DocType: Cost Center,Cost Center,Трошкови центар
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Ваучер #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Ваучер #
 DocType: Notification Control,Purchase Order Message,Куповина поруку Ордер
 DocType: Tax Rule,Shipping Country,Достава Земља
 DocType: Upload Attendance,Upload HTML,Уплоад ХТМЛ
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Укупно унапред ({0}) против Реда {1} не може бити већи од Великог \
  Укупно ({2})"
 DocType: Employee,Relieving Date,Разрешење Дате
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Правилник о ценама је направљен да замени Ценовник / дефинисати попуст проценат, на основу неких критеријума."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Складиште може да се промени само преко Сток Улаз / Испорука Напомена / рачуном
 DocType: Employee Education,Class / Percentage,Класа / Проценат
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Шеф маркетинга и продаје
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,подоходный налог
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Ласерски пројектована нето обликовање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Шеф маркетинга и продаје
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,подоходный налог
 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.","Ако изабрана Правилник о ценама је направљен за '' Прице, он ће преписати Ценовник. Правилник о ценама цена је коначна цена, тако да би требало да се примени даље попуст. Стога, у трансакцијама као што продаје Реда, наруџбину итд, то ће бити продата у ""рате"" терену, а не области 'Ценовник рате'."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Стаза води од индустрије Типе .
 DocType: Item Supplier,Item Supplier,Ставка Снабдевач
@@ -2187,31 +2116,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Стварна Кол Након трансакције
 ,Pending SO Items For Purchase Request,Чекању СО Артикли за куповину захтеву
 DocType: Supplier,Billing Currency,Обрачун Валута
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Екстра велики
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Екстра велики
 ,Profit and Loss Statement,Биланс успјеха
 DocType: Bank Reconciliation Detail,Cheque Number,Чек Број
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Притиском
 DocType: Payment Tool Detail,Payment Tool Detail,Плаћање Алат Детаљ
 ,Sales Browser,Браузер по продажам
 DocType: Journal Entry,Total Credit,Укупна кредитна
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Упозорење: Још једна {0} # {1} постоји против уласка залиха {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,местный
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,Warning: Another {0} # {1} exists against stock entry {2},Упозорење: Још једна {0} # {1} постоји против уласка залиха {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,местный
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредиты и авансы ( активы )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Дужници
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Велики
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ниједан запослени фоунд !
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Велики
 DocType: C-Form Invoice Detail,Territory,Територија
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Пожалуйста, укажите кол-во посещений , необходимых"
 DocType: Purchase Order,Customer Address Display,Кориснички Адреса Приказ
 DocType: Stock Settings,Default Valuation Method,Уобичајено Процена Метод
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Полирање
 DocType: Production Order Operation,Planned Start Time,Планирано Почетак Време
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Затвори Биланс стања и књига добитак или губитак .
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","Уобичајено јединица мере за тачке {0} не могу директно мењати, јер \ већ сте направили неку трансакцију (с) са другим УЦГ. Да бисте променили подразумевани УЦГ, \ употреба 'УОМ Замените Утилити "функције под Стоцк модула."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Наведите курс према претворити једну валуту у другу
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Цитата {0} отменяется
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Цитата {0} отменяется
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Преостали дио кредита
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Сотрудник {0} был в отпусках по {1} . Невозможно отметить посещаемость.
 DocType: Sales Partner,Targets,Мете
@@ -2222,7 +2148,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Електро-хемијска брушење
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,То јекорен група купац и не може се мењати .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Молимо Поставите свој контни пре него што почнете Рачуноводство уносе
 DocType: Purchase Invoice,Ignore Pricing Rule,Игноре Правилник о ценама
@@ -2280,7 +2205,6 @@
 DocType: Maintenance Visit,Purposes,Сврхе
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Барем једна ставка треба унети у негативном количином у повратном документа
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операција {0} дуже него што је било на располагању радног времена у станици {1}, разбити операцију у више операција"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Електрохемиски машинска обрада
 ,Requested,Тражени
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Но Примедбе
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Презадужен
@@ -2289,7 +2213,7 @@
 DocType: Monthly Distribution,Distribution Name,Дистрибуција Име
 DocType: Features Setup,Sales and Purchase,Продаја и Куповина
 DocType: Supplier Quotation Item,Material Request No,Материјал Захтев Нема
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},"Контроль качества , необходимые для Пункт {0}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,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),Нето курс (Фирма валута)
@@ -2307,9 +2231,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Фискална година {0} није пронађен.
 DocType: Bank Reconciliation,Get Relevant Entries,Гет Релевантне уносе
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Рачуноводство Ентри за Деонице
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Ковања
 DocType: Sales Invoice,Sales Team1,Продаја Теам1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Пункт {0} не существует
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Пункт {0} не существует
 DocType: Sales Invoice,Customer Address,Кориснички Адреса
 apps/frappe/frappe/desk/query_report.py +136,Total,Укупан
 DocType: Purchase Invoice,Apply Additional Discount On,Нанесите додатни попуст Он
@@ -2320,14 +2243,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Износ пореза Након Износ попуста (Фирма валута)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Целевая склад является обязательным для ряда {0}
 DocType: Quality Inspection,Quality Inspection,Провера квалитета
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Ектра Смалл
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Спраи формирање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Ектра Смалл
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Упозорење : Материјал Тражени Кол је мање од Минимална количина за поручивање
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Счет {0} заморожен
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Правно лице / Подружница са посебном контном припада организацији.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Храна , пиће и дуван"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Храна , пиће и дуван"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,ПЛ или БС
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Може само извршити уплату против ненаплаћене {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Може само извршити уплату против ненаплаћене {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,"Скорость Комиссия не может быть больше, чем 100"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Минимална Инвентар Ниво
 DocType: Stock Entry,Subcontract,Подуговор
@@ -2338,19 +2260,18 @@
 DocType: Item,Manufacturer Part Number,Произвођач Број дела
 DocType: Production Order Operation,Estimated Time and Cost,Процењена Вријеме и трошкови
 DocType: Bin,Bin,Бункер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Испуст
 DocType: SMS Log,No of Sent SMS,Број послатих СМС
 DocType: Account,Company,Компанија
 DocType: Account,Expense Account,Трошкови налога
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,софтвер
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Боја
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,софтвер
+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",Молимо одаберите ставку где "је акционарско тачка" је "Не" и "Да ли је продаје Тачка" "Да" и нема другог производа Бундле
 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 +281,Price List Currency not selected,Прайс-лист Обмен не выбран
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Ставка Ред {0}: Куповина Пријем {1} не постоји у табели 'пурцхасе примитака'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,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 +145,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,Преименовање Лог
@@ -2360,7 +2281,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Пожалуйста, выберите {0}"
 DocType: C-Form,C-Form No,Ц-Образац бр
 DocType: BOM,Exploded_items,Екплодед_итемс
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,истраживач
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,истраживач
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Ажурирање
 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,Име или е-маил је обавезан
@@ -2369,11 +2290,10 @@
 DocType: Employee,Exit,Излаз
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Корен Тип је обавезно
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Серийный номер {0} создан
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Вибро дораде
 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,Реклама
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Пробни период
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Пробни период
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Само листа чворови су дозвољени у трансакцији
 DocType: Expense Claim,Expense Approver,Расходи одобраватељ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Куповина Потврда јединице у комплету
@@ -2381,19 +2301,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Да датетиме
 DocType: SMS Settings,SMS Gateway URL,СМС Гатеваи УРЛ адреса
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Протоколи за одржавање смс статус испоруке
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Млевење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Скупи враппинг
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Пендинг Активности
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Потврђен
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Добављач> Добављач Тип
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Пожалуйста, введите даты снятия ."
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Амт
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Только Оставьте приложений с статуса ""Одобрено"" могут быть представлены"
+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 +21,Address Title is mandatory.,Адрес Название является обязательным.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Унесите назив кампање, ако извор истраге је кампања"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Новински издавачи
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Новински издавачи
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Изаберите Фискална година
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Топљење
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Реордер Ниво
 DocType: Attendance,Attendance Date,Гледалаца Датум
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Плата распада на основу зараде и дедукције.
@@ -2408,16 +2325,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Грешка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,У речи ће бити видљив када сачувате продајних налога.
 ,Employee Birthday,Запослени Рођендан
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Вентуре Цапитал
+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: Pricing Rule,Discount Percentage,Скидка в процентах
 DocType: Payment Reconciliation Invoice,Invoice Number,Фактура број
-apps/erpnext/erpnext/hooks.py +70,Orders,Поруџбине
+apps/erpnext/erpnext/hooks.py +54,Orders,Поруџбине
 DocType: Leave Control Panel,Employee Type,Запослени Тип
 DocType: Employee Leave Approver,Leave Approver,Оставите Аппровер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Машина за савијање
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Материјал Пребачен за производњу
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Корисник са ""Расходи одобраватељ"" улози"
 ,Issued Items Against Production Order,Издате Артикли против редоследа израде
@@ -2429,7 +2345,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,МВЗ с существующими сделок не могут быть преобразованы в группе
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,амортизация
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Супплиер (с)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Неважећи Период
 DocType: Customer,Credit Limit,Кредитни лимит
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Изаберите тип трансакције
 DocType: GL Entry,Voucher No,Ваучер Бр.
@@ -2439,9 +2354,9 @@
 DocType: Customer,Address and Contact,Адреса и контакт
 DocType: Customer,Last Day of the Next Month,Последњи дан наредног мјесеца
 DocType: Employee,Feedback,Повратна веза
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Оставите не може се доделити пре {0}, као одсуство стање је већ Царри-прослеђен у будућем расподеле одсуство записника {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Напомена: Због / Референтни Датум прелази дозвољене кредитним купац дана од {0} дана (и)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Инцл. Распоред
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Брусни Јет машинска обрада
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Инцл. Распоред
 DocType: Stock Settings,Freeze Stock Entries,Фреезе уносе берза
 DocType: Website Settings,Website Settings,Сајт Подешавања
 DocType: Item,Reorder level based on Warehouse,Промени редослед ниво на основу Варехоусе
@@ -2458,7 +2373,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Схов Сток уноси
 ,Is Primary Address,Примарна Адреса
 DocType: Production Order,Work-in-Progress Warehouse,Рад у прогресу Магацин
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Ссылка # {0} от {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Ссылка # {0} от {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Управљање адресе
 DocType: Pricing Rule,Item Code,Шифра
 DocType: Production Planning Tool,Create Production Orders,Креирање налога Производне
@@ -2467,7 +2382,7 @@
 DocType: Lead,Market Segment,Сегмент тржишта
 DocType: Communication,Phone,Телефон
 DocType: Employee Internal Work History,Employee Internal Work History,Запослени Интерна Рад Историја
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Затварање (др)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Затварање (др)
 DocType: Contact,Passive,Пасиван
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Серийный номер {0} не в наличии
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Налоговый шаблон для продажи сделок.
@@ -2483,8 +2398,8 @@
 ,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 +129,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Додајте неколико узорака евиденцију
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Додајте неколико узорака евиденцију
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Оставите Манагемент
 DocType: Event,Groups,Групе
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Группа по Счет
@@ -2497,38 +2412,34 @@
 DocType: Features Setup,Sales Extras,Продаја Екстра
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет на счет {1} против МВЗ {2} будет превышать {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика Рачун мора бити тип активом / одговорношћу рачуна, јер Сток Помирење је отварање Ступање"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Од датума"" мора бити након ""До датума"""
 ,Stock Projected Qty,Пројектовани Стоцк Кти
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
 DocType: Sales Order,Customer's Purchase Order,Куповина нарудзбини
 DocType: Warranty Claim,From Company,Из компаније
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Вредност или Кол
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,минут
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,минут
 DocType: Purchase Invoice,Purchase Taxes and Charges,Куповина Порези и накнаде
 ,Qty to Receive,Количина за примање
 DocType: Leave Block List,Leave Block List Allowed,Оставите Блоцк Лист Дозвољени
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Коэффициент пересчета не может быть в долях
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Ви ћете га користити за Пријављивање
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Ви ћете га користити за Пријављивање
 DocType: Sales Partner,Retailer,Продавац на мало
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Кредит на рачун мора да буде биланса стања
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Сви Типови добављача
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Код товара является обязательным, поскольку Деталь не автоматически нумеруются"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Цитата {0} не типа {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Цитата {0} не типа {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Одржавање Распоред шифра
 DocType: Sales Order,%  Delivered,Испоручено %
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Банк Овердрафт счета
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Маке плата Слип
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Бровсе БОМ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Обеспеченные кредиты
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Потрясающие Продукты
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Потрясающие Продукты
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Почетно стање Капитал
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Не можете одобрить отпуск , пока вы не уполномочен утверждать листья на блоке Даты"
 DocType: Appraisal,Appraisal,Процена
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Лост-пена ливење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Цртеж
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Датум се понавља
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Оставьте утверждающий должен быть одним из {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,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,Почетак Време
@@ -2542,7 +2453,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Нето износ (Фирма валута)
 DocType: BOM Operation,Hour Rate,Стопа час
 DocType: Stock Settings,Item Naming By,Шифра назив под
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Од понуде
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Од понуде
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Другой Период Окончание Вступление {0} был сделан после {1}
 DocType: Production Order,Material Transferred for Manufacturing,Материјал пребачени на Мануфацтуринг
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Рачун {0} не постоји
@@ -2556,21 +2467,19 @@
 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 +72,Delivery warehouse required for stock item {0},Испорука складиште потребно за лагеру предмета {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Испорука складиште потребно за лагеру предмета {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Бруто тежина пакета. Обично нето тежина + амбалаже тежина. (За штампу)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Корисници са овом улогом је дозвољено да подесите замрзнуте рачуне и створити / модификује рачуноводствене уносе против замрзнутим рачунима
 DocType: Serial No,Is Cancelled,Да ли Отказан
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Моје пошиљке
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Моје пошиљке
 DocType: Journal Entry,Bill Date,Бил Датум
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Чак и ако постоји више Цене правила са највишим приоритетом, онда следећи интерни приоритети се примењују:"
 DocType: Supplier,Supplier Details,Добављачи Детаљи
 DocType: Communication,Recipients,Примаоци
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Сцревинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Кнурлинг
 DocType: Expense Claim,Approval Status,Статус одобравања
 DocType: Hub Settings,Publish Items to Hub,Објављивање артикле у Хуб
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},"От значение должно быть меньше , чем значение в строке {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Вире Трансфер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Вире Трансфер
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Изаберите банковни рачун
 DocType: Newsletter,Create and Send Newsletters,Стварање и слање Билтен
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Од датума мора да буде пре датума
@@ -2578,14 +2487,14 @@
 DocType: Company,Default Income Account,Уобичајено прихода Рачун
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Кориснички Група / Кориснички
 DocType: Item Group,Check this if you want to show in website,Проверите ово ако желите да прикажете у Веб
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Добродошли у ЕРПНект
+,Welcome to ERPNext,Добродошли у ЕРПНект
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Ваучер Детаљ Број
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Олово и цитата
 DocType: Lead,From Customer,Од купца
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Звонки
+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,Берза УОМ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Заказ на {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Заказ на {0} не представлено
 ,Projected,пројектован
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Серийный номер {0} не принадлежит Склад {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Примечание: Система не будет проверять по - доставки и избыточного бронирования по пункту {0} как количестве 0
@@ -2593,7 +2502,6 @@
 DocType: Issue,Opening Date,Датум отварања
 DocType: Journal Entry,Remark,Примедба
 DocType: Purchase Receipt Item,Rate and Amount,Стопа и износ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Досадан
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Од продајних налога
 DocType: Blog Category,Parent Website Route,Родитель Сайт Маршрут
 DocType: Sales Order,Not Billed,Није Изграђена
@@ -2607,19 +2515,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Сумма скидки
 DocType: Purchase Invoice,Return Against Purchase Invoice,Повратак против фактури
 DocType: Item,Warranty Period (in days),Гарантни период (у данима)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,например НДС
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,например НДС
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Тачка 4
 DocType: Journal Entry Account,Journal Entry Account,Јоурнал Ентри рачуна
 DocType: Shopping Cart Settings,Quotation Series,Цитат Серија
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Элемент существует с тем же именем ({0} ) , пожалуйста, измените название группы или переименовать пункт"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Врелог метала гаса формирање
 DocType: Sales Order Item,Sales Order Date,Продаја Датум поруџбине
 DocType: Sales Invoice Item,Delivered Qty,Испоручено Кол
 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.",Иди на одговарајуће групе (обично извор средстава> садашње пасиве> порезе и царине и креирати нови налог (кликом на Додај Цхилд) типа "порез" и помињу пореска стопа.
 ,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}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Ласерски сечење
 DocType: Event,Monday,Понедељак
 DocType: Journal Entry,Stock Entry,Берза Ступање
 DocType: Account,Payable,к оплате
@@ -2652,7 +2558,7 @@
 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 +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Ставка {0}: Ж ком {1} не може бити мањи од Минимална количина за поручивање {2} (дефинисан у тачки).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Ставка {0}: Ж ком {1} не може бити мањи од Минимална количина за поручивање {2} (дефинисан у тачки).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечни Дистрибуција Проценат
 DocType: Territory,Territory Targets,Територија Мете
 DocType: Delivery Note,Transporter Info,Транспортер Инфо
@@ -2661,7 +2567,6 @@
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Титулы для шаблонов печатных например Фактуры Proforma .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Тип Процена трошкови не могу означити као инцлусиве
 DocType: POS Profile,Update Stock,Упдате Стоцк
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Суперфинисхинг
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Различные Единица измерения для элементов приведет к некорректному (Всего) значение массы нетто . Убедитесь, что вес нетто каждого элемента находится в том же UOM ."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,БОМ курс
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Пожалуйста вытяните элементов из накладной
@@ -2676,7 +2581,6 @@
 ,Purchase Analytics,Куповина Аналитика
 DocType: Sales Invoice Item,Delivery Note Item,Испорука Напомена Ставка
 DocType: Expense Claim,Task,Задатак
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Бријање
 DocType: Purchase Taxes and Charges,Reference Row #,Ссылка Row #
 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.,То јекорен продаје човек и не може се мењати .
@@ -2688,13 +2592,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Цель должна быть одна из {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Попуните формулар и да га сачувате
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Преузмите извештај садржи све сировине са њиховим најновијим инвентара статусу
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Фацинг
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Форум
 DocType: Leave Application,Leave Balance Before Application,Оставите биланс Пре пријаве
 DocType: SMS Center,Send SMS,Пошаљи СМС
 DocType: Company,Default Letter Head,Уобичајено Леттер Хеад
 DocType: Time Log,Billable,Уплатилац
-DocType: Authorization Rule,This will be used for setting rule in HR module,Ово ће се користити за постављање правила у ХР модулу
 DocType: Account,Rate at which this tax is applied,Стопа по којој се примењује овај порез
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Реордер ком
 DocType: Company,Stock Adjustment Account,Стоцк Подешавање налога
@@ -2721,16 +2623,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Процент Распределение должно быть равно 100%
 DocType: Serial No,Out of AMC,Од АМЦ
 DocType: Purchase Order Item,Material Request Detail No,Материјал Захтев Детаљ Нема
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Хард окретања
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Маке одржавање Посетите
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Молимо контактирајте кориснику који је продаја Мастер менаџер {0} улогу
 DocType: Company,Default Cash Account,Уобичајено готовински рачун
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Компания ( не клиента или поставщика ) хозяин.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Пожалуйста, введите ' ожидаемой даты поставки """
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Пожалуйста, введите ' ожидаемой даты поставки """
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,"Платные сумма + списания сумма не может быть больше, чем общий итог"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} не является допустимым номер партии по пункту {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Примечание: Существует не хватает отпуск баланс для отпуске Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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,Прилика Тип
@@ -2742,51 +2643,45 @@
 DocType: Hub Settings,Publish Availability,Објављивање Доступност
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Датум рођења не може бити већи него данас.
 ,Stock Ageing,Берза Старење
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' је онемогућен
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{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/report/bom_search/bom_search.js +20,Item 3,Тачка 3
 DocType: Purchase Order,Customer Contact Email,Кориснички Контакт Е-маил
 DocType: Event,Sunday,Недеља
 DocType: Sales Team,Contribution (%),Учешће (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана , так как "" Наличные или Банковский счет "" не был указан"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Одговорности
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана , так как "" Наличные или Банковский счет "" не был указан"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Одговорности
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продаја Особа Име
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Пожалуйста, введите не менее чем 1 -фактуру в таблице"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Додај корисника
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Додај корисника
 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 +340,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 +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
 DocType: Sales Order,Partly Billed,Делимично Изграђена
 DocType: Item,Default BOM,Уобичајено БОМ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Децамберинг
 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,Укупно Изванредна Амт
 DocType: Time Log Batch,Total Hours,Укупно време
 DocType: Journal Entry,Printing Settings,Принтинг Подешавања
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Укупно задуживање мора бити једнак укупном кредитном .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,аутомобилски
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Пункт требуется
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Метални бризгање
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Укупно задуживање мора бити једнак укупном кредитном .
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,аутомобилски
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Из доставница
 DocType: Time Log,From Time,Од времена
 DocType: Notification Control,Custom Message,Прилагођена порука
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Инвестиционо банкарство
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Изаберите своју земљу, временску зону и валуту"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Инвестиционо банкарство
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Изаберите своју земљу, временску зону и валуту"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Наличными или банковский счет является обязательным для внесения записи платежей
 DocType: Purchase Invoice,Price List Exchange Rate,Цена курсној листи
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Стављање у туршију
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Песак ливење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Елецтроплатинг
 DocType: Purchase Invoice Item,Rate,Стопа
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,стажиста
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,стажиста
 DocType: Newsletter,A Lead with this email id should exist,Олово са овом е ид треба да постоје
 DocType: Stock Entry,From BOM,Од БОМ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,основной
+apps/erpnext/erpnext/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',"Пожалуйста, нажмите на кнопку "" Generate Расписание """
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Да Дате треба да буде исти као Од датума за полудневни одсуство
@@ -2794,11 +2689,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Ссылка № является обязательным, если вы ввели Исходной дате"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Дата Присоединение должно быть больше Дата рождения
 DocType: Salary Structure,Salary Structure,Плата Структура
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Вишеструки Цена Правило постоји са истим критеријумима, молимо реши конфликт \
 , са приоритетом. Цена Правила: {0}"
 DocType: Account,Bank,Банка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,ваздушна линија
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ваздушна линија
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Питање Материјал
 DocType: Material Request Item,For Warehouse,За Варехоусе
 DocType: Employee,Offer Date,Понуда Датум
@@ -2808,29 +2703,24 @@
 DocType: Item,Is Fixed Asset Item,Является основного средства дня Пункт
 DocType: Stock Entry,Including items for sub assemblies,Укључујући ставке за под скупштине
 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/page/setup_wizard/fixtures/operations.py +131,Hobbing,Хоббинг
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Все территории
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Все территории
 DocType: Purchase Invoice,Items,Артикли
 DocType: Fiscal Year,Year Name,Име године
 DocType: Process Payroll,Process Payroll,Процес Паиролл
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,"Есть больше праздников , чем рабочих дней в этом месяце."
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,There are more holidays than working days this month.,"Есть больше праздников , чем рабочих дней в этом месяце."
 DocType: Product Bundle Item,Product Bundle Item,Производ Бундле артикла
 DocType: Sales Partner,Sales Partner Name,Продаја Име партнера
 DocType: Purchase Invoice Item,Image View,Слика Погледај
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Дорада и индустријска обрада
 DocType: Issue,Opening Time,Радно време
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"От и До даты , необходимых"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Хартије од вредности и робним берзама
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Хартије од вредности и робним берзама
 DocType: Shipping Rule,Calculate Based On,Израчунајте Басед Он
 DocType: Delivery Note Item,From Warehouse,Од Варехоусе
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Бушење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Дување
 DocType: Purchase Taxes and Charges,Valuation and Total,Вредновање и Тотал
 DocType: Tax Rule,Shipping City,Достава Град
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Ово артикла је варијанта {0} (Темплате). Атрибути ће бити копирани са шаблона осим 'Нема Копирање' постављено
 DocType: Account,Purchase User,Куповина Корисник
 DocType: Notification Control,Customize the Notification,Прилагођавање обавештења
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Закуцавање
 DocType: Web Page,Slideshow,Слидесхов
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Уобичајено Адреса Шаблон не може бити обрисан
 DocType: Sales Invoice,Shipping Rule,Достава Правило
@@ -2839,9 +2729,8 @@
 DocType: Workflow State,Search,Претрага
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Всего не может быть нулевым
 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,"""Дана од последње поруџбине"" мора бити веће или једнако нули"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Лемљење
 DocType: C-Form,Amended From,Измењена од
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,сырье
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,сырье
 DocType: Leave Application,Follow via Email,Пратите преко е-поште
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Сумма налога После скидка сумма
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Детский учетная запись существует для этой учетной записи . Вы не можете удалить этот аккаунт .
@@ -2855,10 +2744,10 @@
 ,Produced,произведен
 DocType: Item,Item Code for Suppliers,Код за добављаче артикла
 DocType: Issue,Raised By (Email),Подигао (Е-маил)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Општи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Прикрепите бланке
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Општи
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Прикрепите бланке
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Не можете вычесть , когда категория для "" Оценка "" или "" Оценка и Всего"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Листа пореске главе (нпр ПДВ, царине, итд, они треба да имају јединствена имена) и њихове стандардне цене. Ово ће створити стандардни модел, који можете уредити и додати још касније."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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},Серийный Нос Требуется для сериализованный элемент {0}
 DocType: Journal Entry,Bank Entry,Банка Унос
 DocType: Authorization Rule,Applicable To (Designation),Важећи Да (Именовање)
@@ -2867,31 +2756,29 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Включение / отключение валюты.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Почтовые расходы
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Укупно (Амт)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Забава и слободно време
+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 +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} мора бити смањена за {1} или би требало да повећа толеранцију преливања
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Укупно Поклон
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,час
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,час
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Серијализованом артикла {0} не може да се ажурира \
  користећи Сток помирење"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Пребаци Материјал добављачу
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Пребаци Материјал добављачу
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новый Серийный номер не может быть Склад . Склад должен быть установлен на фондовой Вступил или приобрести получении
 DocType: Lead,Lead Type,Олово Тип
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Направи понуду
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Все эти предметы уже выставлен счет
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Нисте ауторизовани да одобри лишће на блок Датуми
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Все эти предметы уже выставлен счет
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Может быть одобрено {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Правило услови испоруке
 DocType: BOM Replace Tool,The new BOM after replacement,Нови БОМ након замене
 DocType: Features Setup,Point of Sale,Поинт оф Сале
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Коврђжаст
 DocType: Account,Tax,Порез
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Ред {0}: {1} није валидан {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Прерада
+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,Извештај Дате
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Роутинг
 DocType: C-Form,Invoices,Рачуни
 DocType: Job Opening,Job Title,Звање
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Примаоци
@@ -2911,14 +2798,13 @@
 DocType: DocType,Setup,Намештаљка
 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,Преглед за овај месец и чекају активности
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Хладно ваљање
 DocType: Customer Group,Customer Group Name,Кориснички Назив групе
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Молимо вас да уклоните ову фактуру {0} од Ц-Форм {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Молимо вас да уклоните ову фактуру {0} од Ц-Форм {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,Атрибути
 DocType: Packing Slip,Get Items,Гет ставке
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Пожалуйста, введите списать счет"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,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,Последњи Низ Датум
 DocType: DocField,Image,Слика
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Маке Акциза фактура
@@ -2928,7 +2814,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Операција ИД није сет
 DocType: Production Order,Planned Start Date,Планирани датум почетка
 DocType: Serial No,Creation Document Type,Документ регистрације Тип
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Инцл. Посета
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Инцл. Посета
 DocType: Leave Type,Is Encash,Да ли уновчити
 DocType: Purchase Invoice,Mobile No,Мобилни Нема
 DocType: Payment Tool,Make Journal Entry,Маке Јоурнал Ентри
@@ -2936,35 +2822,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Проект мудрый данные не доступны для коммерческого предложения
 DocType: Project,Expected End Date,Очекивани датум завршетка
 DocType: Appraisal Template,Appraisal Template Title,Процена Шаблон Наслов
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,коммерческий
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,коммерческий
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Родитељ артикла {0} не сме бити лагеру предмета
 DocType: Cost Center,Distribution Id,Дистрибуција Ид
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Потрясающие услуги
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Потрясающие услуги
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Сви производи или услуге.
 DocType: Purchase Invoice,Supplier Address,Снабдевач Адреса
 DocType: Contact Us Settings,Address Line 2,Аддресс Лине 2
 DocType: ToDo,Reference,Упућивање
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Перфоратинг
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Од Кол
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Правила за израчунавање износа испоруке за продају
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Серия является обязательным
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Финансијске услуге
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Финансијске услуге
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Вредност атрибута за {0} мора бити у распону од {1} {2} да у корацима од {3}
 DocType: Tax Rule,Sales,Продајни
 DocType: Stock Entry Detail,Basic Amount,Основни Износ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
 DocType: Leave Allocation,Unused leaves,Неискоришћени листови
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Кр
 DocType: Customer,Default Receivable Accounts,Уобичајено Рецеивабле Аццоунтс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Тестерисање
 DocType: Tax Rule,Billing State,Тецх Стате
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Ламинација
 DocType: Item Reorder,Transfer,Пренос
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Фетцх експлодирала бом ( укључујући подсклопова )
 DocType: Authorization Rule,Applicable To (Employee),Важећи Да (запослених)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Дуе Дате обавезна
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Повећање за Аттрибуте {0} не може бити 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Синтеровање
 DocType: Journal Entry,Pay To / Recd From,Плати Да / Рецд Од
 DocType: Naming Series,Setup Series,Подешавање Серија
 DocType: Supplier,Contact HTML,Контакт ХТМЛ
@@ -2977,7 +2859,6 @@
 DocType: Attendance,Absent,Одсутан
 DocType: Product Bundle,Product Bundle,Производ Бундле
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Ред {0}: Погрешна референца {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Црусхинг
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купите порези и таксе Темплате
 DocType: Upload Attendance,Download Template,Преузмите шаблон
 DocType: GL Entry,Remarks,Примедбе
@@ -2985,14 +2866,12 @@
 DocType: Journal Entry,Write Off Based On,Отпис Басед Он
 DocType: Features Setup,POS View,ПОС Погледај
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Инсталација рекорд за серијским бр
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Континуирано ливење
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Наведите
 DocType: Offer Letter,Awaiting Response,Очекујем одговор
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Горе
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Хладно димензионисање
 DocType: Salary Slip,Earning & Deduction,Зарада и дедукције
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Счет {0} не может быть группа
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Регија
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Регија
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Опционо . Ова поставка ће се користити за филтрирање у различитим трансакцијама .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Негативно Вредновање курс није дозвољен
 DocType: Holiday List,Weekly Off,Недељни Искључено
@@ -3010,7 +2889,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Счет {0} неактивен
 DocType: GL Entry,Is Advance,Да ли Адванце
 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 +131,Please enter 'Is Subcontracted' as Yes or No,"Пожалуйста, введите ' Является субподряду "", как Да или Нет"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Пожалуйста, введите ' Является субподряду "", как Да или Нет"
 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,""" Прибыль и убытки "" тип счета {0} не допускаются в Открытие запись"
 DocType: Workflow State,Time,Време
@@ -3019,14 +2898,13 @@
 DocType: Authorization Rule,Authorization Rule,Овлашћење Правило
 DocType: Sales Invoice,Terms and Conditions Details,Услови Детаљи
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Продаја Порези и накнаде Темплате
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Одећа и прибор
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Одећа и прибор
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Број Реда
 DocType: Item Group,HTML / Banner that will show on the top of product list.,ХТМЛ / банер који ће се појавити на врху листе производа.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Наведите услове да може да израчуна испоруку износ
 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/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Коэффициент преобразования требуется
 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,Вредност / Опис
@@ -3034,10 +2912,8 @@
 ,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/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Испупчен
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Евапоративе-образац ливење
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,представительские расходы
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Счет Продажи {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,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 ."
@@ -3056,26 +2932,24 @@
 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 +241,Account: {0} with currency: {1} can not be selected,Рачун: {0} са валутом: {1} не може бити изабран
+apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,Рачун: {0} са валутом: {1} не може бити изабран
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Датум
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,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/page/setup_wizard/fixtures/operations.py +111,Honing,Хонинг
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,пробни рад
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,По умолчанию Склад является обязательным для складе Пункт .
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,пробни рад
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,По умолчанию Склад является обязательным для складе Пункт .
 DocType: Feed,Full Name,Пуно име
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Цлинцхинг
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Выплата заработной платы за месяц {0} и год {1}
+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,Укупно Плаћени износ
 ,Transferred Qty,Пренето Кти
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Навигација
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,планирање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,планирање
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Маке Тиме Лог Батцх
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Издато
 DocType: Project,Total Billing Amount (via Time Logs),Укупно цард Износ (преко Тиме Протоколи)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Ми продајемо ову ставку
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Ми продајемо ову ставку
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Добављач Ид
 DocType: Journal Entry,Cash Entry,Готовина Ступање
 DocType: Sales Partner,Contact Desc,Контакт Десц
@@ -3084,18 +2958,16 @@
 DocType: Brand,Item Manager,Тачка директор
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Додајте редове одређује годишње буџете на рачунима.
 DocType: Buying Settings,Default Supplier Type,Уобичајено Снабдевач Тип
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Вађење
 DocType: Production Order,Total Operating Cost,Укупни оперативни трошкови
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Примечание: Пункт {0} вошли несколько раз
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Примечание: Пункт {0} вошли несколько раз
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Сви контакти.
 DocType: Newsletter,Test Email Id,Тест маил Ид
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Компанија Скраћеница
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Компанија Скраћеница
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Если вы будете следовать осмотра качества . Разрешает Item требуется и QA QA Нет в ТОВАРНЫЙ ЧЕК
 DocType: GL Entry,Party Type,партия Тип
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,"Сырье не может быть такой же, как главный пункт"
 DocType: Item Attribute Value,Abbreviation,Скраћеница
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Не Authroized с {0} превышает пределы
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Ротациона лајсне
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Шаблоном Зарплата .
 DocType: Leave Type,Max Days Leave Allowed,Мак Дани Оставите животиње
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Сет Пореска Правило за куповину
@@ -3109,15 +2981,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Цитати на води или клијената.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Улога дозвољено да мењате замрзнуте залихе
 ,Territory Target Variance Item Group-Wise,Территория Целевая Разница Пункт Группа Мудрого
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Все Группы клиентов
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} је обавезно. Можда Мењачница запис није створен за {1} на {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Все Группы клиентов
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} је обавезно. Можда Мењачница запис није створен за {1} на {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Пореска Шаблон је обавезно.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Рачун {0}: {1 Родитељ рачун} не постоји
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценовник Цена (Друштво валута)
 DocType: Account,Temporary,Привремен
 DocType: Address,Preferred Billing Address,Жељени Адреса за наплату
 DocType: Monthly Distribution Percentage,Percentage Allocation,Проценат расподеле
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,секретар
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,секретар
 DocType: Serial No,Distinct unit of an Item,Разликује јединица стране јединице
 DocType: Pricing Rule,Buying,Куповина
 DocType: HR Settings,Employee Records to be created by,Евиденција запослених које ће креирати
@@ -3130,9 +3002,8 @@
 ,Item-wise Price List Rate,Ставка - мудар Ценовник курс
 DocType: Purchase Order Item,Supplier Quotation,Снабдевач Понуда
 DocType: Quotation,In Words will be visible once you save the Quotation.,У речи ће бити видљив када сачувате цитат.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Пеглање
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} је заустављена
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Штрих {0} уже используется в пункте {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,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,Предстојећи догађаји
@@ -3141,13 +3012,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Брзо Ступање
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} је обавезна за повратак
 DocType: Purchase Order,To Receive,Примити
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Скупи Фиттинг
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,усер@екампле.цом
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,усер@екампле.цом
 DocType: Email Digest,Income / Expense,Приходи / расходи
 DocType: Employee,Personal Email,Лични Е-маил
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Укупна разлика
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Укупна разлика
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ако је укључен, систем ће писати уносе рачуноводствене инвентар аутоматски."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,посредништво
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,посредништво
 DocType: Address,Postal Code,поштански код
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","у Минутес 
@@ -3155,14 +3025,13 @@
 DocType: Customer,From Lead,Од Леад
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Поруџбине пуштен за производњу.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Изаберите Фискална година ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,ПОС Профил потребно да ПОС Ентри
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,ПОС Профил потребно да ПОС Ентри
 DocType: Hub Settings,Name Token,Име токен
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Планирање
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Стандардна Продаја
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Стандардна Продаја
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Атлеаст једно складиште је обавезно
 DocType: Serial No,Out of Warranty,Од гаранције
 DocType: BOM Replace Tool,Replace,Заменити
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} против продаје фактуре {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} против продаје фактуре {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Пожалуйста, введите умолчанию единицу измерения"
 DocType: Purchase Invoice Item,Project Name,Назив пројекта
 DocType: Supplier,Mention if non-standard receivable account,Спомените ако нестандардни потраживања рачуна
@@ -3178,9 +3047,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Јоурнал Ентри {0} нема налог {1} или већ упарен против другог ваучера
 DocType: Item,Moving Average,Мовинг Авераге
 DocType: BOM Replace Tool,The BOM which will be replaced,БОМ који ће бити замењен
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Новый фонда единица измерения должна отличаться от текущей фондовой UOM
 DocType: Account,Debit,Задужење
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Листья должны быть выделены несколько 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Листья должны быть выделены несколько 0,5"
 DocType: Production Order,Operation Cost,Операција кошта
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Постави присуство из ЦСВ датотеке.
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Изузетан Амт
@@ -3198,8 +3066,7 @@
 DocType: Employee,Internal Work History,Интерни Рад Историја
 DocType: DocField,Column Break,Колона Пауза
 DocType: Event,Thursday,Четвртак
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Приватни капитал
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Скретање
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Приватни капитал
 DocType: Maintenance Visit,Customer Feedback,Кориснички Феедбацк
 DocType: Account,Expense,расход
 DocType: Sales Invoice,Exhibition,Изложба
@@ -3212,19 +3079,19 @@
 DocType: Employee,Held On,Одржана
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Производња артикла
 ,Employee Information,Запослени Информације
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Ставка (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Ставка (%)
 DocType: Stock Entry Detail,Additional Cost,Додатни трошак
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Финансовый год Дата окончания
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Финансовый год Дата окончания
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Не можете да филтрирате на основу ваучер Не , ако груписани по ваучер"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Направи понуду добављача
 DocType: Quality Inspection,Incoming,Долазни
 DocType: BOM,Materials Required (Exploded),Материјали Обавезно (Екплодед)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Смањите Зарада за дозволу без плате (ЛВП)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Додај корисника у вашој организацији, осим себе"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Додај корисника у вашој организацији, осим себе"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Ред # {0}: Серијски број {1} не одговара {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Повседневная Оставить
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Повседневная Оставить
 DocType: Batch,Batch ID,Батцх ИД
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Примечание: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Примечание: {0}
 ,Delivery Note Trends,Достава Напомена трендови
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Овонедељном Преглед
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} должен быть куплены или субподрядчиком Пункт в строке {1}
@@ -3236,7 +3103,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Повратак против рачуном
 DocType: Purchase Order,To Bill,Билу
 DocType: Material Request,% Ordered,% Од А до Ж
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,рад плаћен на акорд
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,рад плаћен на акорд
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Про. Куповни
 DocType: Task,Actual Time (in Hours),Тренутно време (у сатима)
 DocType: Employee,History In Company,Историја У друштву
@@ -3253,13 +3120,13 @@
 DocType: Opportunity,To Discuss,Да Дисцусс
 DocType: SMS Settings,SMS Settings,СМС подешавања
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Привремене рачуни
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Црн
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Црн
 DocType: BOM Explosion Item,BOM Explosion Item,БОМ Експлозија шифра
 DocType: Account,Auditor,Ревизор
 DocType: Purchase Order,End date of current order's period,Датум завршетка периода постојећи поредак је
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Маке Оффер Леттер
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Повратак
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Уобичајено Јединица мере за варијанту морају бити исти као шаблон
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Уобичајено Јединица мере за варијанту морају бити исти као шаблон
 DocType: DocField,Fold,Преклопити
 DocType: Production Order Operation,Production Order Operation,Производња Ордер Операција
 DocType: Pricing Rule,Disable,запрещать
@@ -3270,13 +3137,12 @@
 DocType: Page,Page Name,Страница Име
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Да Време мора бити већи од Фром Тиме
 DocType: Journal Entry Account,Exchange Rate,Курс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Магацин {0}: {1 Родитељ рачун} не Болонг предузећу {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Вретена обрада
 DocType: BOM,Last Purchase Rate,Последња куповина Стопа
 DocType: Account,Asset,преимућство
 DocType: Project Task,Task ID,Задатак ИД
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","например ""МС """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","например ""МС """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Стоцк не може постојати за ставку {0} од има варијанте
 ,Sales Person-wise Transaction Summary,Продавац у питању трансакција Преглед
 DocType: System Settings,Time Zone,Временска зона
@@ -3285,9 +3151,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Месечни Дистрибуција Проценти
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Изабрана опција не може имати Батцх
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% испоручених материјала на основу ове Отпремнице
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Стаплинг
 DocType: Customer,Customer Details,Кориснички Детаљи
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Обликовање
 DocType: Employee,Reports to,Извештаји
 DocType: SMS Settings,Enter url parameter for receiver nos,Унесите УРЛ параметар за пријемник бр
 DocType: Sales Invoice,Paid Amount,Плаћени Износ
@@ -3296,13 +3160,13 @@
 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/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Стање рачуна већ у задуживање, није вам дозвољено да поставите 'Стање Муст Бе' као 'Кредит'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Управљање квалитетом
+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/stock_ledger/stock_ledger.py +34,Balance Qty,Стање Кол
+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,Цост центри
@@ -3312,12 +3176,12 @@
 DocType: Opportunity,Next Contact,Следећа Контакт
 DocType: Employee,Employment Type,Тип запослења
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,капитальные активы
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Период примене не могу бити на два намјена евиденције
 DocType: Item Group,Default Expense Account,Уобичајено Трошкови налога
 DocType: Employee,Notice (days),Обавештење ( дана )
 DocType: Page,Yes,Да
 DocType: Tax Rule,Sales Tax Template,Порез на промет Шаблон
 DocType: Employee,Encashment Date,Датум Енцасхмент
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Елецтроформинг
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Против Ваучер Тип мора бити један од нарудзбенице, фактури или Јоурнал Ентри"
 DocType: Account,Stock Adjustment,Фото со Регулировка
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Уобичајено активност Трошкови постоји за тип активности - {0}
@@ -3353,12 +3217,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не может быть удален как существует запись складе книга для этого склада .
 DocType: Company,Distribution,Дистрибуција
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Износ Плаћени
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Пројецт Манагер
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,депеша
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Пројецт Манагер
+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: Customer,Default Taxes and Charges,Уобичајено таксе и накнаде
 DocType: Account,Receivable,Дебиторская задолженность
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ред # {0}: Није дозвољено да промени снабдевача као Пурцхасе Ордер већ постоји
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,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.","Ако је проверен, бом за под-монтаже ставки ће бити узети у обзир за добијање сировина. Иначе, сви суб-монтажни ставке ће бити третирани као сировина."
@@ -3366,8 +3230,8 @@
 DocType: Hub Settings,Seller Description,Продавац Опис
 DocType: Employee Education,Qualification,Квалификација
 DocType: Item Price,Item Price,Артикал Цена
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Сапун и детерџент
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Мотион Пицтуре & Видео
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Сапун и детерџент
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Мотион Пицтуре & Видео
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ж
 DocType: Warehouse,Warehouse Name,Магацин Име
 DocType: Naming Series,Select Transaction,Изаберите трансакцију
@@ -3376,7 +3240,6 @@
 DocType: BOM,Rate Of Materials Based On,Стопа материјала на бази
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Подршка Аналтиицс
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Компания на складах отсутствует {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Берза УОМ Замени комунално
 DocType: POS Profile,Terms and Conditions,Услови
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,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","Овде можете одржавати висина, тежина, алергија, медицинску забринутост сл"
@@ -3388,7 +3251,7 @@
 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,Унесите продаје ред у табели
 DocType: Project Task,View Task,Погледај Задатак
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Ваша финансијска година почиње
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Ваша финансијска година почиње
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Молимо Вас да унесете куповини Приливи
 DocType: Sales Invoice,Get Advances Received,Гет аванси
 DocType: Email Digest,Add/Remove Recipients,Адд / Ремове прималаца
@@ -3396,16 +3259,14 @@
 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 +528,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
 DocType: Salary Slip,Salary Slip,Плата Слип
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Брунирање
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,' To Date ' требуется
+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.","Генерисати паковање признанице за да буде испоручена пакети. Користи се за обавијести пакет број, Садржај пакета и његову тежину."
 DocType: Sales Invoice Item,Sales Order Item,Продаја Наручите артикла
 DocType: Salary Slip,Payment Days,Дана исплате
 DocType: BOM,Manage cost of operations,Управљање трошкове пословања
 DocType: Features Setup,Item Advanced,Ставка Напредна
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Топло ваљање
 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,Запослени Образовање
@@ -3418,25 +3279,23 @@
 DocType: Customer,Sales Team Details,Продајни тим Детаљи
 DocType: Expense Claim,Total Claimed Amount,Укупан износ полаже
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Потенцијалне могућности за продају.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Отпуск по болезни
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Неважећи {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Отпуск по болезни
 DocType: Email Digest,Email Digest,Е-маил Дигест
 DocType: Delivery Note,Billing Address Name,Адреса за наплату Име
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Робне куце
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Робне куце
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Систем Стање
 DocType: Workflow,Is Active,Је активан
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Нет учетной записи для следующих складов
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Први Сачувајте документ.
 DocType: Account,Chargeable,Наплатив
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Линисхинг
 DocType: Company,Change Abbreviation,Промена скраћеница
 DocType: Workflow State,Primary,Основни
 DocType: Expense Claim Detail,Expense Date,Расходи Датум
 DocType: Item,Max Discount (%),Максимална Попуст (%)
 DocType: Communication,More Information,Више информација
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Последњи Наручи Количина
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Бластинг
 DocType: Company,Warn,Упозорити
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Пункт оценка обновляются
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Било који други примедбе, напоменути напор који треба да иде у евиденцији."
 DocType: BOM,Manufacturing User,Производња Корисник
 DocType: Purchase Order,Raw Materials Supplied,Сировине комплету
@@ -3446,7 +3305,7 @@
 DocType: Appraisal,Appraisal Template,Процена Шаблон
 DocType: Communication,Email,Е-маил
 DocType: Item Group,Item Classification,Итем Класификација
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Менаџер за пословни развој
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Менаџер за пословни развој
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Одржавање посета Сврха
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,период
 ,General Ledger,Главна књига
@@ -3456,9 +3315,7 @@
 ,Itemwise Recommended Reorder Level,Препоручени ниво Итемвисе Реордер
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Изаберите {0} први
 DocType: Features Setup,To get Item Group in details table,Да бисте добили групу ставка у табели детаљније
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Прекрајање
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Батцх {0} од тачке {1} је истекао.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Гравура
 DocType: Sales Invoice,Commission,комисија
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3503,7 +3360,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Операција време мора бити већи од 0 за операцију {0}
 DocType: Supplier,Address and Contacts,Адреса и контакти
 DocType: UOM Conversion Detail,UOM Conversion Detail,УОМ Конверзија Детаљ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Држите га веб пријатељски 900пк ( В ) од 100пк ( х )
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Држите га веб пријатељски 900пк ( В ) од 100пк ( х )
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Производња поредак не може бити подигнута против тачка Темплате
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Оптужбе се ажурирају у рачуном против сваке ставке
 DocType: Payment Tool,Get Outstanding Vouchers,Гет Изванредна ваучери
@@ -3519,54 +3376,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Просечно време које је добављач за испоруку
 DocType: Time Log,Hours,Радно време
 DocType: Project,Expected Start Date,Очекивани датум почетка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Роллинг
 DocType: ToDo,Priority,Приоритет
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Уклоните ставку ако оптужбе се не примењује на ту ставку
 DocType: Dropbox Backup,Dropbox Access Allowed,Дропбок дозвољен приступ
 DocType: Dropbox Backup,Weekly,Недељни
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Нпр. смсгатеваи.цом / апи / сенд_смс.цги
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Пријем
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,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 +383,Row {0}: An Reorder entry already exists for this warehouse {1},Ров {0}: Унос Прераспоређивање већ постоји у овој магацин {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +387,Row {0}: An Reorder entry already exists for this warehouse {1},Ров {0}: Унос Прераспоређивање већ постоји у овој магацин {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Не могу прогласити као изгубљен , јер Понуда је учињен ."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Електронски сноп машинска обрада
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Куповина Мастер менаџер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,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 +141,Main Reports,Главни Извештаји
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Фото со Леджер записей остатки обновляются
 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 +176,Add / Edit Prices,Додај / измени Прицес
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,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 +298,My Orders,Ми Ордерс
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Ми Ордерс
 DocType: Price List,Price List Name,Ценовник Име
 DocType: Time Log,For Manufacturing,За производњу
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Укупно
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Укупно
 DocType: BOM,Manufacturing,Производња
 ,Ordered Items To Be Delivered,Ж Ставке да буде испоручена
 DocType: Account,Income,доход
 ,Setup Wizard,Мастер установки
 DocType: Industry Type,Industry Type,Индустрија Тип
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Нешто није у реду!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Упозорење: Оставите пријава садржи следеће датуме блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Счет Продажи {0} уже представлен
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Упозорење: Оставите пријава садржи следеће датуме блок
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Счет Продажи {0} уже представлен
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Завршетак датум
 DocType: Purchase Invoice Item,Amount (Company Currency),Износ (Друштво валута)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Ливеног
 DocType: Email Alert,Reference Date,Референтни датум
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Название подразделения (департамент) хозяин.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Введите действительные мобильных NOS
 DocType: Budget Detail,Budget Detail,Буџет Детаљ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Пожалуйста, введите сообщение перед отправкой"
 DocType: Async Task,Status,Статус
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Стоцк УОМ упдатед за ставку {0}
 DocType: Company History,Year,Година
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Поинт-оф-Сале Профиле
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Молимо Упдате СМС Сеттингс
@@ -3580,12 +3432,12 @@
 ,Serial No Service Contract Expiry,Серијски број услуга Уговор Истек
 DocType: Item,Unit of Measure Conversion,Јединица мере Цонверсион
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Запослени не може да се промени
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Ви не можете кредитних и дебитних исти налог у исто време
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Ви не можете кредитних и дебитних исти налог у исто време
 DocType: Naming Series,Help HTML,Помоћ ХТМЛ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Всего Weightage назначен должна быть 100% . Это {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Исправка за преко-{0} {прешао за тачке 1}
 DocType: Address,Name of person or organization that this address belongs to.,Име особе или организације која је ова адреса припада.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Ваши Добављачи
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Ваши Добављачи
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,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}. Молимо вас да се његов статус као неактивне за наставак.
 DocType: Purchase Invoice,Contact,Контакт
@@ -3594,37 +3446,35 @@
 DocType: Item,Has Serial No,Има Серијски број
 DocType: Employee,Date of Issue,Датум издавања
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Од {0} {1} за
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Ред # {0}: Сет добављача за ставку {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Ред # {0}: Сет добављача за ставку {1}
 DocType: Issue,Content Type,Тип садржаја
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,рачунар
+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 +283,Please check Multi Currency option to allow accounts with other currency,Молимо вас да проверите Мулти валута опцију да дозволи рачуне са другој валути
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Молимо вас да проверите Мулти валута опцију да дозволи рачуне са другој валути
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Итем: {0} не постоји у систему
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Нисте овлашћени да подесите вредност Фрозен
 DocType: Payment Reconciliation,Get Unreconciled Entries,Гет неусаглашених уносе
 DocType: Cost Center,Budgets,Буџети
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Ажурирано
 DocType: Employee,Emergency Contact Details,Хитна Контакт
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Шта он ради ?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,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 +313,'Has Serial No' can not be 'Yes' for non-stock item,"""Има серијски број"" не може бити ""Да"" за артикл који није на залихама"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"""Има серијски број"" не може бити ""Да"" за артикл који није на залихама"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Гледалаца не може бити означен за будуће датуме
 DocType: Pricing Rule,Pricing Rule Help,Правилник о ценама Помоћ
 DocType: Purchase Taxes and Charges,Account Head,Рачун шеф
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Упдате додатне трошкове да израчуна слетео трошак ставке
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,электрический
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,электрический
 DocType: Stock Entry,Total Value Difference (Out - In),Укупна вредност Разлика (Оут - Ин)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Ред {0}: курс је обавезна
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Ред {0}: курс је обавезна
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID пользователя не установлен Требуются {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Бомбирању
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Од право на гаранцију
 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/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Лаппинг
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Дана Од Последња Наручи
+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 +299,Debit To account must be a Balance Sheet account,Дебитна на рачун мора да буде биланса стања
 DocType: Buying Settings,Naming Series,Именовање Сериес
 DocType: Leave Block List,Leave Block List Name,Оставите Име листу блокираних
@@ -3638,7 +3488,7 @@
 DocType: Notification Control,Sales Invoice Message,Продаја Рачун Порука
 DocType: Authorization Rule,Based On,На Дана
 DocType: Sales Order Item,Ordered Qty,Ж Кол
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Ставка {0} је онемогућен
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Ставка {0} је онемогућен
 DocType: Stock Settings,Stock Frozen Upto,Берза Фрозен Упто
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Период од периода до датума и обавезних се понављају {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Пројекат активност / задатак.
@@ -3648,7 +3498,6 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Скидка должна быть меньше 100
 DocType: ToDo,Low,Низак
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Отпис Износ (Фирма валута)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Предење
 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,Поновите на дан у месецу
@@ -3670,7 +3519,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Название кампании требуется
 DocType: Maintenance Visit,Maintenance Date,Одржавање Датум
 DocType: Purchase Receipt Item,Rejected Serial No,Одбијен Серијски број
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Дубоко уздисање
 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}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Схов Стање
@@ -3681,7 +3529,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,БОМ и Производња Количина се тражи
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Старење Опсег 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Износ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Риветинг
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,БОМ заменио
 ,Sales Analytics,Продаја Аналитика
 DocType: Manufacturing Settings,Manufacturing Settings,Производња Подешавања
@@ -3693,20 +3540,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Нови налог Име
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Сировине комплету Цост
 DocType: Selling Settings,Settings for Selling Module,Подешавања за Селлинг Модуле
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Кориснички сервис
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Кориснички сервис
 DocType: Item,Thumbnail,Умањени
 DocType: Item Customer Detail,Item Customer Detail,Ставка Кориснички Детаљ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Потврди Емаил
 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 +107,Default settings for accounting transactions.,Настройки по умолчанию для бухгалтерских операций .
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} требуется
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Вакуумско калупљење
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очекивани датум не може бити пре Материјал Захтев Датум
 DocType: Contact Us Settings,City,Град
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ултразвучна машинска обрада
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Грешка: Не важи? Ид?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Пункт {0} должен быть Продажи товара
 DocType: Naming Series,Update Series Number,Упдате Број
@@ -3714,7 +3560,7 @@
 DocType: Sales Order,Printing Details,Штампање Детаљи
 DocType: Task,Closing Date,Датум затварања
 DocType: Sales Order Item,Produced Quantity,Произведена количина
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,инжењер
+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 +379,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
 DocType: Sales Partner,Partner Type,Партнер Тип
@@ -3722,7 +3568,7 @@
 DocType: Authorization Rule,Customerwise Discount,Цустомервисе Попуст
 DocType: Purchase Invoice,Against Expense Account,Против трошковником налог
 DocType: Production Order,Production Order,Продуцтион Ордер
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Установка Примечание {0} уже представлен
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Установка Примечание {0} уже представлен
 DocType: Quotation Item,Against Docname,Против Доцнаме
 DocType: SMS Center,All Employee (Active),Све Запослени (активна)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Погледај Сада
@@ -3731,19 +3577,19 @@
 DocType: Item,Re-Order Level,Поново би Левел
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Унесите ставке и планирани Кол за које желите да подигне наређења производне или преузети сировине за анализу.
 apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Гантт Цхарт
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Скраћено
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Скраћено
 DocType: Employee,Applicable Holiday List,Важећи Холидаи Листа
 DocType: Employee,Cheque,Чек
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Серия Обновлено
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Тип отчета является обязательным
 DocType: Item,Serial Number Series,Серијски број серија
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Склад является обязательным для складе Пункт {0} в строке {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Малопродаја и велепродаја
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Малопродаја и велепродаја
 DocType: Issue,First Responded On,Прво одговорила
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Оглас крст од предмета на више група
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Први Корисник : Ви
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Први Корисник : Ви
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фискална година Датум почетка и фискалну годину Датум завршетка су већ постављена у фискалној {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Успешно помирили
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Успешно помирили
 DocType: Production Order,Planned End Date,Планирани Датум Крај
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Где ставке су ускладиштене.
 DocType: Tax Rule,Validity,Рок важења
@@ -3763,39 +3609,36 @@
 DocType: DocPerm,Level,Ниво
 DocType: Purchase Taxes and Charges,On Net Total,Он Нет Укупно
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,"Целевая склад в строке {0} должно быть таким же , как производственного заказа"
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Нема дозволе за коришћење средства наплате
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Нема дозволе за коришћење средства наплате
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Нотифицатион Емаил Аддрессес' не указано се понављају и% с
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Глодање
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Валута не може да се промени након што уносе користите неки други валуте
 DocType: Company,Round Off Account,Заокружити рачун
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Нибловање
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,административные затраты
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Консалтинг
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Консалтинг
 DocType: Customer Group,Parent Customer Group,Родитељ групу потрошача
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Промена
 DocType: Purchase Invoice,Contact Email,Контакт Емаил
 DocType: Appraisal Goal,Score Earned,Оцена Еарнед
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","например "" Моя компания ООО """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Отказни рок
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","например "" Моя компания ООО """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Отказни рок
 DocType: Bank Reconciliation Detail,Voucher ID,Шифра ваучера
 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: Email Digest,Receivables / Payables,Потраживања / Обавезе
 DocType: Delivery Note Item,Against Sales Invoice,Против продаје фактура
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Жигосање
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Кредитни рачун
 DocType: Landed Cost Item,Landed Cost Item,Слетео Цена артикла
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Схов нула вредности
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Количина тачке добија након производњи / препакивање од датих количине сировина
 DocType: Payment Reconciliation,Receivable / Payable Account,Примања / обавезе налог
 DocType: Delivery Note Item,Against Sales Order Item,Против продаје Ордер тачком
-apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,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 +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Пореска Категорија не може бити "" Процена "" или "" Вредновање и Тотал "" , као сви предмети су не- залихама"
+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,"Пореска Категорија не може бити "" Процена "" или "" Вредновање и Тотал "" , као сви предмети су не- залихама"
 DocType: User,Last Name,Презиме
 DocType: Web Page,Left,Лево
 DocType: Event,All Day,Целодневни
@@ -3803,7 +3646,7 @@
 DocType: Appraisal,Total Score (Out of 5),Укупна оцена (Оут оф 5)
 DocType: Contact Us Settings,State,Држава
 DocType: Batch,Batch,Серија
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Баланс
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Баланс
 DocType: Project,Total Expense Claim (via Expense Claims),Укупни расходи Цлаим (преко Расходи потраживања)
 DocType: User,Gender,Пол
 DocType: Journal Entry,Debit Note,Задужењу
@@ -3833,8 +3676,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Гет Ласт Рате Куповина
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Обрачун курс заснован на врсти дјелатности (по сату)
 DocType: Company,Company Info,Подаци фирме
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,СЕАМИНГ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Компании e-mail ID не найден, следовательно, Почта не отправляется"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","Компании e-mail ID не найден, следовательно, Почта не отправляется"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Применение средств ( активов )
 DocType: Production Planning Tool,Filter based on item,Филтер на бази ставке
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Текући рачуни
@@ -3846,17 +3688,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,Оппортунити
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Слепи
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Примања запослених
+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 +240,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
 DocType: Production Order,Manufactured Qty,Произведено Кол
 DocType: Purchase Receipt Item,Accepted Quantity,Прихваћено Количина
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не постоји
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Рачуни подигао купцима.
 DocType: DocField,Default,Уобичајено
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Ид пројецт
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Не {0}: Износ не може бити већи од очекивању износ од трошковником потраживања {1}. У очекивању Износ је {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,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;"
@@ -3867,7 +3708,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ценовник није пронађен или онемогућен
 DocType: Expense Claim,Approved,Одобрено
 DocType: Pricing Rule,Price,цена
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как "" левые"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как "" левые"""
 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,образовање
@@ -3878,7 +3719,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Стандартные отчеты
 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 +209,Please select Employee Record first.,Молимо изаберите Емплоиее Рецорд први.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Молимо изаберите Емплоиее Рецорд први.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ред {0}: Партија / налог не подудара са {1} / {2} {3} у {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Да бисте креирали пореском билансу
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Унесите налог Екпенсе
@@ -3891,46 +3732,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Прати овај продајни налог против било ког пројекта
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Повуците продајне налоге (чека да испоручи) на основу наведених критеријума
 DocType: DocShare,Document Type,Доцумент Типе
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Од понуде добављача
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Од понуде добављача
 DocType: Deduction Type,Deduction Type,Одбитак Тип
 DocType: Attendance,Half Day,Пола дана
 DocType: Pricing Rule,Min Qty,Мин Кол-во
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Да бисте пратили ставке у продаји и куповини документе у којима батцх бр. &quot;Преферред Индустрија Хемија&quot;
 DocType: GL Entry,Transaction Date,Трансакција Датум
 DocType: Production Plan Item,Planned Qty,Планирани Кол
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Укупно Пореска
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Укупно Пореска
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,За Количина (Мануфацтуред Кти) је обавезан
 DocType: Stock Entry,Default Target Warehouse,Уобичајено Циљна Магацин
 DocType: Purchase Invoice,Net Total (Company Currency),Нето Укупно (Друштво валута)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ред {0}: Партија Тип и странка се примењује само против примања / обавезе рачуна
 DocType: Notification Control,Purchase Receipt Message,Куповина примање порука
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Укупно издвојена листови су више од периода
 DocType: Production Order,Actual Start Date,Сунце Датум почетка
 DocType: Sales Order,% of materials delivered against this Sales Order,% испоручених материјала на основу овог Налога за продају
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Снимање покрета ставку.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Билтен Листа претплатника
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Дубљење
 DocType: Email Account,Service,служба
 DocType: Hub Settings,Hub Settings,Хуб Подешавања
 DocType: Project,Gross Margin %,Бруто маржа%
 DocType: BOM,With Operations,Са операције
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Рачуноводствене ставке су већ учињени у валути {0} за компанију {1}. Изаберите обавеза или примања рачун са валутом {0}.
 ,Monthly Salary Register,Месечна плата Регистрација
-apps/frappe/frappe/website/template.py +140,Next,следующий
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,следующий
 DocType: Warranty Claim,If different than customer address,Если отличается от адреса клиента
 DocType: BOM Operation,BOM Operation,БОМ Операција
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Електрополирање
 DocType: Purchase Taxes and Charges,On Previous Row Amount,На претходни ред Износ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Молимо вас да унесете Износ уплате у атлеаст једном реду
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Молимо вас да унесете Износ уплате у атлеаст једном реду
 DocType: POS Profile,POS Profile,ПОС Профил
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Сезонски за постављање буџети, мете итд"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Ров {0}: Плаћање Износ не може бити већи од преосталог износа
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Укупно Неплаћено
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Време Пријави се не наплаћују
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Ставка {0} је шаблон, изаберите једну од својих варијанти"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Купац
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,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 +71,Please enter the Against Vouchers manually,Молимо Вас да унесете против ваучери ручно
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Молимо Вас да унесете против ваучери ручно
 DocType: SMS Settings,Static Parameters,Статички параметри
 DocType: Purchase Order,Advance Paid,Адванце Паид
 DocType: Item,Item Tax,Ставка Пореска
@@ -3939,14 +3777,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Пошаљи СМС масовне вашим контактима
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Размислите пореза или оптужба за
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Стварна ком је обавезна
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Цросс-ваљање
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,кредитна картица
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,кредитна картица
 DocType: BOM,Item to be manufactured or repacked,Ставка да буду произведени или препакује
 apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Настройки по умолчанию для биржевых операций .
 DocType: Purchase Invoice,Next Date,Следећи датум
 DocType: Employee Education,Major/Optional Subjects,Мајор / Опциони предмети
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Молимо вас да унесете таксе и трошкове
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Обрада
 DocType: Sales Invoice Item,Drop Ship,Дроп Схип
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Овде можете одржавати детаље породице као име и окупације родитеља, брачног друга и деце"
 DocType: Hub Settings,Seller Name,Продавац Име
@@ -3956,7 +3792,7 @@
 DocType: Stock Entry,Repack,Препаковати
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,"Вы должны Сохраните форму , прежде чем приступить"
 DocType: Item Attribute,Numeric Values,Нумеричке вредности
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Прикрепите логотип
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Прикрепите логотип
 DocType: Customer,Commission Rate,Комисија Оцени
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Маке Вариант
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Блок оставите апликације по одељењу.
@@ -3971,19 +3807,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Изаберите ЦСВ датотеку
 DocType: Dropbox Backup,Send Backups to Dropbox,Пошаљи Бацкупи на Дропбок
 DocType: Purchase Order,To Receive and Bill,За примање и Бил
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,дизајнер
+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,Достава Детаљи
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,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 +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Да бисте поставили ниво преусмеравање тачка мора бити Куповина јединица или Производња артикла
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"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 +330, (Half Day),(Пола дана)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Пола дана)
 DocType: Supplier,Credit Days,Кредитни Дана
 DocType: Leave Type,Is Carry Forward,Је напред Царри
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Се ставке из БОМ
@@ -3991,7 +3827,7 @@
 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}
 DocType: Dropbox Backup,Send Notifications To,Слање обавештења
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Реф Датум
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Реф Датум
 DocType: Employee,Reason for Leaving,Разлог за напуштање
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционисани Износ
 DocType: GL Entry,Is Opening,Да ли Отварање
@@ -3999,4 +3835,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Счет {0} не существует
 DocType: Account,Cash,Готовина
 DocType: Employee,Short biography for website and other publications.,Кратка биографија за сајт и других публикација.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Пожалуйста, создайте Зарплата Структура для работника {0}"