fix: Merge branch 'develop' into healthcare_refactor
diff --git a/erpnext/translations/sw.csv b/erpnext/translations/sw.csv
index 8277b9b..8182327 100644
--- a/erpnext/translations/sw.csv
+++ b/erpnext/translations/sw.csv
@@ -168,12 +168,11 @@
DocType: Work Order Operation,Work In Progress,Kazi inaendelea
DocType: Leave Control Panel,Branch (optional),Tawi (hiari)
apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Tafadhali chagua tarehe
-DocType: Item Price,Minimum Qty ,Uchina cha Chini
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Uchina cha Chini
apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},Kurudiwa kwa BOM: {0} haiwezi kuwa mtoto wa {1}
DocType: Finance Book,Finance Book,Kitabu cha Fedha
DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC -YYYY.-
DocType: Appointment Booking Settings,Holiday List,Orodha ya likizo
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Akaunti ya mzazi {0} haipo
apps/erpnext/erpnext/config/quality_management.py,Review and Action,Mapitio na Kitendo
apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Mfanyikazi huyu tayari ana logi na alama ya muda sawa. {0}
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Mhasibu
@@ -245,7 +244,6 @@
DocType: Exchange Rate Revaluation Account,Gain/Loss,Kupata / Kupoteza
DocType: Crop,Perennial,Kudumu
DocType: Program,Is Published,Imechapishwa
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Onyesha Vidokezo vya Uwasilishaji
apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","Ili kuruhusu malipo zaidi, sasisha "Idhini ya malipo ya juu ya bili" katika Mipangilio ya Akaunti au Bidhaa."
DocType: Patient Appointment,Procedure,Utaratibu
DocType: Accounts Settings,Use Custom Cash Flow Format,Tumia Format ya Msajili wa Fedha ya Desturi
@@ -981,7 +979,6 @@
DocType: Patient,Risk Factors,Mambo ya Hatari
DocType: Patient,Occupational Hazards and Environmental Factors,Hatari za Kazi na Mambo ya Mazingira
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Entries Entries tayari kuundwa kwa Kazi Order
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Nambari ya Bidhaa> Kikundi cha bidhaa> Brand
apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Tazama maagizo ya zamani
DocType: Vital Signs,Respiratory rate,Kiwango cha kupumua
apps/erpnext/erpnext/config/help.py,Managing Subcontracting,Kusimamia Kudhibiti Msaada
@@ -1138,7 +1135,6 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Hitilafu ilitokea wakati wa mchakato wa sasisho
DocType: Restaurant Reservation,Restaurant Reservation,Uhifadhi wa Mkahawa
apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Vitu vyako
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Mtoaji> Aina ya wasambazaji
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Kuandika Proposal
DocType: Payment Entry Deduction,Payment Entry Deduction,Utoaji wa Kuingia kwa Malipo
DocType: Service Level Priority,Service Level Priority,Kipaumbele cha Kiwango cha Huduma
@@ -1437,7 +1433,6 @@
apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Tafadhali chagua tarehe ya Kampuni na Kuajili ili uweze kuingia
DocType: Asset,Maintenance,Matengenezo
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Pata kutoka kwa Mkutano wa Wagonjwa
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},Sababu ya ubadilishaji wa UOM ({0} -> {1}) haipatikani kwa kipengee: {2}
DocType: Subscriber,Subscriber,Msajili
DocType: Item Attribute Value,Item Attribute Value,Thamani ya Thamani ya Bidhaa
apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Kubadilisha Fedha lazima iwezekanavyo kwa Ununuzi au kwa Ununuzi.
@@ -1934,7 +1929,6 @@
DocType: Purchase Invoice,Is Return (Debit Note),Inarudi (Kumbuka Debit)
DocType: Workstation,Wages,Mishahara
DocType: Asset Maintenance,Maintenance Manager Name,Jina la Meneja wa Matengenezo
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Manunuzi dhidi ya kampuni tayari yapo!
apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Kuomba Tovuti
DocType: Agriculture Task,Urgent,Haraka
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Inachukua rekodi ......
@@ -2629,7 +2623,6 @@
apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Muda wa Malipo katika mstari {0} inawezekana kuwa duplicate.
apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Kilimo (beta)
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Ufungashaji wa Ufungashaji
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,Tafadhali weka Mfululizo wa Jina la {0} kupitia Kusanidi> Mipangilio> Mfululizo wa Kumtaja
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Kodi ya Ofisi
apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Sanidi mipangilio ya uingizaji wa SMS
DocType: Disease,Common Name,Jina la kawaida
@@ -2795,7 +2788,6 @@
apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Majani yaliyopangwa kwa Mafanikio kwa {0}
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Hakuna Vipande vya kuingiza
apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Faili za .csv na .xlsx pekee ndizo zinazotumika kwa sasa
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,Tafadhali wasanidi Mfumo wa Kumtaja Mfanyikazi katika Rasilimali Watu> Mipangilio ya HR
DocType: Shipping Rule Condition,From Value,Kutoka kwa Thamani
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Uzalishaji wa Wingi ni lazima
DocType: Loan,Repayment Method,Njia ya kulipa
@@ -4041,7 +4033,6 @@
apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Inahitajika
DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Ikiwa imegunduliwa, huficha na kulemaza Jumla ya Jumla ya uwanja katika Slips Slary"
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.,Hii ndio kosa la kawaida (siku) kwa Tarehe ya Utoaji katika Maagizo ya Uuzaji. Mkato wa kurudi nyuma ni siku 7 kutoka tarehe ya uwekaji amri.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Tafadhali sasisha safu za nambari za Kuhudhuria kupitia Usanidi> Mfululizo wa hesabu
DocType: Rename Tool,File to Rename,Funga Kurejesha tena
apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Tafadhali chagua BOM kwa Bidhaa katika Row {0}
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Pata Updates za Usajili
@@ -4643,7 +4634,6 @@
DocType: Cash Flow Mapping,Is Finance Cost,Ni Gharama za Fedha
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Attendance for employee {0} is already marked,Mahudhurio ya mfanyakazi {0} tayari amewekwa alama
DocType: Packing Slip,If more than one package of the same type (for print),Ikiwa zaidi ya mfuko mmoja wa aina moja (kwa kuchapishwa)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,Tafadhali wasanidi Mfumo wa Kumtaja Mtaalam katika Elimu> Mipangilio ya elimu
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Tafadhali weka mteja default katika Mipangilio ya Mkahawa
,Salary Register,Daftari ya Mshahara
DocType: Company,Default warehouse for Sales Return,Ghala la Default la Kurudi kwa Uuzaji
@@ -4914,7 +4904,6 @@
apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Shughuli zinazosubiri
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Unda Jaribio la Lab
DocType: Patient Appointment,Reminded,Alikumbushwa
-DocType: Homepage Section,Cards,Kadi
apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Angalia Chati ya Akaunti
DocType: Chapter Member,Chapter Member,Mjumbe wa Sura
DocType: Material Request Plan Item,Minimum Order Quantity,Kiwango cha chini cha utaratibu
@@ -4932,7 +4921,7 @@
apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Tarehe za baadaye haziruhusiwi
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Tarehe ya utoaji inayotarajiwa inapaswa kuwa baada ya Tarehe ya Kuagiza Mauzo
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Reorder Level
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Chati ya Kigezo cha Akaunti
+DocType: Company,Chart Of Accounts Template,Chati ya Kigezo cha Akaunti
DocType: Attendance,Attendance Date,Tarehe ya Kuhudhuria
apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Sasisha hisa lazima ziwezeshe kwa ankara ya ununuzi {0}
apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Item Bei iliyosasishwa kwa {0} katika Orodha ya Bei {1}
@@ -5495,8 +5484,6 @@
apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Shirikisha Ledger
apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Invoice ya Mauzo {0} imeundwa
DocType: Employee,Confirmation Date,Tarehe ya uthibitisho
-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","Tafadhali futa Mfanyikazi <a href=""#Form/Employee/{0}"">{0}</a> \ ili kughairi hati hii"
DocType: Inpatient Occupancy,Check Out,Angalia
DocType: C-Form,Total Invoiced Amount,Kiasi kilichopakiwa
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min Qty haiwezi kuwa kubwa kuliko Max Qty
@@ -5703,7 +5690,6 @@
DocType: Cheque Print Template,Cheque Width,Angalia Upana
DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Thibitisha Bei ya Kuuza kwa Bidhaa juu ya Kiwango cha Ununuzi au Kiwango cha Vigezo
DocType: Fee Schedule,Fee Schedule,Ratiba ya ada
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Lebo za safu:
DocType: Bank Transaction,Settled,Tulia
apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
DocType: Quality Feedback,Parameters,Viwanja
@@ -6377,6 +6363,7 @@
DocType: Salary Component,Formula,Mfumo
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
DocType: Material Request Plan Item,Required Quantity,Kiasi kinachohitajika
+DocType: Cash Flow Mapping Template,Template Name,Jina la Kigezo
DocType: Lab Test Template,Lab Test Template,Kigezo cha Mtihani wa Lab
apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Kipindi cha Uhasibu huingiliana na {0}
apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Akaunti ya Mauzo
@@ -6437,7 +6424,7 @@
DocType: Bank Reconciliation Detail,Cheque Date,Tarehe ya Kuangalia
apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Akaunti {0}: Akaunti ya Mzazi {1} si ya kampuni: {2}
apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Imefanikiwa kufutwa shughuli zote zinazohusiana na kampuni hii!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Kama tarehe
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Kama tarehe
DocType: Additional Salary,HR,HR
DocType: Course Enrollment,Enrollment Date,Tarehe ya Kuandikisha
DocType: Healthcare Settings,Out Patient SMS Alerts,Nje Tahadhari za Mgonjwa wa SMS
@@ -6503,7 +6490,6 @@
DocType: Course Content,Quiz,Jaribio
DocType: Subscription,Trial Period End Date,Tarehe ya Mwisho wa Kipindi
apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Sio kuchapishwa tangu {0} inapozidi mipaka
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Anza kuingiza data kutoka hapa:
DocType: Serial No,Asset Status,Hali ya Mali
DocType: Sales Invoice,Over Dimensional Cargo (ODC),Zaidi ya Cargo Dimensional (ODC)
DocType: Restaurant Order Entry,Restaurant Table,Jedwali la Mgahawa
@@ -6729,7 +6715,6 @@
DocType: Contract,Party User,Mtumiaji wa Chama
apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Mali ambayo haijatengenezwa kwa <b>{0}</b> . Utalazimika kuunda mali kwa mikono.
apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Tafadhali weka Chujio cha Kampuni kikiwa tupu ikiwa Kundi Na 'Kampuni'
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer > Customer Group > Territory,Mteja> Kikundi cha Wateja> Wilaya
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Tarehe ya Kuchapisha haiwezi kuwa tarehe ya baadaye
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} hailingani na {2} {3}
DocType: Loan Repayment,Interest Payable,Riba Inalipwa
@@ -6963,7 +6948,6 @@
apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Kiwango cha wastani
DocType: Appointment,Appointment With,Uteuzi na
apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Kiwango cha Malipo ya Jumla katika Ratiba ya Malipo lazima iwe sawa na Grand / Rounded Total
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Marko mahudhurio kama <b></b>
apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","Bidhaa iliyotolewa na Wateja" haiwezi kuwa na Kiwango cha Tathimini
DocType: Subscription Plan Detail,Plan,Mpango
apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Usawa wa Taarifa ya Benki kama kwa Jedwali Mkuu
@@ -7653,7 +7637,6 @@
apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Ufikiaji wa kiasi cha mfanyakazi {0} unazidi {1}
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Majani yote yaliyotengwa ni zaidi ya siku katika kipindi
DocType: Linked Soil Analysis,Linked Soil Analysis,Uchunguzi wa ardhi uliohusishwa
-DocType: Pricing Rule,Percentage,Asilimia
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Kipengee {0} kinafaa kuwa kitu cha hisa
DocType: Manufacturing Settings,Default Work In Progress Warehouse,Kazi ya Kazi katika Hifadhi ya Maendeleo
apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Mipangilio ya {0} inaingizwa, unataka kuendelea baada ya kuruka mipaka iliyopandwa?"