fix: Merge branch 'develop' into healthcare_refactor
diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv
index 46afee3..5e3f53d 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -168,12 +168,11 @@
DocType: Work Order Operation,Work In Progress,Radovi u toku
DocType: Leave Control Panel,Branch (optional),Podružnica (neobavezno)
apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Molimo izaberite datum
-DocType: Item Price,Minimum Qty ,Minimalni količina
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Minimalni količina
apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},BOM rekurzija: {0} ne može biti dijete od {1}
DocType: Finance Book,Finance Book,Finansijska knjiga
DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-YYYY.-
DocType: Appointment Booking Settings,Holiday List,Lista odmora
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Roditeljski račun {0} ne postoji
apps/erpnext/erpnext/config/quality_management.py,Review and Action,Pregled i radnja
apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Ovaj zaposlenik već ima dnevnik sa istim vremenskim žigom. {0}
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Računovođa
@@ -245,7 +244,6 @@
DocType: Exchange Rate Revaluation Account,Gain/Loss,Dobit / gubitak
DocType: Crop,Perennial,Višegodišnje
DocType: Program,Is Published,Objavljeno je
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Prikaži bilješke o isporuci
apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Da biste omogućili prekomerno naplaćivanje, ažurirajte „Nadoplatu za naplatu“ u Postavkama računa ili Stavka."
DocType: Patient Appointment,Procedure,Procedura
DocType: Accounts Settings,Use Custom Cash Flow Format,Koristite Custom Flow Flow Format
@@ -981,7 +979,6 @@
DocType: Patient,Risk Factors,Faktori rizika
DocType: Patient,Occupational Hazards and Environmental Factors,Opasnosti po životnu sredinu i faktore zaštite životne sredine
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Upis zaliha već je kreiran za radni nalog
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Kod artikla> Grupa artikala> Marka
apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Pogledajte prošla naređenja
apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} razgovora
DocType: Vital Signs,Respiratory rate,Stopa respiratornih organa
@@ -1139,7 +1136,6 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Došlo je do greške tokom procesa ažuriranja
DocType: Restaurant Reservation,Restaurant Reservation,Rezervacija restorana
apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Vaše predmete
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Dobavljač> vrsta dobavljača
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Pisanje prijedlog
DocType: Payment Entry Deduction,Payment Entry Deduction,Plaćanje Entry Odbitak
DocType: Service Level Priority,Service Level Priority,Prioritet na nivou usluge
@@ -1438,7 +1434,6 @@
apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Molimo da odaberete Kompaniju i Datum objavljivanja da biste dobili unose
DocType: Asset,Maintenance,Održavanje
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Izlazite iz susreta sa pacijentom
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},Faktor konverzije UOM ({0} -> {1}) nije pronađen za stavku: {2}
DocType: Subscriber,Subscriber,Pretplatnik
DocType: Item Attribute Value,Item Attribute Value,Stavka vrijednost atributa
apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Menjanje mjenjača mora biti primjenjivo za kupovinu ili prodaju.
@@ -1955,7 +1950,6 @@
DocType: Purchase Invoice,Is Return (Debit Note),Je povratak (obaveštenje o zaduživanju)
DocType: Workstation,Wages,Plata
DocType: Asset Maintenance,Maintenance Manager Name,Ime menadžera održavanja
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Transakcije protiv kompanije već postoje!
apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Podnošenje zahtjeva
DocType: Agriculture Task,Urgent,Hitan
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Dohvaćanje zapisa ......
@@ -2653,7 +2647,6 @@
apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Rok plaćanja na redu {0} je možda duplikat.
apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Poljoprivreda (beta)
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Odreskom
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,Molimo postavite Naming Series za {0} putem Podešavanje> Podešavanja> Imenovanje serije
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,najam ureda
apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Postavke Setup SMS gateway
DocType: Disease,Common Name,Zajedničko ime
@@ -2819,7 +2812,6 @@
apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Lišće Dodijeljeni uspješno za {0}
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Nema stavki za omot
apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Trenutno su podržane samo .csv i .xlsx datoteke
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,Postavite sistem imenovanja zaposlenika u ljudskim resursima> HR postavke
DocType: Shipping Rule Condition,From Value,Od Vrijednost
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezno
DocType: Loan,Repayment Method,otplata Način
@@ -4066,7 +4058,6 @@
apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Potrebna On
DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Ako je označeno, sakriva i onemogućuje polje Zaokruženo ukupno u listićima plaće"
DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,Ovo je zadani offset (dani) za datum isporuke u prodajnim nalozima. Ponovno nadoknađivanje je 7 dana od datuma slanja narudžbe.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Molimo podesite seriju brojeva za Attendance putem Podešavanje> Serija numeriranja
DocType: Rename Tool,File to Rename,File da biste preimenovali
apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Molimo odaberite BOM za Stavka zaredom {0}
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Izvrši ažuriranje pretplate
@@ -4700,7 +4691,6 @@
DocType: Cash Flow Mapping,Is Finance Cost,Da li je finansijski trošak
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Gledatelja za zaposlenika {0} već označen
DocType: Packing Slip,If more than one package of the same type (for print),Ako je više od jedan paket od iste vrste (za tisak)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,Postavite sistem imenovanja instruktora u Obrazovanje> Postavke obrazovanja
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Podesite podrazumevani kupac u podešavanjima restorana
,Salary Register,Plaća Registracija
DocType: Company,Default warehouse for Sales Return,Zadano skladište za povraćaj prodaje
@@ -4971,7 +4961,6 @@
apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Aktivnosti na čekanju
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Napravite laboratorijski test
DocType: Patient Appointment,Reminded,Podsetio
-DocType: Homepage Section,Cards,Karte
apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Pregled grafikona računa
DocType: Chapter Member,Chapter Member,Član poglavlja
DocType: Material Request Plan Item,Minimum Order Quantity,Minimalna količina narudžbine
@@ -4989,7 +4978,7 @@
apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Dalji datumi nisu dozvoljeni
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Očekivani datum isporuke treba da bude nakon datuma prodaje
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Ponovno red Level
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Kontni plan Template
+DocType: Company,Chart Of Accounts Template,Kontni plan Template
DocType: Attendance,Attendance Date,Gledatelja Datum
apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Ažuriranje zaliha mora biti omogućeno za fakturu za kupovinu {0}
apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Artikal Cijena ažuriranje za {0} u Cjenik {1}
@@ -5554,8 +5543,6 @@
apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Share Ledger
apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Prodajna faktura {0} kreirana
DocType: Employee,Confirmation Date,potvrda Datum
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
- to cancel this document","Izbrišite zaposlenika <a href=""#Form/Employee/{0}"">{0}</a> \ da biste otkazali ovaj dokument"
DocType: Inpatient Occupancy,Check Out,Provjeri
DocType: C-Form,Total Invoiced Amount,Ukupno Iznos dostavnice
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min Kol ne može biti veći od Max Kol
@@ -5762,7 +5749,6 @@
DocType: Cheque Print Template,Cheque Width,Ček Širina
DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Potvrditi prodajna cijena za artikl protiv kupovine objekta ili Vrednovanje Rate
DocType: Fee Schedule,Fee Schedule,naknada Raspored
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Oznake stupaca:
DocType: Bank Transaction,Settled,Riješeni
apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
DocType: Quality Feedback,Parameters,Parametri
@@ -6436,6 +6422,7 @@
DocType: Salary Component,Formula,formula
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
DocType: Material Request Plan Item,Required Quantity,Tražena količina
+DocType: Cash Flow Mapping Template,Template Name,template Name
DocType: Lab Test Template,Lab Test Template,Lab test šablon
apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Računovodstveno razdoblje se preklapa sa {0}
apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Račun prodaje
@@ -6496,7 +6483,7 @@
DocType: Bank Reconciliation Detail,Cheque Date,Datum čeka
apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Nadređeni konto {1} ne pripada preduzeću: {2}
apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Uspješno obrisane sve transakcije koje se odnose na ove kompanije!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Kao i na datum
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Kao i na datum
DocType: Additional Salary,HR,HR
DocType: Course Enrollment,Enrollment Date,upis Datum
DocType: Healthcare Settings,Out Patient SMS Alerts,Out Patient SMS upozorenja
@@ -6562,7 +6549,6 @@
DocType: Course Content,Quiz,Kviz
DocType: Subscription,Trial Period End Date,Datum završetka probnog perioda
apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Ne authroized od {0} prelazi granice
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Počnite unositi podatke odavde:
DocType: Serial No,Asset Status,Status imovine
DocType: Sales Invoice,Over Dimensional Cargo (ODC),Over Dimensional Cargo (ODC)
DocType: Restaurant Order Entry,Restaurant Table,Restoran Stol
@@ -6789,7 +6775,6 @@
DocType: Contract,Party User,Party User
apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Sredstva nisu stvorena za <b>{0}</b> . Morat ćete stvoriti imovinu ručno.
apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Molimo podesite Company filter prazno ako Skupina Od je 'Company'
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer > Customer Group > Territory,Kupac> grupa kupaca> teritorija
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Datum knjiženja ne može biti u budućnosti
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: {1} Serial No ne odgovara {2} {3}
DocType: Loan Repayment,Interest Payable,Kamata se plaća
@@ -7024,7 +7009,6 @@
apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Prosečna stopa
DocType: Appointment,Appointment With,Sastanak sa
apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Ukupan iznos plaćanja u rasporedu plaćanja mora biti jednak Grand / zaokruženom ukupno
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Označi prisustvo kao <b></b>
apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","Predmet koji pruža klijent" ne može imati stopu vrednovanja
DocType: Subscription Plan Detail,Plan,Plan
apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Banka bilans po glavnoj knjizi
@@ -7716,7 +7700,6 @@
apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Maksimalan iznos naknade zaposlenog {0} prelazi {1}
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Ukupno izdvojene Listovi su više od nekoliko dana u razdoblju
DocType: Linked Soil Analysis,Linked Soil Analysis,Linked soil analysis
-DocType: Pricing Rule,Percentage,postotak
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Stavka {0} mora bitistock Stavka
DocType: Manufacturing Settings,Default Work In Progress Warehouse,Uobičajeno Work in Progress Skladište
apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Rasporedi za {0} se preklapaju, da li želite da nastavite nakon preskakanja preklapanih slotova?"