diff --git a/erpnext/locale/sl.po b/erpnext/locale/sl.po
index 76984a6d35f..dd2b6f9a2be 100644
--- a/erpnext/locale/sl.po
+++ b/erpnext/locale/sl.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: hello@frappe.io\n"
-"POT-Creation-Date: 2026-05-17 10:04+0000\n"
-"PO-Revision-Date: 2026-05-18 20:21\n"
+"POT-Creation-Date: 2026-05-24 10:11+0000\n"
+"PO-Revision-Date: 2026-05-24 21:22\n"
 "Last-Translator: hello@frappe.io\n"
 "Language-Team: Slovenian\n"
 "MIME-Version: 1.0\n"
@@ -268,7 +268,7 @@ msgstr "% materialov, dostavljenih v skladu s tem Izbirnim Seznamom"
 msgid "% of materials delivered against this Sales Order"
 msgstr "% dobavljenih materialov po tem Prodajnem Naročilu"
 
-#: erpnext/controllers/accounts_controller.py:2387
+#: erpnext/controllers/accounts_controller.py:2388
 msgid "'Account' in the Accounting section of Customer {0}"
 msgstr "»Račun« v razdelku Računovodstvo Stranke {0}"
 
@@ -284,7 +284,7 @@ msgstr "'Na podlagi' in 'Po skupini' ne moreta biti enaka"
 msgid "'Days Since Last Order' must be greater than or equal to zero"
 msgstr "\"Dnevi od zadnjega Naročila\" morajo biti večji ali enaki nič"
 
-#: erpnext/controllers/accounts_controller.py:2392
+#: erpnext/controllers/accounts_controller.py:2393
 msgid "'Default {0} Account' in Company {1}"
 msgstr "\"Privzet Račun {0} \" v Podjetju {1}"
 
@@ -346,8 +346,8 @@ msgstr "'{0}' račun že uporablja {1}. Uporabite drug račun."
 msgid "'{0}' has been already added."
 msgstr "'{0}' je že dodan."
 
-#: erpnext/setup/doctype/company/company.py:303
-#: erpnext/setup/doctype/company/company.py:314
+#: erpnext/setup/doctype/company/company.py:307
+#: erpnext/setup/doctype/company/company.py:318
 msgid "'{0}' should be in company currency {1}."
 msgstr "'{0}' mora biti v valuti podjetja {1}."
 
@@ -517,8 +517,8 @@ msgstr "1000+"
 msgid "11-50"
 msgstr "11-50"
 
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:95
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:101
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:107
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:113
 msgid "1{0}"
 msgstr "1{0}"
 
@@ -607,8 +607,8 @@ msgstr "90 - 120 Dni"
 msgid "90 Above"
 msgstr "90 Zgoraj"
 
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1348
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1349
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1271
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1272
 msgid "<0"
 msgstr "<0"
 
@@ -795,7 +795,7 @@ msgstr "<label class=\"control-label\" style=\"margin-bottom: 0px;\">Nastavitve
 msgid "<li>Clearance date must be after cheque date for row(s): {0}</li>"
 msgstr "<li>Datum odobritve mora biti po datumu čeka za vrstico(e): {0}</li>"
 
-#: erpnext/controllers/accounts_controller.py:2270
+#: erpnext/controllers/accounts_controller.py:2271
 msgid "<li>Item {0} in row(s) {1} billed more than {2}</li>"
 msgstr "<li>Artikel {0} v vrstici(ah) {1} je bila zaračunana več kot {2}</li>"
 
@@ -812,7 +812,7 @@ msgstr "<li>Plačilni dokument, potreben za vrstico(e): {0}</li>"
 msgid "<li>{}</li>"
 msgstr "<li>{}</li>"
 
-#: erpnext/controllers/accounts_controller.py:2267
+#: erpnext/controllers/accounts_controller.py:2268
 msgid "<p>Cannot overbill for the following Items:</p>"
 msgstr "<p>Za naslednje artikle ni mogoče zaračunati preveč:</p>"
 
@@ -875,7 +875,7 @@ msgstr "<p>Datum knjiženja {0} ne sme biti pred datumom naročila za naslednje
 msgid "<p>Price List Rate has not been set as editable in Selling Settings. In this scenario, setting <strong>Update Price List Based On</strong> to <strong>Price List Rate</strong> will prevent auto-updation of Item Price.</p>Are you sure you want to continue?"
 msgstr "<p>Cenik v nastavitvah prodaje ni bil nastavljen kot urejevalni. V tem primeru bo nastavitev <strong>Posodobi cenik na podlagi</strong> na <strong>Cenik</strong> preprečila samodejno posodabljanje cene artikla.</p>Ali ste prepričani, da želite nadaljevati?"
 
-#: erpnext/controllers/accounts_controller.py:2279
+#: erpnext/controllers/accounts_controller.py:2280
 msgid "<p>To allow over-billing, please set allowance in Accounts Settings.</p>"
 msgstr "<p>Če želite dovoliti preplačilo, nastavite dovoljeno vrednost v Nastavitvah Računovodstva.</p>"
 
@@ -1037,7 +1037,7 @@ msgstr "A - B"
 msgid "A - C"
 msgstr "A - B"
 
-#: erpnext/selling/doctype/customer/customer.py:355
+#: erpnext/selling/doctype/customer/customer.py:345
 msgid "A Customer Group exists with same name please change the Customer name or rename the Customer Group"
 msgstr "Skupina strank že obstaja z istim imenom. Prosimo, spremenite ime stranke ali preimenujte skupino strank."
 
@@ -1201,11 +1201,11 @@ msgstr "Okrajšava"
 msgid "Abbreviation"
 msgstr "Okrajšava"
 
-#: erpnext/setup/doctype/company/company.py:238
+#: erpnext/setup/doctype/company/company.py:241
 msgid "Abbreviation already used for another company"
 msgstr "Okrajšava se že uporablja za drugo podjetje"
 
-#: erpnext/setup/doctype/company/company.py:235
+#: erpnext/setup/doctype/company/company.py:238
 msgid "Abbreviation is mandatory"
 msgstr "Okrajšava je obvezna"
 
@@ -1213,7 +1213,7 @@ msgstr "Okrajšava je obvezna"
 msgid "Abbreviation: {0} must appear only once"
 msgstr "Okrajšava: {0} se lahko pojavi samo enkrat"
 
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1345
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1268
 msgid "Above"
 msgstr "Nad"
 
@@ -1267,7 +1267,7 @@ msgid "Accepted Qty in Stock UOM"
 msgstr "Sprejeta Količina na Enoti Zaloge"
 
 #. Label of the qty (Float) field in DocType 'Purchase Receipt Item'
-#: erpnext/public/js/controllers/transaction.js:2839
+#: erpnext/public/js/controllers/transaction.js:2841
 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
 msgid "Accepted Quantity"
 msgstr "Sprejeta Količina"
@@ -1303,7 +1303,7 @@ msgstr ""
 msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010"
 msgstr "V skladu s CEFACT/ICG/2010/IC013 ali CEFACT/ICG/2010/IC010"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:784
 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry."
 msgstr "V skladu s Kosovnico {0} v vnosu zaloge manjka postavka '{1}'."
 
@@ -1422,7 +1422,7 @@ msgid "Account Manager"
 msgstr "Vodja Računovodstva"
 
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1009
-#: erpnext/controllers/accounts_controller.py:2396
+#: erpnext/controllers/accounts_controller.py:2397
 msgid "Account Missing"
 msgstr "Manjka Račun"
 
@@ -1440,7 +1440,7 @@ msgstr "Manjka Račun"
 msgid "Account Name"
 msgstr "Ime Računa"
 
-#: erpnext/accounts/doctype/account/account.py:373
+#: erpnext/accounts/doctype/account/account.py:374
 msgid "Account Not Found"
 msgstr "Račun ni bil najden"
 
@@ -1453,7 +1453,7 @@ msgstr "Račun ni bil najden"
 msgid "Account Number"
 msgstr "Številka Računa"
 
-#: erpnext/accounts/doctype/account/account.py:359
+#: erpnext/accounts/doctype/account/account.py:360
 msgid "Account Number {0} already used in account {1}"
 msgstr "Številka Računa {0} se že uporablja v računu {1}"
 
@@ -1492,7 +1492,7 @@ msgstr "Podtip Računa"
 #. Label of the account_type (Select) field in DocType 'Payment Ledger Entry'
 #. Label of the account_type (Select) field in DocType 'Party Type'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/account.py:206
+#: erpnext/accounts/doctype/account/account.py:207
 #: erpnext/accounts/doctype/account/account_tree.js:154
 #: erpnext/accounts/doctype/bank_account/bank_account.json
 #: erpnext/accounts/doctype/bank_account_type/bank_account_type.json
@@ -1508,11 +1508,11 @@ msgstr "Tip Računa"
 msgid "Account Value"
 msgstr "Vrednost Računa"
 
-#: erpnext/accounts/doctype/account/account.py:328
+#: erpnext/accounts/doctype/account/account.py:329
 msgid "Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'"
 msgstr "Stanje na računu je že v kreditu, možnosti »Stanje mora biti« ne smete nastaviti kot »Debet«"
 
-#: erpnext/accounts/doctype/account/account.py:322
+#: erpnext/accounts/doctype/account/account.py:323
 msgid "Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'"
 msgstr "Stanje na računu je že debetno, možnosti »Stanje mora biti« ne smete nastaviti na »Kredit«"
 
@@ -1579,24 +1579,24 @@ msgstr ""
 msgid "Account where the cost of this item will be debited on purchase"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:427
+#: erpnext/accounts/doctype/account/account.py:428
 msgid "Account with child nodes cannot be converted to ledger"
 msgstr "Račun s podrejenimi vozlišči ni mogoče pretvoriti v glavno knjigo"
 
-#: erpnext/accounts/doctype/account/account.py:279
+#: erpnext/accounts/doctype/account/account.py:280
 msgid "Account with child nodes cannot be set as ledger"
 msgstr "Račun s podrejenimi vozlišči ni mogoče nastaviti kot glavno knjigo"
 
-#: erpnext/accounts/doctype/account/account.py:438
+#: erpnext/accounts/doctype/account/account.py:439
 msgid "Account with existing transaction can not be converted to group."
 msgstr "Račun z obstoječo transakcijo ni mogoče pretvoriti v skupino."
 
-#: erpnext/accounts/doctype/account/account.py:467
+#: erpnext/accounts/doctype/account/account.py:468
 msgid "Account with existing transaction can not be deleted"
 msgstr "Računa z obstoječo transakcijo ni mogoče izbrisati"
 
-#: erpnext/accounts/doctype/account/account.py:273
-#: erpnext/accounts/doctype/account/account.py:429
+#: erpnext/accounts/doctype/account/account.py:274
+#: erpnext/accounts/doctype/account/account.py:430
 msgid "Account with existing transaction cannot be converted to ledger"
 msgstr "Račun z obstoječo transakcijo ni mogoče pretvoriti v glavno knjigo"
 
@@ -1604,11 +1604,11 @@ msgstr "Račun z obstoječo transakcijo ni mogoče pretvoriti v glavno knjigo"
 msgid "Account {0} added multiple times"
 msgstr "Račun {0} je bil dodan večkrat"
 
-#: erpnext/accounts/doctype/account/account.py:291
+#: erpnext/accounts/doctype/account/account.py:292
 msgid "Account {0} cannot be converted to Group as it is already set as {1} for {2}."
 msgstr "Račun {0} ni mogoče pretvoriti v skupino, ker je že nastavljen kot {1} za {2}."
 
-#: erpnext/accounts/doctype/account/account.py:288
+#: erpnext/accounts/doctype/account/account.py:289
 msgid "Account {0} cannot be disabled as it is already set as {1} for {2}."
 msgstr "Račun {0} ni mogoče onemogočiti, ker je že nastavljen kot {1} za {2}."
 
@@ -1616,11 +1616,11 @@ msgstr "Račun {0} ni mogoče onemogočiti, ker je že nastavljen kot {1} za {2}
 msgid "Account {0} does not belong to company {1}"
 msgstr "Račun {0} ne pripada podjetju {1}"
 
-#: erpnext/setup/doctype/company/company.py:285
+#: erpnext/setup/doctype/company/company.py:289
 msgid "Account {0} does not belong to company: {1}"
 msgstr "Račun {0} ne pripada podjetju: {1}"
 
-#: erpnext/accounts/doctype/account/account.py:589
+#: erpnext/accounts/doctype/account/account.py:590
 msgid "Account {0} does not exist"
 msgstr "Račun {0} ne obstaja"
 
@@ -1636,15 +1636,15 @@ msgstr "Račun {0} se ne ujema s Podjetjem {1} v načinu računa: {2}"
 msgid "Account {0} doesn't belong to Company {1}"
 msgstr "Račun {0} ne pripada Podjetju {1}"
 
-#: erpnext/accounts/doctype/account/account.py:546
+#: erpnext/accounts/doctype/account/account.py:547
 msgid "Account {0} exists in parent company {1}."
 msgstr "Račun {0} obstaja v matičnem podjetju {1}."
 
-#: erpnext/accounts/doctype/account/account.py:411
+#: erpnext/accounts/doctype/account/account.py:412
 msgid "Account {0} is added in the child company {1}"
 msgstr "Račun {0} je dodan v podrejeno podjetje {1}"
 
-#: erpnext/setup/doctype/company/company.py:274
+#: erpnext/setup/doctype/company/company.py:278
 msgid "Account {0} is disabled."
 msgstr "Račun {0} je onemogočen."
 
@@ -1652,7 +1652,7 @@ msgstr "Račun {0} je onemogočen."
 msgid "Account {0} is frozen"
 msgstr "Račun {0} je zamrznjen"
 
-#: erpnext/controllers/accounts_controller.py:1471
+#: erpnext/controllers/accounts_controller.py:1472
 msgid "Account {0} is invalid. Account Currency must be {1}"
 msgstr "Račun {0} je neveljaven. Valuta računa mora biti {1}"
 
@@ -1660,19 +1660,19 @@ msgstr "Račun {0} je neveljaven. Valuta računa mora biti {1}"
 msgid "Account {0} should be of type Expense"
 msgstr "Račun {0} mora biti tipa Stroški"
 
-#: erpnext/accounts/doctype/account/account.py:152
+#: erpnext/accounts/doctype/account/account.py:153
 msgid "Account {0}: Parent account {1} can not be a ledger"
 msgstr "Račun {0}: Nadrejeni račun {1} ne more biti glavna knjiga"
 
-#: erpnext/accounts/doctype/account/account.py:158
+#: erpnext/accounts/doctype/account/account.py:159
 msgid "Account {0}: Parent account {1} does not belong to company: {2}"
 msgstr "Račun {0}: Nadrejeni račun {1} ne pripada podjetju: {2}"
 
-#: erpnext/accounts/doctype/account/account.py:146
+#: erpnext/accounts/doctype/account/account.py:147
 msgid "Account {0}: Parent account {1} does not exist"
 msgstr "Račun {0}: Nadrejeni račun {1} ne obstaja"
 
-#: erpnext/accounts/doctype/account/account.py:149
+#: erpnext/accounts/doctype/account/account.py:150
 msgid "Account {0}: You can not assign itself as parent account"
 msgstr "Račun {0}: Ne morete se dodeliti kot nadrejeni račun"
 
@@ -1688,7 +1688,7 @@ msgstr "Račun: {0} je mogoče posodobiti samo prek transakcij z zalogami"
 msgid "Account: {0} is not permitted under Payment Entry"
 msgstr "Račun: {0} ni dovoljen pri vnosu plačila"
 
-#: erpnext/controllers/accounts_controller.py:3287
+#: erpnext/controllers/accounts_controller.py:3281
 msgid "Account: {0} with currency: {1} can not be selected"
 msgstr "Računa: {0} z valuto: {1} ni mogoče izbrati"
 
@@ -1973,8 +1973,8 @@ msgstr "Računovodski Vnosi"
 msgid "Accounting Entry for Asset"
 msgstr "Računovodski Vnos za Sredstvo"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1148
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1168
 msgid "Accounting Entry for LCV in Stock Entry {0}"
 msgstr ""
 
@@ -1998,8 +1998,8 @@ msgstr "Računovodski Vnos za Storitev"
 #: erpnext/controllers/stock_controller.py:733
 #: erpnext/controllers/stock_controller.py:750
 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1100
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1114
 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778
 msgid "Accounting Entry for Stock"
 msgstr "Računovodski Vnos za Zalogo"
@@ -2008,7 +2008,7 @@ msgstr "Računovodski Vnos za Zalogo"
 msgid "Accounting Entry for {0}"
 msgstr "Računovodski Vnos za {0}"
 
-#: erpnext/controllers/accounts_controller.py:2437
+#: erpnext/controllers/accounts_controller.py:2438
 msgid "Accounting Entry for {0}: {1} can only be made in currency: {2}"
 msgstr ""
 
@@ -2078,12 +2078,12 @@ msgstr ""
 #: erpnext/buying/doctype/supplier/supplier.json
 #: erpnext/selling/doctype/customer/customer.json
 #: erpnext/setup/doctype/company/company.json
-#: erpnext/setup/doctype/company/company.py:444
+#: erpnext/setup/doctype/company/company.py:448
 #: erpnext/setup/doctype/customer_group/customer_group.json
 #: erpnext/setup/doctype/email_digest/email_digest.json
 #: erpnext/setup/doctype/incoterm/incoterm.json
 #: erpnext/setup/doctype/supplier_group/supplier_group.json
-#: erpnext/setup/install.py:395
+#: erpnext/setup/install.py:427
 msgid "Accounts"
 msgstr "Računovodstvo"
 
@@ -2113,8 +2113,8 @@ msgstr "Računi manjkajo v poročilu"
 #. Entry'
 #. Name of a report
 #. Label of a Workspace Sidebar Item
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:154
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:256
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:158
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:261
 #: erpnext/accounts/doctype/journal_entry/journal_entry.json
 #: erpnext/accounts/report/accounts_payable/accounts_payable.json
 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:126
@@ -2214,15 +2214,15 @@ msgstr "Tabela računov ne more biti prazna."
 msgid "Accounts to Merge"
 msgstr "Računi za združitev"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:158
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:265
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:162
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:270
 msgid "Accrued Expenses"
 msgstr "Načrtovani Stroški"
 
 #. Option for the 'Account Type' (Select) field in DocType 'Account'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:63
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:112
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:67
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:117
 #: erpnext/accounts/report/account_balance/account_balance.js:37
 msgid "Accumulated Depreciation"
 msgstr "Akumulirana Amortizacija"
@@ -2387,7 +2387,7 @@ msgstr "Izvedena dejanja"
 
 #. Label of the enable_serial_and_batch_no_for_item (Check) field in DocType
 #. 'Stock Settings'
-#: erpnext/stock/doctype/item/item.js:419
+#: erpnext/stock/doctype/item/item.js:412
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "Activate Serial / Batch No for Item"
 msgstr ""
@@ -2511,7 +2511,7 @@ msgstr "Dejanski Končni Datum"
 msgid "Actual End Date (via Timesheet)"
 msgstr "Dejanski Končni Datum (prek Časovnega Lista)"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:229
+#: erpnext/manufacturing/doctype/work_order/work_order.py:230
 msgid "Actual End Date cannot be before Actual Start Date"
 msgstr ""
 
@@ -2642,7 +2642,7 @@ msgstr ""
 msgid "Ad-hoc Qty"
 msgstr "Namen Količina"
 
-#: erpnext/stock/doctype/item/item.js:688
+#: erpnext/stock/doctype/item/item.js:675
 #: erpnext/stock/doctype/price_list/price_list.js:8
 msgid "Add / Edit Prices"
 msgstr "Dodaj/Uredi Cene"
@@ -3141,7 +3141,7 @@ msgstr "Dodatne Informacije"
 msgid "Additional Information updated successfully."
 msgstr "Dodatne informacije so bile uspešno posodobljene."
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:836
+#: erpnext/manufacturing/doctype/work_order/work_order.js:818
 msgid "Additional Material Transfer"
 msgstr "Dodatni Prenos Materiala"
 
@@ -3164,7 +3164,7 @@ msgstr "Dodatni Obratovalni Stroški"
 msgid "Additional Transferred Qty"
 msgstr "Dodatna Prenesena Količina"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:710
+#: erpnext/manufacturing/doctype/work_order/work_order.py:711
 msgid "Additional Transferred Qty {0}\n"
 "\t\t\t\t\tcannot be greater than {1}.\n"
 "\t\t\t\t\tTo fix this, increase the percentage value\n"
@@ -3322,11 +3322,6 @@ msgstr ""
 msgid "Address used to determine Tax Category in transactions"
 msgstr ""
 
-#. Label of the adjust_qty (Float) field in DocType 'Sales Forecast Item'
-#: erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.json
-msgid "Adjust Qty"
-msgstr "Prilagodi Količino"
-
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1160
 msgid "Adjustment Against"
 msgstr "Prilagoditev proti"
@@ -3339,8 +3334,8 @@ msgstr ""
 msgid "Administrative Assistant"
 msgstr "Administrativni Pomočnik"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:103
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:168
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:107
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:173
 msgid "Administrative Expenses"
 msgstr "Administrativni Stroški"
 
@@ -3408,7 +3403,7 @@ msgstr ""
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/controllers/accounts_controller.py:287
+#: erpnext/controllers/accounts_controller.py:288
 #: erpnext/setup/doctype/company/company.json
 msgid "Advance Payments"
 msgstr "Predplačila"
@@ -3670,11 +3665,11 @@ msgstr "Starost"
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:154
 #: erpnext/accounts/report/accounts_payable/accounts_payable.html:138
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:139
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1279
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1202
 msgid "Age (Days)"
 msgstr "Starost (Dnevi)"
 
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:228
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:216
 msgid "Age ({0})"
 msgstr "Starost ({0})"
 
@@ -3824,21 +3819,21 @@ msgstr ""
 #: erpnext/patches/v11_0/update_department_lft_rgt.py:9
 #: erpnext/patches/v11_0/update_department_lft_rgt.py:11
 #: erpnext/patches/v11_0/update_department_lft_rgt.py:16
-#: erpnext/setup/doctype/company/company.py:437
-#: erpnext/setup/doctype/company/company.py:440
-#: erpnext/setup/doctype/company/company.py:445
-#: erpnext/setup/doctype/company/company.py:451
-#: erpnext/setup/doctype/company/company.py:457
-#: erpnext/setup/doctype/company/company.py:463
-#: erpnext/setup/doctype/company/company.py:469
-#: erpnext/setup/doctype/company/company.py:475
-#: erpnext/setup/doctype/company/company.py:481
-#: erpnext/setup/doctype/company/company.py:487
-#: erpnext/setup/doctype/company/company.py:493
-#: erpnext/setup/doctype/company/company.py:499
-#: erpnext/setup/doctype/company/company.py:505
-#: erpnext/setup/doctype/company/company.py:511
-#: erpnext/setup/doctype/company/company.py:517
+#: erpnext/setup/doctype/company/company.py:441
+#: erpnext/setup/doctype/company/company.py:444
+#: erpnext/setup/doctype/company/company.py:449
+#: erpnext/setup/doctype/company/company.py:455
+#: erpnext/setup/doctype/company/company.py:461
+#: erpnext/setup/doctype/company/company.py:467
+#: erpnext/setup/doctype/company/company.py:473
+#: erpnext/setup/doctype/company/company.py:479
+#: erpnext/setup/doctype/company/company.py:485
+#: erpnext/setup/doctype/company/company.py:491
+#: erpnext/setup/doctype/company/company.py:497
+#: erpnext/setup/doctype/company/company.py:503
+#: erpnext/setup/doctype/company/company.py:509
+#: erpnext/setup/doctype/company/company.py:515
+#: erpnext/setup/doctype/company/company.py:521
 msgid "All Departments"
 msgstr "Vsi Oddelki"
 
@@ -3918,7 +3913,7 @@ msgstr "Vse Skupine Dobaviteljev"
 msgid "All Territories"
 msgstr "Vsa Ozemlja"
 
-#: erpnext/setup/doctype/company/company.py:382
+#: erpnext/setup/doctype/company/company.py:386
 msgid "All Warehouses"
 msgstr "Vsa Skladišča"
 
@@ -3940,15 +3935,15 @@ msgstr ""
 msgid "All items have already been Invoiced/Returned"
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1236
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1277
 msgid "All items have already been received"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:138
 msgid "All items have already been transferred for this Work Order."
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:2948
+#: erpnext/public/js/controllers/transaction.js:2950
 msgid "All items in this document already have a linked Quality Inspection."
 msgstr ""
 
@@ -3970,11 +3965,11 @@ msgstr ""
 msgid "All the items have been already returned."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1274
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1256
 msgid "All the required items (raw materials) will be fetched from BOM and populated in this table. Here you can also change the Source Warehouse for any item. And during the production, you can track transferred raw materials from this table."
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:872
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:913
 msgid "All these items have already been Invoiced/Returned"
 msgstr ""
 
@@ -4090,7 +4085,7 @@ msgstr "Dodeljena Količina"
 
 #. Label of the allow_account_creation_against_child_company (Check) field in
 #. DocType 'Company'
-#: erpnext/accounts/doctype/account/account.py:544
+#: erpnext/accounts/doctype/account/account.py:545
 #: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:68
 #: erpnext/setup/doctype/company/company.json
 msgid "Allow Account Creation Against Child Company"
@@ -4154,7 +4149,7 @@ msgstr "Dovoli Vračila"
 msgid "Allow Internal Transfers at Arm's Length Price"
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:858
+#: erpnext/controllers/selling_controller.py:859
 msgid "Allow Item to Be Added Multiple Times in a Transaction"
 msgstr ""
 
@@ -4544,8 +4539,8 @@ msgid "Also you can't switch back to FIFO after setting the valuation method to
 msgstr ""
 
 #: erpnext/manufacturing/doctype/bom/bom.js:288
-#: erpnext/manufacturing/doctype/work_order/work_order.js:165
-#: erpnext/manufacturing/doctype/work_order/work_order.js:180
+#: erpnext/manufacturing/doctype/work_order/work_order.js:146
+#: erpnext/manufacturing/doctype/work_order/work_order.js:161
 #: erpnext/public/js/utils.js:587
 #: erpnext/stock/doctype/stock_entry/stock_entry.js:322
 msgid "Alternate Item"
@@ -4786,7 +4781,7 @@ msgstr "Vedno Vprašaj"
 msgid "Amount"
 msgstr "Znesek"
 
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:22
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:34
 msgid "Amount (AED)"
 msgstr "Znesek (AED)"
 
@@ -4920,12 +4915,12 @@ msgid "Amount to Bill"
 msgstr "Znesek za Fakturiranje"
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1259
-msgid "Amount {0} {1} against {2} {3}"
-msgstr "Znesek {0} {1} v primerjavi z {2} {3}"
+msgid "Amount {0} {1} adjusted against {2} {3}"
+msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1270
-msgid "Amount {0} {1} deducted against {2}"
-msgstr "Znesek {0} {1} odštet od {2}"
+msgid "Amount {0} {1} as adjustment to {2}"
+msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1234
 msgid "Amount {0} {1} transferred from {2} to {3}"
@@ -4970,7 +4965,7 @@ msgstr "Znesek"
 msgid "An Item Group is a way to classify items based on types."
 msgstr ""
 
-#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:558
+#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:601
 msgid "An error has been appeared while reposting item valuation via {0}"
 msgstr ""
 
@@ -5526,7 +5521,7 @@ msgstr ""
 msgid "As there are sufficient Sub Assembly Items, Work Order is not required for Warehouse {0}."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1839
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1841
 msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}."
 msgstr ""
 
@@ -5841,8 +5836,8 @@ msgstr "Količina Sredstev"
 #. Option for the 'Account Type' (Select) field in DocType 'Account'
 #. Label of the asset_received_but_not_billed (Link) field in DocType 'Company'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:165
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:279
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:169
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:284
 #: erpnext/accounts/report/account_balance/account_balance.js:38
 #: erpnext/setup/doctype/company/company.json
 msgid "Asset Received But Not Billed"
@@ -6106,7 +6101,7 @@ msgstr ""
 msgid "Assets {assets_link} created for {item_code}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:240
+#: erpnext/manufacturing/doctype/job_card/job_card.js:709
 msgid "Assign Job to Employee"
 msgstr ""
 
@@ -6167,7 +6162,7 @@ msgstr ""
 msgid "At least one of the Selling or Buying must be selected"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:317
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:57
 msgid "At least one raw material item must be present in the stock entry for the type {0}"
 msgstr ""
 
@@ -6175,20 +6170,16 @@ msgstr ""
 msgid "At least one row is required for a financial report template"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:876
-msgid "At least one warehouse is mandatory"
-msgstr ""
-
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:779
-msgid "At row #{0}: the Difference Account must not be a Stock type account, please change the Account Type for the account {1} or select a different account"
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:169
+msgid "At row #{0}: the Difference Account must not be a Stock type account..."
 msgstr ""
 
 #: erpnext/manufacturing/doctype/routing/routing.py:50
 msgid "At row #{0}: the sequence id {1} cannot be less than previous row sequence id {2}"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:790
-msgid "At row #{0}: you have selected the Difference Account {1}, which is a Cost of Goods Sold type account. Please select a different account"
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:180
+msgid "At row #{0}: you have selected the Difference Account {1}..."
 msgstr ""
 
 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1184
@@ -6619,7 +6610,7 @@ msgstr ""
 #: erpnext/public/js/utils.js:647
 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
 #: erpnext/stock/doctype/pick_list_item/pick_list_item.json
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:177
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:165
 msgid "Available Qty"
 msgstr "Razpoložljiva Količina"
 
@@ -6708,10 +6699,6 @@ msgstr ""
 msgid "Available for use date is required"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039
-msgid "Available quantity is {0}, you need {1}"
-msgstr ""
-
 #: erpnext/stock/dashboard/item_dashboard.js:251
 msgid "Available {0}"
 msgstr ""
@@ -6720,8 +6707,8 @@ msgstr ""
 msgid "Available-for-use Date should be after purchase date"
 msgstr ""
 
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:178
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:212
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:166
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:200
 #: erpnext/stock/report/stock_balance/stock_balance.py:594
 msgid "Average Age"
 msgstr ""
@@ -6827,7 +6814,7 @@ msgstr "Skladiščna Količina"
 #: erpnext/manufacturing/doctype/bom/bom.json
 #: erpnext/manufacturing/doctype/bom/bom_tree.js:8
 #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:216
+#: erpnext/manufacturing/doctype/work_order/work_order.js:197
 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
 #: erpnext/manufacturing/report/bom_explorer/bom_explorer.js:8
 #: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:67
@@ -6850,7 +6837,7 @@ msgstr "Kosovnica"
 msgid "BOM 1"
 msgstr "Kosovnica 1"
 
-#: erpnext/manufacturing/doctype/bom/bom.py:1811
+#: erpnext/manufacturing/doctype/bom/bom.py:1832
 msgid "BOM 1 {0} and BOM 2 {1} should not be same"
 msgstr "Kosovnica 1 {0} in Kosovnica 2 {1} ne smeta biti enaka"
 
@@ -6922,11 +6909,6 @@ msgstr "Eksplozivni Artikel Kosovnice"
 msgid "BOM ID"
 msgstr "ID Kosovnice"
 
-#. Label of the bom_info_section (Section Break) field in DocType 'Stock Entry'
-#: erpnext/stock/doctype/stock_entry/stock_entry.json
-msgid "BOM Info"
-msgstr "Informacije Kosovnice"
-
 #. Name of a DocType
 #: erpnext/manufacturing/doctype/bom_item/bom_item.json
 msgid "BOM Item"
@@ -7080,7 +7062,7 @@ msgstr "Artikel Spletnega Mesta Kosovnice"
 msgid "BOM Website Operation"
 msgstr "Delovanje spletne strani Kosovnice"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:156
 msgid "BOM and Finished Good Quantity is mandatory for Disassembly"
 msgstr ""
 
@@ -7148,7 +7130,7 @@ msgstr "Vnos zalog z retroaktivnim datumom"
 #. Order Operation'
 #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
 #: erpnext/manufacturing/doctype/job_card/job_card.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:386
+#: erpnext/manufacturing/doctype/work_order/work_order.js:367
 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
 msgid "Backflush Materials From WIP Warehouse"
 msgstr "Retroaktivno Pridobi Material iz zaloge nedokončane proizvodnje"
@@ -7433,8 +7415,8 @@ msgid "Bank Balance"
 msgstr "Bančno Stanje"
 
 #. Label of the bank_charges (Currency) field in DocType 'Invoice Discounting'
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:133
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:219
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:137
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:224
 #: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
 msgid "Bank Charges"
 msgstr "Bančne Provizije"
@@ -7549,8 +7531,8 @@ msgstr "Tip Bančne Garancije"
 msgid "Bank Name"
 msgstr "Ime Banke"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:179
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:309
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:183
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:314
 msgid "Bank Overdraft Account"
 msgstr "Bančni Račun Prekoračitev"
 
@@ -7959,7 +7941,7 @@ msgstr "Stanje izteka veljavnosti Artikla Šarže"
 #: erpnext/manufacturing/doctype/job_card/job_card.json
 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:89
 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:115
-#: erpnext/public/js/controllers/transaction.js:2865
+#: erpnext/public/js/controllers/transaction.js:2867
 #: erpnext/public/js/utils/barcode_scanner.js:281
 #: erpnext/public/js/utils/serial_no_batch_selector.js:450
 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -8054,7 +8036,7 @@ msgstr "Količina Šarže"
 #. Label of the batch_size (Float) field in DocType 'Work Order Operation'
 #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
 #: erpnext/manufacturing/doctype/operation/operation.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:368
+#: erpnext/manufacturing/doctype/work_order/work_order.js:349
 #: erpnext/manufacturing/doctype/work_order/work_order.json
 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
 msgid "Batch Size"
@@ -8071,7 +8053,7 @@ msgstr "Šaržna Enota"
 msgid "Batch and Serial No"
 msgstr "Šarža in Serijska Številka"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:937
+#: erpnext/manufacturing/doctype/work_order/work_order.py:938
 msgid "Batch not created for item {} since it does not have a batch series."
 msgstr "Šarža ni bila ustvarjena za element {}, ker nima serije šarže."
 
@@ -8094,12 +8076,12 @@ msgstr "Šarža {0} in Skladišče"
 msgid "Batch {0} is not available in warehouse {1}"
 msgstr "Šarža {0} ni na voljo v skladišču {1}"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:103
 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289
 msgid "Batch {0} of Item {1} has expired."
 msgstr "Šarža {0} artikla {1} je potekla."
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:98
 msgid "Batch {0} of Item {1} is disabled."
 msgstr "Šarža {0} artikla {1} je onemogočena."
 
@@ -8154,7 +8136,7 @@ msgstr ""
 #. Label of the bill_date (Date) field in DocType 'Journal Entry'
 #. Label of the bill_date (Date) field in DocType 'Subcontracting Receipt'
 #: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1264
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1187
 #: erpnext/accounts/report/purchase_register/purchase_register.py:214
 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 msgid "Bill Date"
@@ -8163,7 +8145,7 @@ msgstr "Datum Fakture"
 #. Label of the bill_no (Data) field in DocType 'Journal Entry'
 #. Label of the bill_no (Data) field in DocType 'Subcontracting Receipt'
 #: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1263
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1186
 #: erpnext/accounts/report/purchase_register/purchase_register.py:213
 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 msgid "Bill No"
@@ -8177,11 +8159,13 @@ msgstr ""
 
 #. Label of a Card Break in the Manufacturing Workspace
 #. Label of a Link in the Manufacturing Workspace
+#. Label of the bom_info_section (Section Break) field in DocType 'Stock Entry'
 #. Label of a Workspace Sidebar Item
 #: erpnext/manufacturing/doctype/bom/bom.py:1382
 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
 #: erpnext/stock/doctype/material_request/material_request.js:139
 #: erpnext/stock/doctype/stock_entry/stock_entry.js:774
+#: erpnext/stock/doctype/stock_entry/stock_entry.json
 #: erpnext/workspace_sidebar/subcontracting.json
 msgid "Bill of Materials"
 msgstr "Kosovnica"
@@ -8282,7 +8266,7 @@ msgstr "Podrobnosti Naslova Fakture"
 msgid "Billing Address Name"
 msgstr "Ime Naslova Fakture"
 
-#: erpnext/controllers/accounts_controller.py:574
+#: erpnext/controllers/accounts_controller.py:575
 msgid "Billing Address does not belong to the {0}"
 msgstr "Naslov Fakture ne pripada {0}"
 
@@ -8889,8 +8873,8 @@ msgstr ""
 msgid "Buildable Qty"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:61
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:102
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:65
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:107
 msgid "Buildings"
 msgstr ""
 
@@ -9108,8 +9092,8 @@ msgstr "Opomba Prodajne Podpore"
 msgid "CRM Settings"
 msgstr "Nastavitve Prodajne Podpore"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:67
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:117
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:71
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:122
 msgid "CWIP Account"
 msgstr ""
 
@@ -9364,7 +9348,7 @@ msgstr ""
 msgid "Can be approved by {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2583
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2581
 msgid "Can not close Work Order. Since {0} Job Cards are in Work In Progress state."
 msgstr ""
 
@@ -9398,12 +9382,12 @@ msgid "Can only make payment against unbilled {0}"
 msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499
-#: erpnext/controllers/accounts_controller.py:3196
+#: erpnext/controllers/accounts_controller.py:3190
 #: erpnext/public/js/controllers/accounts.js:103
 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:206
+#: erpnext/setup/doctype/company/company.py:209
 #: erpnext/stock/doctype/stock_settings/stock_settings.py:181
 msgid "Can't change the valuation method, as there are transactions against some items which do not have its own valuation method"
 msgstr ""
@@ -9445,7 +9429,7 @@ msgstr ""
 msgid "Cannot Calculate Arrival Time as Driver Address is Missing."
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:225
+#: erpnext/setup/doctype/company/company.py:228
 msgid "Cannot Change Inventory Account Setting"
 msgstr ""
 
@@ -9503,7 +9487,7 @@ msgstr ""
 msgid "Cannot cancel as processing of cancelled documents is pending."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1115
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1116
 msgid "Cannot cancel because submitted Stock Entry {0} exists"
 msgstr ""
 
@@ -9523,7 +9507,7 @@ msgstr ""
 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:554
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:418
 msgid "Cannot cancel transaction for Completed Work Order."
 msgstr ""
 
@@ -9531,7 +9515,7 @@ msgstr ""
 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item"
 msgstr ""
 
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:73
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:74
 msgid "Cannot change Reference Document Type."
 msgstr ""
 
@@ -9543,7 +9527,7 @@ msgstr ""
 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this."
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:330
+#: erpnext/setup/doctype/company/company.py:334
 msgid "Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency."
 msgstr ""
 
@@ -9559,11 +9543,11 @@ msgstr ""
 msgid "Cannot convert Task to non-group because the following child Tasks exist: {0}."
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:440
+#: erpnext/accounts/doctype/account/account.py:441
 msgid "Cannot convert to Group because Account Type is selected."
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:276
+#: erpnext/accounts/doctype/account/account.py:277
 msgid "Cannot covert to Group because Account Type is selected."
 msgstr ""
 
@@ -9571,7 +9555,7 @@ msgstr ""
 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts."
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:2023
+#: erpnext/selling/doctype/sales_order/sales_order.py:2045
 #: erpnext/stock/doctype/pick_list/pick_list.py:257
 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list."
 msgstr ""
@@ -9605,12 +9589,12 @@ msgstr ""
 msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3809
+#: erpnext/controllers/accounts_controller.py:3815
 msgid "Cannot delete an item which has been ordered"
 msgstr ""
 
 #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:197
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:784
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:785
 msgid "Cannot delete protected core DocType: {0}"
 msgstr ""
 
@@ -9622,7 +9606,7 @@ msgstr ""
 msgid "Cannot disable Serial and Batch No for Item, as there are existing records for serial / batch."
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:560
+#: erpnext/setup/doctype/company/company.py:564
 msgid "Cannot disable perpetual inventory, as there are existing Stock Ledger Entries for the company {0}. Please cancel the stock transactions first and try again."
 msgstr ""
 
@@ -9630,20 +9614,20 @@ msgstr ""
 msgid "Cannot disable {0} as it may lead to incorrect stock valuation."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:727
+#: erpnext/manufacturing/doctype/work_order/work_order.py:728
 msgid "Cannot disassemble more than produced quantity."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:919
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:40
 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble."
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:222
+#: erpnext/setup/doctype/company/company.py:225
 msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again."
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:783
-#: erpnext/selling/doctype/sales_order/sales_order.py:806
+#: erpnext/selling/doctype/sales_order/sales_order.py:786
+#: erpnext/selling/doctype/sales_order/sales_order.py:809
 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No."
 msgstr ""
 
@@ -9659,7 +9643,7 @@ msgstr ""
 msgid "Cannot find Item with this Barcode"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3761
+#: erpnext/controllers/accounts_controller.py:3767
 msgid "Cannot find a default warehouse for item {0}. Please set one in the Item Master or in Stock Settings."
 msgstr ""
 
@@ -9667,15 +9651,15 @@ msgstr ""
 msgid "Cannot merge {0} '{1}' into '{2}' as both have existing accounting entries in different currencies for company '{3}'."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:577
+#: erpnext/manufacturing/doctype/work_order/work_order.py:578
 msgid "Cannot produce more Item {0} than Sales Order quantity {1} {2}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1472
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1473
 msgid "Cannot produce more item for {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1476
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1477
 msgid "Cannot produce more than {0} items for {1}"
 msgstr ""
 
@@ -9683,12 +9667,12 @@ msgstr ""
 msgid "Cannot receive from customer against negative outstanding"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4083
+#: erpnext/controllers/accounts_controller.py:4089
 msgid "Cannot reduce quantity than ordered or purchased quantity"
 msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512
-#: erpnext/controllers/accounts_controller.py:3211
+#: erpnext/controllers/accounts_controller.py:3205
 #: erpnext/public/js/controllers/accounts.js:120
 msgid "Cannot refer row number greater than or equal to current row number for this Charge type"
 msgstr ""
@@ -9701,14 +9685,14 @@ msgstr ""
 msgid "Cannot retrieve link token. Check Error Log for more information"
 msgstr ""
 
-#: erpnext/selling/doctype/customer/customer.py:368
+#: erpnext/selling/doctype/customer/customer.py:358
 msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group."
 msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505
 #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827
-#: erpnext/controllers/accounts_controller.py:3201
+#: erpnext/controllers/accounts_controller.py:3195
 #: erpnext/public/js/controllers/accounts.js:112
 #: erpnext/public/js/controllers/taxes_and_totals.js:550
 msgid "Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row"
@@ -9730,11 +9714,11 @@ msgstr ""
 msgid "Cannot set multiple account rows for the same company"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4049
+#: erpnext/controllers/accounts_controller.py:4055
 msgid "Cannot set quantity less than delivered quantity."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4050
+#: erpnext/controllers/accounts_controller.py:4056
 msgid "Cannot set quantity less than received quantity."
 msgstr ""
 
@@ -9746,7 +9730,7 @@ msgstr ""
 msgid "Cannot start deletion. Another deletion {0} is already queued/running. Please wait for it to complete."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4077
+#: erpnext/controllers/accounts_controller.py:4083
 msgid "Cannot update rate as item {0} is already ordered or purchased against this quotation"
 msgstr ""
 
@@ -9779,7 +9763,7 @@ msgstr ""
 msgid "Capacity Planning"
 msgstr "Načrtovanje Zmogljivosti"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1101
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1102
 msgid "Capacity Planning Error, planned start time can not be same as end time"
 msgstr "Napaka pri načrtovanju zmogljivosti, načrtovani začetni čas ne more biti enak končnemu času"
 
@@ -9798,13 +9782,13 @@ msgstr ""
 msgid "Capacity must be greater than 0"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:44
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:77
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:48
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:82
 msgid "Capital Equipment"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:190
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:333
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:194
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:338
 msgid "Capital Stock"
 msgstr ""
 
@@ -10136,7 +10120,7 @@ msgstr ""
 msgid "Change this date manually to setup the next synchronization start date"
 msgstr ""
 
-#: erpnext/selling/doctype/customer/customer.py:158
+#: erpnext/selling/doctype/customer/customer.py:148
 msgid "Changed customer name to '{}' as '{}' already exists."
 msgstr ""
 
@@ -10144,7 +10128,7 @@ msgstr ""
 msgid "Changes in {0}"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:385
+#: erpnext/stock/doctype/item/item.js:378
 msgid "Changing Customer Group for the selected Customer is not allowed."
 msgstr ""
 
@@ -10159,7 +10143,7 @@ msgid "Channel Partner"
 msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:2258
-#: erpnext/controllers/accounts_controller.py:3264
+#: erpnext/controllers/accounts_controller.py:3258
 msgid "Charge of type 'Actual' in row {0} cannot be included in Item Rate or Paid Amount"
 msgstr ""
 
@@ -10213,7 +10197,7 @@ msgstr ""
 #: erpnext/accounts/doctype/cost_center/cost_center_tree.js:52
 #: erpnext/accounts/workspace/invoicing/invoicing.json
 #: erpnext/public/js/setup_wizard.js:43
-#: erpnext/setup/doctype/company/company.js:123
+#: erpnext/setup/doctype/company/company.js:139
 #: erpnext/setup/doctype/company/company.json
 #: erpnext/setup/workspace/home/home.json
 #: erpnext/workspace_sidebar/accounts_setup.json
@@ -10356,7 +10340,7 @@ msgstr "Širina Čeka"
 
 #. Label of the reference_date (Date) field in DocType 'Payment Entry'
 #: erpnext/accounts/doctype/payment_entry/payment_entry.json
-#: erpnext/public/js/controllers/transaction.js:2776
+#: erpnext/public/js/controllers/transaction.js:2778
 msgid "Cheque/Reference Date"
 msgstr ""
 
@@ -10414,7 +10398,7 @@ msgstr "Ime podrejenega dokumenta"
 
 #. Label of the child_row_reference (Data) field in DocType 'Quality
 #. Inspection'
-#: erpnext/public/js/controllers/transaction.js:2871
+#: erpnext/public/js/controllers/transaction.js:2873
 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json
 msgid "Child Row Reference"
 msgstr "Referenca podrejene vrstice"
@@ -10608,11 +10592,11 @@ msgstr ""
 msgid "Closed Documents"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2506
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2504
 msgid "Closed Work Order can not be stopped or Re-opened"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:542
+#: erpnext/selling/doctype/sales_order/sales_order.py:547
 msgid "Closed order cannot be cancelled. Unclose to cancel."
 msgstr ""
 
@@ -10864,8 +10848,8 @@ msgstr "Stopnja Provizije %"
 msgid "Commission Rate (%)"
 msgstr "Stopnja Provizije (%)"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:104
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:172
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:108
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:177
 msgid "Commission on Sales"
 msgstr "Provizija od Prodaje"
 
@@ -10899,7 +10883,7 @@ msgstr ""
 msgid "Communication Medium Type"
 msgstr ""
 
-#: erpnext/setup/install.py:107
+#: erpnext/setup/install.py:108
 msgid "Compact Item Print"
 msgstr ""
 
@@ -11298,8 +11282,8 @@ msgstr ""
 #: erpnext/setup/doctype/employee/employee_tree.js:8
 #: erpnext/setup/doctype/employee_external_work_history/employee_external_work_history.json
 #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json
-#: erpnext/setup/doctype/vehicle/vehicle.json erpnext/setup/install.py:166
-#: erpnext/setup/install.py:175 erpnext/setup/workspace/home/home.json
+#: erpnext/setup/doctype/vehicle/vehicle.json erpnext/setup/install.py:198
+#: erpnext/setup/install.py:207 erpnext/setup/workspace/home/home.json
 #: erpnext/stock/dashboard_chart_source/stock_value_by_item_group/stock_value_by_item_group.js:8
 #: erpnext/stock/dashboard_chart_source/warehouse_wise_stock_value/warehouse_wise_stock_value.js:8
 #: erpnext/stock/doctype/bin/bin.json
@@ -11441,11 +11425,11 @@ msgstr ""
 msgid "Company Address Name"
 msgstr "Ime Naslova Podjetja"
 
-#: erpnext/controllers/accounts_controller.py:4411
+#: erpnext/controllers/accounts_controller.py:4399
 msgid "Company Address is missing. You don't have permission to create an Address. Please contact your System Manager."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4399
+#: erpnext/controllers/accounts_controller.py:4387
 msgid "Company Address is missing. You don't have permission to update it. Please contact your System Manager."
 msgstr ""
 
@@ -11548,7 +11532,7 @@ msgstr ""
 msgid "Company and account filters not set!"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2580
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2661
 msgid "Company currencies of both the companies should match for Inter Company Transactions."
 msgstr ""
 
@@ -11583,7 +11567,7 @@ msgstr ""
 msgid "Company link field name used for filtering (optional - leave empty to delete all records)"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.js:222
+#: erpnext/setup/doctype/company/company.js:238
 msgid "Company name not same"
 msgstr ""
 
@@ -11622,12 +11606,12 @@ msgstr ""
 msgid "Company {0} added multiple times"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:509
+#: erpnext/accounts/doctype/account/account.py:510
 #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.py:1308
 msgid "Company {0} does not exist"
 msgstr ""
 
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:83
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:105
 msgid "Company {0} is added more than once"
 msgstr ""
 
@@ -11669,7 +11653,7 @@ msgstr ""
 msgid "Competitors"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:277
+#: erpnext/manufacturing/doctype/job_card/job_card.js:661
 #: erpnext/manufacturing/doctype/workstation/workstation.js:151
 msgid "Complete Job"
 msgstr ""
@@ -11716,12 +11700,12 @@ msgstr ""
 msgid "Completed Qty"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1390
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1391
 msgid "Completed Qty cannot be greater than 'Qty to Manufacture'"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:331
-#: erpnext/manufacturing/doctype/job_card/job_card.js:452
+#: erpnext/manufacturing/doctype/job_card/job_card.js:259
+#: erpnext/manufacturing/doctype/job_card/job_card.js:393
 #: erpnext/manufacturing/doctype/workstation/workstation.js:296
 msgid "Completed Quantity"
 msgstr ""
@@ -11910,7 +11894,7 @@ msgstr ""
 msgid "Consider Minimum Order Qty"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1096
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1078
 msgid "Consider Process Loss"
 msgstr ""
 
@@ -12104,7 +12088,7 @@ msgstr ""
 msgid "Consumed Qty"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1766
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1767
 msgid "Consumed Qty cannot be greater than Reserved Qty for item {0}"
 msgstr ""
 
@@ -12133,7 +12117,7 @@ msgstr ""
 msgid "Consumed Stock Total Value"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry_type/stock_entry_type.py:135
+#: erpnext/stock/doctype/stock_entry_type/stock_entry_type.py:136
 msgid "Consumed quantity of item {0} exceeds transferred quantity."
 msgstr ""
 
@@ -12261,7 +12245,7 @@ msgstr ""
 msgid "Contact Person"
 msgstr "Kontaktna Oseba"
 
-#: erpnext/controllers/accounts_controller.py:586
+#: erpnext/controllers/accounts_controller.py:587
 msgid "Contact Person does not belong to the {0}"
 msgstr ""
 
@@ -12455,15 +12439,15 @@ msgstr ""
 msgid "Conversion factor for item {0} has been reset to 1.0 as the uom {1} is same as stock uom {2}."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2977
+#: erpnext/controllers/accounts_controller.py:2971
 msgid "Conversion rate cannot be 0"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2984
+#: erpnext/controllers/accounts_controller.py:2978
 msgid "Conversion rate is 1.00, but document currency is different from company currency"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2980
+#: erpnext/controllers/accounts_controller.py:2974
 msgid "Conversion rate must be 1.00 if document currency is same as company currency"
 msgstr ""
 
@@ -12540,13 +12524,13 @@ msgstr ""
 msgid "Corrective Action"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:509
+#: erpnext/manufacturing/doctype/job_card/job_card.js:447
 msgid "Corrective Job Card"
 msgstr ""
 
 #. Label of the corrective_operation_section (Tab Break) field in DocType 'Job
 #. Card'
-#: erpnext/manufacturing/doctype/job_card/job_card.js:516
+#: erpnext/manufacturing/doctype/job_card/job_card.js:456
 #: erpnext/manufacturing/doctype/job_card/job_card.json
 msgid "Corrective Operation"
 msgstr ""
@@ -12713,7 +12697,7 @@ msgstr ""
 #: erpnext/accounts/report/accounts_payable/accounts_payable.js:28
 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:47
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:30
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1249
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1172
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:47
 #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:42
 #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
@@ -12846,7 +12830,7 @@ msgstr ""
 msgid "Cost Center: {0} does not exist"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.js:113
+#: erpnext/setup/doctype/company/company.js:129
 msgid "Cost Centers"
 msgstr ""
 
@@ -12889,17 +12873,13 @@ msgstr ""
 #. Label of the cost_of_good_sold_section (Section Break) field in DocType
 #. 'Item Default'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:84
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:143
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:88
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:148
 #: erpnext/accounts/report/account_balance/account_balance.js:43
 #: erpnext/stock/doctype/item_default/item_default.json
 msgid "Cost of Goods Sold"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:793
-msgid "Cost of Goods Sold Account in Items Table"
-msgstr ""
-
 #: erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py:40
 msgid "Cost of Issued Items"
 msgstr ""
@@ -12979,7 +12959,7 @@ msgstr ""
 msgid "Could not auto create Customer due to the following missing mandatory field(s):"
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:692
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:733
 msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
 msgstr "Kreditna Faktura ni bilo mogoče ustvariti samodejno, odstranite potrditev možnosti \"Izdaj Kreditno Fakturo\" in ga predložite znova"
 
@@ -13168,7 +13148,7 @@ msgstr "Ustvari Fakture"
 msgid "Create Item"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:206
+#: erpnext/manufacturing/doctype/work_order/work_order.js:187
 msgid "Create Job Card"
 msgstr ""
 
@@ -13267,7 +13247,7 @@ msgstr ""
 msgid "Create Payment Request"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:818
+#: erpnext/manufacturing/doctype/work_order/work_order.js:800
 msgid "Create Pick List"
 msgstr ""
 
@@ -13412,7 +13392,7 @@ msgstr ""
 msgid "Create Tasks"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.js:157
+#: erpnext/setup/doctype/company/company.js:173
 msgid "Create Tax Template"
 msgstr ""
 
@@ -13450,12 +13430,12 @@ msgstr ""
 msgid "Create Users"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:984
+#: erpnext/stock/doctype/item/item.js:971
 msgid "Create Variant"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:798
-#: erpnext/stock/doctype/item/item.js:842
+#: erpnext/stock/doctype/item/item.js:785
+#: erpnext/stock/doctype/item/item.js:829
 msgid "Create Variants"
 msgstr ""
 
@@ -13486,12 +13466,12 @@ msgstr ""
 msgid "Create a new rule to automatically classify transactions."
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:825
-#: erpnext/stock/doctype/item/item.js:977
+#: erpnext/stock/doctype/item/item.js:812
+#: erpnext/stock/doctype/item/item.js:964
 msgid "Create a variant with the template image."
 msgstr ""
 
-#: erpnext/stock/stock_ledger.py:2071
+#: erpnext/stock/stock_ledger.py:2037
 msgid "Create an incoming stock transaction for the Item."
 msgstr ""
 
@@ -13525,7 +13505,7 @@ msgstr ""
 msgid "Created By Migration"
 msgstr ""
 
-#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245
+#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:220
 msgid "Created {0} scorecards for {1} between:"
 msgstr ""
 
@@ -13558,7 +13538,7 @@ msgstr ""
 msgid "Creating Delivery Schedule..."
 msgstr ""
 
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:140
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:162
 msgid "Creating Dimensions..."
 msgstr ""
 
@@ -13751,7 +13731,7 @@ msgstr ""
 msgid "Credit Limit"
 msgstr "Kreditna Omejitev"
 
-#: erpnext/selling/doctype/customer/customer.py:650
+#: erpnext/selling/doctype/customer/customer.py:640
 msgid "Credit Limit Crossed"
 msgstr ""
 
@@ -13798,7 +13778,7 @@ msgstr ""
 #: erpnext/accounts/doctype/journal_entry/journal_entry.json
 #: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:176
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1273
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1196
 #: erpnext/controllers/sales_and_purchase_return.py:453
 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:303
 #: erpnext/stock/doctype/delivery_note/delivery_note.js:89
@@ -13826,7 +13806,7 @@ msgstr "Izdana Kreditna Faktura"
 msgid "Credit Note will update it's own outstanding amount, even if 'Return Against' is specified."
 msgstr "Kreditna Faktura bo posodobila svoj neplačani znesek, tudi če je navedena možnost \"Vračilo Proti\"."
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:689
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:730
 msgid "Credit Note {0} has been created automatically"
 msgstr "Kreditna Faktura {0} je bil ustvarjen samodejno"
 
@@ -13834,7 +13814,7 @@ msgstr "Kreditna Faktura {0} je bil ustvarjen samodejno"
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:376
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:384
-#: erpnext/controllers/accounts_controller.py:2376
+#: erpnext/controllers/accounts_controller.py:2377
 msgid "Credit To"
 msgstr "Kredit za"
 
@@ -13843,20 +13823,20 @@ msgstr "Kredit za"
 msgid "Credit in Company Currency"
 msgstr ""
 
-#: erpnext/selling/doctype/customer/customer.py:616
-#: erpnext/selling/doctype/customer/customer.py:673
+#: erpnext/selling/doctype/customer/customer.py:606
+#: erpnext/selling/doctype/customer/customer.py:663
 msgid "Credit limit has been crossed for customer {0} ({1}/{2})"
 msgstr ""
 
-#: erpnext/selling/doctype/customer/customer.py:395
+#: erpnext/selling/doctype/customer/customer.py:385
 msgid "Credit limit is already defined for the Company {0}"
 msgstr ""
 
-#: erpnext/selling/doctype/customer/customer.py:672
+#: erpnext/selling/doctype/customer/customer.py:662
 msgid "Credit limit reached for customer {0}"
 msgstr ""
 
-#: erpnext/accounts/utils.py:2827
+#: erpnext/accounts/utils.py:2826
 msgid "Credit limit warning — submission may be blocked: {0}"
 msgstr ""
 
@@ -13864,8 +13844,8 @@ msgstr ""
 msgid "Creditor Turnover Ratio"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:155
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:257
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:159
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:262
 msgid "Creditors"
 msgstr ""
 
@@ -14035,7 +14015,7 @@ msgstr ""
 msgid "Currency and Price List"
 msgstr "Valuta in Cenik"
 
-#: erpnext/accounts/doctype/account/account.py:346
+#: erpnext/accounts/doctype/account/account.py:347
 msgid "Currency can not be changed after making entries using some other currency"
 msgstr ""
 
@@ -14045,7 +14025,7 @@ msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1604
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1672
-#: erpnext/accounts/utils.py:2546
+#: erpnext/accounts/utils.py:2545
 msgid "Currency for {0} must be {1}"
 msgstr ""
 
@@ -14128,8 +14108,8 @@ msgstr ""
 msgid "Current Level"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:153
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:255
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:157
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:260
 msgid "Current Liabilities"
 msgstr ""
 
@@ -14487,8 +14467,8 @@ msgstr "Naslov Stranke"
 msgid "Customer Addresses And Contacts"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:159
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:269
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:163
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:274
 msgid "Customer Advances"
 msgstr ""
 
@@ -14502,7 +14482,7 @@ msgstr "Koda Stranke"
 #. Label of the customer_contact_display (Small Text) field in DocType
 #. 'Purchase Order'
 #. Label of the customer_contact (Small Text) field in DocType 'Delivery Stop'
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1243
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1166
 #: erpnext/buying/doctype/purchase_order/purchase_order.json
 #: erpnext/stock/doctype/delivery_stop/delivery_stop.json
 msgid "Customer Contact"
@@ -14607,7 +14587,7 @@ msgstr ""
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 #: erpnext/accounts/doctype/tax_rule/tax_rule.json
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:115
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1301
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1224
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:96
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:187
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:56
@@ -14667,7 +14647,7 @@ msgstr "Artikel Stranke"
 msgid "Customer Items"
 msgstr "Artikli Stranke"
 
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1292
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1215
 msgid "Customer LPO"
 msgstr ""
 
@@ -14719,7 +14699,7 @@ msgstr ""
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
 #: erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1232
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1155
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:157
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:92
 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:35
@@ -14825,7 +14805,7 @@ msgstr "Zagotovila Stranka"
 msgid "Customer Provided Item Cost"
 msgstr "Stroški artikla, ki jih je zagotovila stranka"
 
-#: erpnext/setup/doctype/company/company.py:486
+#: erpnext/setup/doctype/company/company.py:490
 msgid "Customer Service"
 msgstr ""
 
@@ -14883,8 +14863,8 @@ msgid "Customer required for 'Customerwise Discount'"
 msgstr ""
 
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1142
-#: erpnext/selling/doctype/sales_order/sales_order.py:438
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:436
+#: erpnext/selling/doctype/sales_order/sales_order.py:446
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:437
 msgid "Customer {0} does not belong to project {1}"
 msgstr "Stranka {0} ne pripada projektu {1}"
 
@@ -14996,7 +14976,7 @@ msgstr ""
 msgid "DFS"
 msgstr ""
 
-#: erpnext/projects/doctype/project/project.py:679
+#: erpnext/projects/doctype/project/project.py:717
 msgid "Daily Project Summary for {0}"
 msgstr ""
 
@@ -15087,7 +15067,7 @@ msgstr ""
 msgid "Date of Commencement"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.js:94
+#: erpnext/setup/doctype/company/company.js:110
 msgid "Date of Commencement should be greater than Date of Incorporation"
 msgstr ""
 
@@ -15313,7 +15293,7 @@ msgstr ""
 #: erpnext/accounts/doctype/journal_entry/journal_entry.json
 #: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:178
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1276
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1199
 #: erpnext/controllers/sales_and_purchase_return.py:457
 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:304
 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:45
@@ -15343,7 +15323,7 @@ msgstr ""
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1013
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1024
-#: erpnext/controllers/accounts_controller.py:2376
+#: erpnext/controllers/accounts_controller.py:2377
 msgid "Debit To"
 msgstr "Debet na"
 
@@ -15502,14 +15482,14 @@ msgstr ""
 
 #. Label of the default_advance_paid_account (Link) field in DocType 'Company'
 #: erpnext/setup/doctype/company/company.json
-#: erpnext/setup/doctype/company/company.py:315
+#: erpnext/setup/doctype/company/company.py:319
 msgid "Default Advance Paid Account"
 msgstr ""
 
 #. Label of the default_advance_received_account (Link) field in DocType
 #. 'Company'
 #: erpnext/setup/doctype/company/company.json
-#: erpnext/setup/doctype/company/company.py:304
+#: erpnext/setup/doctype/company/company.py:308
 msgid "Default Advance Received Account"
 msgstr ""
 
@@ -15528,15 +15508,15 @@ msgstr "Privzeta Kosovnica"
 msgid "Default BOM ({0}) must be active for this item or its template"
 msgstr "Privzeta Kosovnica({0}) mora biti aktivna za ta artikel ali njegovo predlogo"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2268
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2270
 msgid "Default BOM for {0} not found"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4121
+#: erpnext/controllers/accounts_controller.py:4109
 msgid "Default BOM not found for FG Item {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2265
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2267
 msgid "Default BOM not found for Item {0} and Project {1}"
 msgstr ""
 
@@ -15707,6 +15687,16 @@ msgstr ""
 msgid "Default Item Manufacturer"
 msgstr ""
 
+#. Label of the default_letter_head (Link) field in DocType 'Company'
+#: erpnext/setup/doctype/company/company.json
+msgid "Default Letter Head (DocType)"
+msgstr ""
+
+#. Label of the default_letter_head_report (Link) field in DocType 'Company'
+#: erpnext/setup/doctype/company/company.json
+msgid "Default Letter Head (Report)"
+msgstr ""
+
 #. Label of the default_manufacturer_part_no (Data) field in DocType 'Item'
 #: erpnext/stock/doctype/item/item.json
 msgid "Default Manufacturer Part No"
@@ -15941,7 +15931,7 @@ msgstr ""
 msgid "Default settings for your stock-related transactions"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.js:191
+#: erpnext/setup/doctype/company/company.js:207
 msgid "Default tax templates for sales, purchase and items are created."
 msgstr ""
 
@@ -16114,12 +16104,12 @@ msgstr ""
 
 #. Label of the delete_transactions_status (Select) field in DocType
 #. 'Transaction Deletion Record'
-#: erpnext/setup/doctype/company/company.js:168
+#: erpnext/setup/doctype/company/company.js:184
 #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json
 msgid "Delete Transactions"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.js:237
+#: erpnext/setup/doctype/company/company.js:253
 msgid "Delete all the Transactions for this Company"
 msgstr ""
 
@@ -16140,8 +16130,8 @@ msgstr ""
 msgid "Deleting {0} and all associated Common Code documents..."
 msgstr ""
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1101
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1120
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1102
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1121
 msgid "Deletion in Progress!"
 msgstr ""
 
@@ -16252,11 +16242,11 @@ msgstr "Dostavljena Količina"
 msgid "Delivered Qty (in Stock UOM)"
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:597
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:596
 msgid "Delivered Qty cannot be increased by more than {0} for item {1}"
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:590
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:589
 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}"
 msgstr ""
 
@@ -16337,7 +16327,7 @@ msgstr "Vodja Dostave"
 #: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:129
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:415
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:36
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:45
 #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.js:22
 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:21
@@ -16401,7 +16391,7 @@ msgstr "Trendi Dobavnice"
 msgid "Delivery Note {0} is not submitted"
 msgstr ""
 
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1296
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1219
 #: erpnext/stock/doctype/delivery_trip/delivery_trip.js:75
 msgid "Delivery Notes"
 msgstr "Dobavnice"
@@ -16487,10 +16477,6 @@ msgstr "Dostavno Skladišče"
 msgid "Delivery to"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:457
-msgid "Delivery warehouse required for stock item {0}"
-msgstr ""
-
 #. Label of the sales_orders_and_material_requests_tab (Tab Break) field in
 #. DocType 'Master Production Schedule'
 #: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.json
@@ -16610,8 +16596,8 @@ msgstr ""
 #. Label of the depreciation_tab (Tab Break) field in DocType 'Asset'
 #. Group in Asset's connections
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:105
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:176
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:109
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:181
 #: erpnext/accounts/report/account_balance/account_balance.js:44
 #: erpnext/accounts/report/cash_flow/cash_flow.py:162
 #: erpnext/assets/doctype/asset/asset.json
@@ -16704,7 +16690,7 @@ msgstr ""
 msgid "Depreciation Posting Date"
 msgstr ""
 
-#: erpnext/assets/doctype/asset/asset.js:917
+#: erpnext/assets/doctype/asset/asset.js:919
 msgid "Depreciation Posting Date cannot be before Available-for-use Date"
 msgstr ""
 
@@ -16862,11 +16848,11 @@ msgstr ""
 msgid "Difference Account"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:782
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:172
 msgid "Difference Account in Items Table"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:771
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:160
 msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry"
 msgstr ""
 
@@ -16982,15 +16968,15 @@ msgstr ""
 msgid "Direct Expense"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:82
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:141
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:86
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:146
 msgid "Direct Expenses"
 msgstr ""
 
 #. Option for the 'Account Type' (Select) field in DocType 'Account'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:141
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:237
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:145
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:242
 msgid "Direct Income"
 msgstr ""
 
@@ -17071,6 +17057,11 @@ msgstr ""
 msgid "Disable Serial No And Batch Selector"
 msgstr ""
 
+#. Label of the disable_sdbnb_in_sr (Check) field in DocType 'Company'
+#: erpnext/setup/doctype/company/company.json
+msgid "Disable Stock Delivered But Not Billed in Sales Return"
+msgstr ""
+
 #. Label of the disable_transaction_threshold (Check) field in DocType 'Tax
 #. Withholding Category'
 #: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
@@ -17107,11 +17098,11 @@ msgstr ""
 msgid "Disabled items cannot be selected in any transaction."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:904
+#: erpnext/controllers/accounts_controller.py:905
 msgid "Disabled pricing rules since this {} is an internal transfer"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:918
+#: erpnext/controllers/accounts_controller.py:919
 msgid "Disabled tax included prices since this {} is an internal transfer"
 msgstr ""
 
@@ -17127,7 +17118,7 @@ msgstr ""
 
 #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry'
 #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type'
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1074
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1056
 #: erpnext/stock/doctype/stock_entry/stock_entry.js:370
 #: erpnext/stock/doctype/stock_entry/stock_entry.js:413
 #: erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -17135,15 +17126,15 @@ msgstr ""
 msgid "Disassemble"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:232
+#: erpnext/manufacturing/doctype/work_order/work_order.js:213
 msgid "Disassemble Order"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:104
 msgid "Disassemble Qty cannot be less than or equal to 0."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:463
+#: erpnext/manufacturing/doctype/work_order/work_order.js:445
 msgid "Disassemble Qty cannot be less than or equal to <b>0</b>."
 msgstr ""
 
@@ -17430,7 +17421,7 @@ msgstr ""
 msgid "Dislikes"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:480
+#: erpnext/setup/doctype/company/company.py:484
 msgid "Dispatch"
 msgstr ""
 
@@ -17625,8 +17616,8 @@ msgstr ""
 msgid "Distributor"
 msgstr "Distributer"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:191
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:338
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:195
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:343
 msgid "Dividends Paid"
 msgstr ""
 
@@ -17688,7 +17679,7 @@ msgstr ""
 msgid "Do not update variants on save"
 msgstr ""
 
-#: erpnext/assets/doctype/asset/asset.js:955
+#: erpnext/assets/doctype/asset/asset.js:957
 msgid "Do you really want to restore this scrapped asset?"
 msgstr ""
 
@@ -17712,7 +17703,7 @@ msgstr ""
 msgid "Do you want to submit the material request"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:111
+#: erpnext/manufacturing/doctype/job_card/job_card.js:108
 msgid "Do you want to submit the stock entry?"
 msgstr ""
 
@@ -17779,11 +17770,11 @@ msgstr ""
 msgid "Document Type "
 msgstr ""
 
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:65
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:66
 msgid "Document Type already used as a dimension"
 msgstr ""
 
-#: erpnext/setup/install.py:198
+#: erpnext/setup/install.py:230
 msgid "Documentation"
 msgstr ""
 
@@ -17946,12 +17937,6 @@ msgstr ""
 msgid "Driving License Category"
 msgstr ""
 
-#. Label of the drop_ar_procedures (Button) field in DocType 'Accounts
-#. Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Drop Procedures"
-msgstr ""
-
 #. Label of the drop_ship (Section Break) field in DocType 'POS Invoice Item'
 #. Label of the drop_ship (Section Break) field in DocType 'Sales Invoice Item'
 #. Label of the drop_ship (Tab Break) field in DocType 'Purchase Order'
@@ -17972,12 +17957,6 @@ msgstr ""
 msgid "Drop some files here, or click to select files"
 msgstr ""
 
-#. Description of the 'Drop Procedures' (Button) field in DocType 'Accounts
-#. Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Drops existing SQL Procedures and Function setup by Accounts Receivable report"
-msgstr ""
-
 #: erpnext/accounts/party.py:700
 msgid "Due Date cannot be after {0}"
 msgstr ""
@@ -18136,8 +18115,8 @@ msgstr ""
 msgid "Duration in Days"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:170
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:286
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:174
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:291
 #: erpnext/setup/setup_wizard/operations/taxes_setup.py:256
 msgid "Duties and Taxes"
 msgstr ""
@@ -18220,7 +18199,7 @@ msgstr ""
 msgid "Each Transaction"
 msgstr ""
 
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:184
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:172
 msgid "Earliest"
 msgstr ""
 
@@ -18334,6 +18313,10 @@ msgstr ""
 msgid "Either target qty or target amount is mandatory."
 msgstr ""
 
+#: erpnext/manufacturing/doctype/job_card/job_card.js:675
+msgid "Elapsed Time"
+msgstr ""
+
 #. Option for the 'Fuel Type' (Select) field in DocType 'Vehicle'
 #: erpnext/setup/doctype/vehicle/vehicle.json
 msgid "Electric"
@@ -18353,8 +18336,8 @@ msgstr ""
 msgid "Electricity down"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:48
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:82
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:52
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:87
 msgid "Electronic Equipment"
 msgstr ""
 
@@ -18558,8 +18541,8 @@ msgstr ""
 msgid "Employee Advances"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:184
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:322
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:188
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:327
 msgid "Employee Benefits Obligation"
 msgstr ""
 
@@ -18642,7 +18625,7 @@ msgstr ""
 msgid "Employee {0} does not belong to the company {1}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:376
+#: erpnext/manufacturing/doctype/job_card/job_card.py:377
 msgid "Employee {0} is currently working on another workstation. Please assign another employee."
 msgstr ""
 
@@ -18658,7 +18641,7 @@ msgstr ""
 msgid "Empty"
 msgstr "Prazno"
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:756
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:757
 msgid "Empty To Delete List"
 msgstr ""
 
@@ -18855,12 +18838,6 @@ msgstr ""
 msgid "Enable discount accounting for selling"
 msgstr ""
 
-#. Description of the 'Delivered by Supplier (Drop Ship)' (Check) field in
-#. DocType 'Item'
-#: erpnext/stock/doctype/item/item.json
-msgid "Enable for drop shipping - supplier delivers directly to the customer without passing through your warehouse."
-msgstr ""
-
 #. Description of the 'Include Item In Manufacturing' (Check) field in DocType
 #. 'Item'
 #: erpnext/stock/doctype/item/item.json
@@ -18989,8 +18966,8 @@ msgstr ""
 #. Label of the end_time (Time) field in DocType 'Stock Reposting Settings'
 #. Label of the end_time (Time) field in DocType 'Service Day'
 #. Label of the end_time (Datetime) field in DocType 'Call Log'
-#: erpnext/manufacturing/doctype/job_card/job_card.js:389
-#: erpnext/manufacturing/doctype/job_card/job_card.js:459
+#: erpnext/manufacturing/doctype/job_card/job_card.js:332
+#: erpnext/manufacturing/doctype/job_card/job_card.js:400
 #: erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
 #: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json
 #: erpnext/support/doctype/service_day/service_day.json
@@ -19089,8 +19066,8 @@ msgstr ""
 msgid "Enter Serial Nos"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:416
-#: erpnext/manufacturing/doctype/job_card/job_card.js:485
+#: erpnext/manufacturing/doctype/job_card/job_card.js:361
+#: erpnext/manufacturing/doctype/job_card/job_card.js:423
 #: erpnext/manufacturing/doctype/workstation/workstation.js:312
 msgid "Enter Value"
 msgstr ""
@@ -19115,7 +19092,7 @@ msgstr ""
 msgid "Enter amount to be redeemed."
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:1146
+#: erpnext/stock/doctype/item/item.js:1133
 msgid "Enter an Item Code, the name will be auto-filled the same as Item Code on clicking inside the Item Name field."
 msgstr ""
 
@@ -19127,7 +19104,7 @@ msgstr ""
 msgid "Enter customer's phone number"
 msgstr ""
 
-#: erpnext/assets/doctype/asset/asset.js:926
+#: erpnext/assets/doctype/asset/asset.js:928
 msgid "Enter date to scrap asset"
 msgstr ""
 
@@ -19170,7 +19147,7 @@ msgstr ""
 msgid "Enter the name of the bank or lending institution before submitting."
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:1172
+#: erpnext/stock/doctype/item/item.js:1159
 msgid "Enter the opening stock units."
 msgstr ""
 
@@ -19178,7 +19155,7 @@ msgstr ""
 msgid "Enter the quantity of the Item that will be manufactured from this Bill of Materials."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1236
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1218
 msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
 msgstr ""
 
@@ -19190,8 +19167,8 @@ msgstr ""
 msgid "Entertainment & Leisure"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:106
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:181
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:110
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:186
 msgid "Entertainment Expenses"
 msgstr ""
 
@@ -19215,8 +19192,8 @@ msgstr ""
 #. Option for the 'Root Type' (Select) field in DocType 'Account Category'
 #. Option for the 'Root Type' (Select) field in DocType 'Ledger Merge'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:189
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:332
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:193
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:337
 #: erpnext/accounts/doctype/account_category/account_category.json
 #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json
 #: erpnext/accounts/report/account_balance/account_balance.js:29
@@ -19277,7 +19254,7 @@ msgstr ""
 msgid "Error while processing deferred accounting for {0}"
 msgstr ""
 
-#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:554
+#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:597
 msgid "Error while reposting item valuation"
 msgstr ""
 
@@ -19352,7 +19329,7 @@ msgstr "Primer: ABCD.#####. Če je serija nastavljena in številka šarže ni om
 msgid "Example: If the transaction amount is 200, then this will be calculated as {} = {}"
 msgstr ""
 
-#: erpnext/stock/stock_ledger.py:2334
+#: erpnext/stock/stock_ledger.py:2300
 msgid "Example: Serial No {0} reserved in {1}."
 msgstr ""
 
@@ -19362,7 +19339,7 @@ msgstr ""
 msgid "Exception Budget Approver Role"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:926
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:47
 msgid "Excess Disassembly"
 msgstr ""
 
@@ -19370,7 +19347,7 @@ msgstr ""
 msgid "Excess Materials Consumed"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1133
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1141
 msgid "Excess Transfer"
 msgstr ""
 
@@ -19401,17 +19378,17 @@ msgstr ""
 #. Invoice Advance'
 #. Label of the exchange_gain_loss (Currency) field in DocType 'Sales Invoice
 #. Advance'
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:131
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:217
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:135
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:222
 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
 #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
 #: erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
-#: erpnext/setup/doctype/company/company.py:673
+#: erpnext/setup/doctype/company/company.py:678
 msgid "Exchange Gain/Loss"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:1777
-#: erpnext/controllers/accounts_controller.py:1862
+#: erpnext/controllers/accounts_controller.py:1778
+#: erpnext/controllers/accounts_controller.py:1863
 msgid "Exchange Gain/Loss amount has been booked through {0}"
 msgstr ""
 
@@ -19550,7 +19527,7 @@ msgstr ""
 msgid "Executive Search"
 msgstr ""
 
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:67
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:79
 msgid "Exempt Supplies"
 msgstr ""
 
@@ -19637,7 +19614,7 @@ msgstr ""
 msgid "Expected Delivery Date"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:419
+#: erpnext/selling/doctype/sales_order/sales_order.py:429
 msgid "Expected Delivery Date should be after Sales Order Date"
 msgstr ""
 
@@ -19721,7 +19698,7 @@ msgstr ""
 msgid "Expense"
 msgstr ""
 
-#: erpnext/controllers/stock_controller.py:947
+#: erpnext/controllers/stock_controller.py:948
 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
 msgstr ""
 
@@ -19799,23 +19776,23 @@ msgstr ""
 msgid "Expense for this item will be recognized over a period of months. Eg: prepaid insurance or annual software license"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:81
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:140
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:85
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:145
 msgid "Expenses"
 msgstr ""
 
-#. Option for the 'Account Type' (Select) field in DocType 'Account'
-#: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:88
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:148
-#: erpnext/accounts/report/account_balance/account_balance.js:49
-msgid "Expenses Included In Asset Valuation"
-msgstr ""
-
 #. Option for the 'Account Type' (Select) field in DocType 'Account'
 #: erpnext/accounts/doctype/account/account.json
 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:92
 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:153
+#: erpnext/accounts/report/account_balance/account_balance.js:49
+msgid "Expenses Included In Asset Valuation"
+msgstr ""
+
+#. Option for the 'Account Type' (Select) field in DocType 'Account'
+#: erpnext/accounts/doctype/account/account.json
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:96
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:158
 #: erpnext/accounts/report/account_balance/account_balance.js:51
 msgid "Expenses Included In Valuation"
 msgstr ""
@@ -19894,7 +19871,7 @@ msgstr ""
 msgid "Extra Consumed Qty"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:263
+#: erpnext/manufacturing/doctype/job_card/job_card.py:264
 msgid "Extra Job Card Quantity"
 msgstr ""
 
@@ -20031,7 +20008,7 @@ msgstr ""
 msgid "Failed to setup defaults"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:855
+#: erpnext/setup/doctype/company/company.py:860
 msgid "Failed to setup defaults for country {0}. Please contact support."
 msgstr ""
 
@@ -20186,21 +20163,29 @@ msgstr ""
 msgid "Field in Bank Transaction"
 msgstr ""
 
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:95
+msgid "Fieldname Conflict"
+msgstr ""
+
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:87
+msgid "Fieldname {0} already exists in the following doctypes: {1}. A separate dimension field will not be added to these doctypes. GL Entries will use the value of the existing field as the dimension value."
+msgstr ""
+
 #. Description of the 'Do not update variants on save' (Check) field in DocType
 #. 'Item Variant Settings'
 #: erpnext/stock/doctype/item_variant_settings/item_variant_settings.json
 msgid "Fields will be copied over only at time of creation."
 msgstr ""
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1068
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1069
 msgid "File does not belong to this Transaction Deletion Record"
 msgstr ""
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1062
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1063
 msgid "File not found"
 msgstr ""
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1076
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1077
 msgid "File not found on server"
 msgstr ""
 
@@ -20408,9 +20393,9 @@ msgstr ""
 msgid "Financial reports will be generated using GL Entry doctypes (should be enabled if Period Closing Voucher is not posted for all years sequentially or missing) "
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:902
-#: erpnext/manufacturing/doctype/work_order/work_order.js:917
-#: erpnext/manufacturing/doctype/work_order/work_order.js:926
+#: erpnext/manufacturing/doctype/work_order/work_order.js:884
+#: erpnext/manufacturing/doctype/work_order/work_order.js:899
+#: erpnext/manufacturing/doctype/work_order/work_order.js:908
 msgid "Finish"
 msgstr ""
 
@@ -20467,15 +20452,15 @@ msgstr ""
 msgid "Finished Good Item Quantity"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4107
+#: erpnext/controllers/accounts_controller.py:4095
 msgid "Finished Good Item is not specified for service item {0}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4124
+#: erpnext/controllers/accounts_controller.py:4112
 msgid "Finished Good Item {0} Qty can not be zero"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4118
+#: erpnext/controllers/accounts_controller.py:4106
 msgid "Finished Good Item {0} must be a sub-contracted item"
 msgstr ""
 
@@ -20521,7 +20506,7 @@ msgid "Finished Good {0} must be a sub-contracted item."
 msgstr ""
 
 #: erpnext/selling/doctype/sales_order/sales_order.js:1475
-#: erpnext/setup/doctype/company/company.py:385
+#: erpnext/setup/doctype/company/company.py:389
 msgid "Finished Goods"
 msgstr ""
 
@@ -20562,7 +20547,7 @@ msgstr ""
 msgid "Finished Goods based Operating Cost"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:862
 msgid "Finished Item {0} does not match with Work Order {1}"
 msgstr ""
 
@@ -20740,8 +20725,8 @@ msgstr ""
 msgid "Fixed Asset item {0} cannot be used in BOMs."
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:43
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:76
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:47
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:81
 msgid "Fixed Assets"
 msgstr ""
 
@@ -20814,7 +20799,7 @@ msgstr ""
 msgid "Following Material Requests have been raised automatically based on Item's re-order level"
 msgstr ""
 
-#: erpnext/selling/doctype/customer/customer.py:843
+#: erpnext/selling/doctype/customer/customer.py:833
 msgid "Following fields are mandatory to create address:"
 msgstr ""
 
@@ -20871,7 +20856,7 @@ msgstr ""
 msgid "For Item"
 msgstr ""
 
-#: erpnext/controllers/stock_controller.py:1606
+#: erpnext/controllers/stock_controller.py:1607
 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
 msgstr ""
 
@@ -20881,7 +20866,7 @@ msgid "For Job Card"
 msgstr ""
 
 #. Label of the for_operation (Link) field in DocType 'Job Card'
-#: erpnext/manufacturing/doctype/job_card/job_card.js:529
+#: erpnext/manufacturing/doctype/job_card/job_card.js:465
 #: erpnext/manufacturing/doctype/job_card/job_card.json
 msgid "For Operation"
 msgstr ""
@@ -20902,17 +20887,13 @@ msgstr ""
 msgid "For Production"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:893
-msgid "For Quantity (Manufactured Qty) is mandatory"
-msgstr ""
-
 #. Label of the material_request_planning (Section Break) field in DocType
 #. 'Production Plan'
 #: erpnext/manufacturing/doctype/production_plan/production_plan.json
 msgid "For Raw Materials"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:1442
+#: erpnext/controllers/accounts_controller.py:1443
 msgid "For Return Invoices with Stock effect, '0' qty Items are not allowed. Following rows are affected: {0}"
 msgstr ""
 
@@ -20996,7 +20977,7 @@ msgstr ""
 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2653
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2651
 msgid "For operation {0}: Quantity ({1}) can not be greater than pending quantity({2})"
 msgstr ""
 
@@ -21013,7 +20994,7 @@ msgstr ""
 msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:894
 msgid "For quantity {0} should not be greater than allowed quantity {1}"
 msgstr ""
 
@@ -21027,7 +21008,7 @@ msgstr ""
 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1726
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1728
 msgid "For row {0}: Enter Planned Qty"
 msgstr ""
 
@@ -21046,7 +21027,7 @@ msgstr ""
 msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:773
 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}."
 msgstr ""
 
@@ -21093,11 +21074,6 @@ msgstr ""
 msgid "Forecast Demand"
 msgstr ""
 
-#. Label of the forecast_qty (Float) field in DocType 'Sales Forecast Item'
-#: erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.json
-msgid "Forecast Qty"
-msgstr ""
-
 #. Label of a Workspace Sidebar Item
 #: erpnext/workspace_sidebar/manufacturing.json
 msgid "Forecasting"
@@ -21143,7 +21119,7 @@ msgstr ""
 msgid "Forum URL"
 msgstr ""
 
-#: erpnext/setup/install.py:210
+#: erpnext/setup/install.py:242
 msgid "Frappe School"
 msgstr ""
 
@@ -21188,8 +21164,8 @@ msgstr ""
 msgid "Freeze Stocks Older Than (Days)"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:107
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:185
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:111
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:190
 msgid "Freight and Forwarding Charges"
 msgstr ""
 
@@ -21623,8 +21599,8 @@ msgstr ""
 msgid "Furlong"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:52
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:87
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:56
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:92
 msgid "Furniture and Fixtures"
 msgstr ""
 
@@ -21641,13 +21617,13 @@ msgid "Further nodes can be only created under 'Group' type nodes"
 msgstr ""
 
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:188
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1288
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1211
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:179
 msgid "Future Payment Amount"
 msgstr ""
 
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:187
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1287
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1210
 msgid "Future Payment Ref"
 msgstr ""
 
@@ -21740,9 +21716,9 @@ msgstr ""
 msgid "Gain/Loss from Revaluation"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:134
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:220
-#: erpnext/setup/doctype/company/company.py:681
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:138
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:225
+#: erpnext/setup/doctype/company/company.py:686
 msgid "Gain/Loss on Asset Disposal"
 msgstr ""
 
@@ -22186,7 +22162,7 @@ msgstr ""
 msgid "Goods"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:386
+#: erpnext/setup/doctype/company/company.py:390
 #: erpnext/stock/doctype/stock_entry/stock_entry_list.js:21
 msgid "Goods In Transit"
 msgstr ""
@@ -22195,7 +22171,7 @@ msgstr ""
 msgid "Goods Transferred"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1379
 msgid "Goods are already received against the outward entry {0}"
 msgstr ""
 
@@ -22821,7 +22797,7 @@ msgstr ""
 msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
 msgstr ""
 
-#: erpnext/stock/stock_ledger.py:2056
+#: erpnext/stock/stock_ledger.py:2022
 msgid "Here are the options to proceed:"
 msgstr ""
 
@@ -22849,7 +22825,7 @@ msgstr ""
 msgid "Hertz"
 msgstr ""
 
-#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:556
+#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:599
 msgid "Hi,"
 msgstr ""
 
@@ -23048,7 +23024,7 @@ msgstr ""
 msgid "Hrs"
 msgstr "Ure"
 
-#: erpnext/setup/doctype/company/company.py:492
+#: erpnext/setup/doctype/company/company.py:496
 msgid "Human Resources"
 msgstr ""
 
@@ -23216,6 +23192,12 @@ msgstr ""
 msgid "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount"
 msgstr ""
 
+#. Description of the 'Delivered by Supplier (Drop Ship)' (Check) field in
+#. DocType 'Item'
+#: erpnext/stock/doctype/item/item.json
+msgid "If checked, this item is treated as drop-shipped by default in Sales Orders, Sales Invoices and Purchase Orders. The flag can be overridden on each transaction line."
+msgstr ""
+
 #: erpnext/public/js/setup_wizard.js:56
 msgid "If checked, we will create demo data for you to explore the system. This demo data can be erased later."
 msgstr ""
@@ -23433,7 +23415,7 @@ msgstr ""
 msgid "If no taxes are set, and Taxes and Charges Template is selected, the system will automatically apply the taxes from the chosen template."
 msgstr ""
 
-#: erpnext/stock/stock_ledger.py:2066
+#: erpnext/stock/stock_ledger.py:2032
 msgid "If not, you can Cancel / Submit this entry"
 msgstr ""
 
@@ -23465,7 +23447,7 @@ msgstr ""
 msgid "If set, the system does not use the user's Email or the standard outgoing Email account for sending request for quotations."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1269
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1251
 msgid "If the BOM results in Scrap material, the Scrap Warehouse needs to be selected."
 msgstr ""
 
@@ -23474,7 +23456,7 @@ msgstr ""
 msgid "If the account is frozen, entries are allowed to restricted users."
 msgstr ""
 
-#: erpnext/stock/stock_ledger.py:2059
+#: erpnext/stock/stock_ledger.py:2025
 msgid "If the item is transacting as a Zero Valuation Rate item in this entry, please enable 'Allow Zero Valuation Rate' in the {0} Item table."
 msgstr ""
 
@@ -23484,7 +23466,7 @@ msgstr ""
 msgid "If the reorder check is set at the Group warehouse level, the available quantity becomes the sum of the projected quantities of all its child warehouses."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1288
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1270
 msgid "If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed."
 msgstr ""
 
@@ -23561,7 +23543,7 @@ msgstr ""
 msgid "If yes, then this warehouse will be used to store rejected materials"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:1158
+#: erpnext/stock/doctype/item/item.js:1145
 msgid "If you are maintaining stock of this Item in your Inventory, ERPNext will make a stock ledger entry for each transaction of this item."
 msgstr ""
 
@@ -23575,7 +23557,7 @@ msgstr ""
 msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1844
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1846
 msgid "If you still want to proceed, please enable {0}."
 msgstr ""
 
@@ -23659,7 +23641,7 @@ msgstr ""
 msgid "Ignore Existing Ordered Qty"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1836
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1838
 msgid "Ignore Existing Projected Quantity"
 msgstr ""
 
@@ -23750,8 +23732,8 @@ msgstr ""
 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}."
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:135
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:229
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:139
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:234
 msgid "Impairment"
 msgstr ""
 
@@ -24033,7 +24015,7 @@ msgstr ""
 msgid "In this case, the amount will be calculated as 25% of the transaction amount. If the transaction amount is 200, then this will be calculated as 200 * 0.25 = 50."
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:1191
+#: erpnext/stock/doctype/item/item.js:1178
 msgid "In this section, you can define Company-wide transaction-related defaults for this Item. Eg. Default Warehouse, Default Price List, Supplier, etc."
 msgstr ""
 
@@ -24264,8 +24246,8 @@ msgstr ""
 #. Option for the 'Type' (Select) field in DocType 'Process Deferred
 #. Accounting'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:140
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:236
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:144
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:241
 #: erpnext/accounts/doctype/account_category/account_category.json
 #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json
 #: erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json
@@ -24376,7 +24358,7 @@ msgstr ""
 msgid "Incorrect Company"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:780
 msgid "Incorrect Component Quantity"
 msgstr ""
 
@@ -24510,15 +24492,15 @@ msgstr ""
 msgid "Indirect Expense"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:102
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:167
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:106
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:172
 msgid "Indirect Expenses"
 msgstr ""
 
 #. Option for the 'Account Type' (Select) field in DocType 'Account'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:145
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:242
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:149
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:247
 msgid "Indirect Income"
 msgstr ""
 
@@ -24586,14 +24568,14 @@ msgstr ""
 msgid "Inspected By"
 msgstr ""
 
-#: erpnext/controllers/stock_controller.py:1500
-#: erpnext/manufacturing/doctype/job_card/job_card.py:833
+#: erpnext/controllers/stock_controller.py:1501
+#: erpnext/manufacturing/doctype/job_card/job_card.py:834
 msgid "Inspection Rejected"
 msgstr ""
 
 #. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1470
-#: erpnext/controllers/stock_controller.py:1472
+#: erpnext/controllers/stock_controller.py:1471
+#: erpnext/controllers/stock_controller.py:1473
 #: erpnext/stock/doctype/stock_entry/stock_entry.json
 msgid "Inspection Required"
 msgstr ""
@@ -24610,8 +24592,8 @@ msgstr ""
 msgid "Inspection Required before Purchase"
 msgstr ""
 
-#: erpnext/controllers/stock_controller.py:1485
-#: erpnext/manufacturing/doctype/job_card/job_card.py:814
+#: erpnext/controllers/stock_controller.py:1486
+#: erpnext/manufacturing/doctype/job_card/job_card.py:815
 msgid "Inspection Submission"
 msgstr ""
 
@@ -24641,7 +24623,7 @@ msgstr ""
 msgid "Installation Note Item"
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:643
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:684
 msgid "Installation Note {0} has already been submitted"
 msgstr ""
 
@@ -24680,11 +24662,11 @@ msgstr ""
 msgid "Insufficient Capacity"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4008
-#: erpnext/controllers/accounts_controller.py:4032
-#: erpnext/controllers/accounts_controller.py:4441
-#: erpnext/controllers/accounts_controller.py:4447
-#: erpnext/controllers/accounts_controller.py:4469
+#: erpnext/controllers/accounts_controller.py:4014
+#: erpnext/controllers/accounts_controller.py:4038
+#: erpnext/controllers/accounts_controller.py:4429
+#: erpnext/controllers/accounts_controller.py:4435
+#: erpnext/controllers/accounts_controller.py:4457
 msgid "Insufficient Permissions"
 msgstr ""
 
@@ -24692,13 +24674,12 @@ msgstr ""
 #: erpnext/stock/doctype/pick_list/pick_list.py:147
 #: erpnext/stock/doctype/pick_list/pick_list.py:165
 #: erpnext/stock/doctype/pick_list/pick_list.py:1092
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043
-#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747
-#: erpnext/stock/stock_ledger.py:2225
+#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1713
+#: erpnext/stock/stock_ledger.py:2191
 msgid "Insufficient Stock"
 msgstr ""
 
-#: erpnext/stock/stock_ledger.py:2240
+#: erpnext/stock/stock_ledger.py:2206
 msgid "Insufficient Stock for Batch"
 msgstr ""
 
@@ -24818,13 +24799,13 @@ msgstr ""
 msgid "Interest"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:132
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:218
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:136
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:223
 msgid "Interest Expense"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:146
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:243
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:150
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:248
 msgid "Interest Income"
 msgstr ""
 
@@ -24832,8 +24813,8 @@ msgstr ""
 msgid "Interest and/or dunning fee"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:147
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:244
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:151
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:249
 msgid "Interest on Fixed Deposits"
 msgstr ""
 
@@ -24853,7 +24834,7 @@ msgstr ""
 msgid "Internal Customer Accounting"
 msgstr ""
 
-#: erpnext/selling/doctype/customer/customer.py:256
+#: erpnext/selling/doctype/customer/customer.py:246
 msgid "Internal Customer for company {0} already exists"
 msgstr ""
 
@@ -24861,7 +24842,7 @@ msgstr ""
 msgid "Internal Purchase Order"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:804
+#: erpnext/controllers/accounts_controller.py:805
 msgid "Internal Sale or Delivery Reference missing."
 msgstr ""
 
@@ -24869,7 +24850,7 @@ msgstr ""
 msgid "Internal Sales Order"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:806
+#: erpnext/controllers/accounts_controller.py:807
 msgid "Internal Sales Reference Missing"
 msgstr ""
 
@@ -24900,7 +24881,7 @@ msgstr ""
 msgid "Internal Transfer"
 msgstr "Notranji Prenos"
 
-#: erpnext/controllers/accounts_controller.py:815
+#: erpnext/controllers/accounts_controller.py:816
 msgid "Internal Transfer Reference Missing"
 msgstr ""
 
@@ -24913,7 +24894,7 @@ msgstr ""
 msgid "Internal Work History"
 msgstr ""
 
-#: erpnext/controllers/stock_controller.py:1567
+#: erpnext/controllers/stock_controller.py:1568
 msgid "Internal transfers can only be done in company's default currency"
 msgstr ""
 
@@ -24933,8 +24914,8 @@ msgstr ""
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1029
 #: erpnext/assets/doctype/asset_category/asset_category.py:69
 #: erpnext/assets/doctype/asset_category/asset_category.py:97
-#: erpnext/controllers/accounts_controller.py:3225
-#: erpnext/controllers/accounts_controller.py:3233
+#: erpnext/controllers/accounts_controller.py:3219
+#: erpnext/controllers/accounts_controller.py:3227
 msgid "Invalid Account"
 msgstr ""
 
@@ -24955,7 +24936,7 @@ msgstr ""
 msgid "Invalid Attribute"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:626
+#: erpnext/controllers/accounts_controller.py:627
 msgid "Invalid Auto Repeat Date"
 msgstr ""
 
@@ -24968,7 +24949,7 @@ msgstr ""
 msgid "Invalid Barcode. There is no Item attached to this barcode."
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:3132
+#: erpnext/public/js/controllers/transaction.js:3134
 msgid "Invalid Blanket Order for the selected Customer and Item"
 msgstr ""
 
@@ -24984,21 +24965,21 @@ msgstr ""
 msgid "Invalid Company Field"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2355
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2436
 msgid "Invalid Company for Inter Company Transaction."
 msgstr ""
 
 #: erpnext/assets/doctype/asset/asset.py:362
 #: erpnext/assets/doctype/asset/asset.py:369
-#: erpnext/controllers/accounts_controller.py:3248
+#: erpnext/controllers/accounts_controller.py:3242
 msgid "Invalid Cost Center"
 msgstr ""
 
-#: erpnext/selling/doctype/customer/customer.py:369
+#: erpnext/selling/doctype/customer/customer.py:359
 msgid "Invalid Customer Group"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:421
+#: erpnext/selling/doctype/sales_order/sales_order.py:431
 msgid "Invalid Delivery Date"
 msgstr ""
 
@@ -25058,7 +25039,7 @@ msgstr ""
 msgid "Invalid POS Invoices"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:387
+#: erpnext/accounts/doctype/account/account.py:388
 msgid "Invalid Parent Account"
 msgstr ""
 
@@ -25092,12 +25073,12 @@ msgstr ""
 msgid "Invalid Purchase Invoice"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4045
-#: erpnext/controllers/accounts_controller.py:4059
+#: erpnext/controllers/accounts_controller.py:4051
+#: erpnext/controllers/accounts_controller.py:4065
 msgid "Invalid Qty"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:1460
+#: erpnext/controllers/accounts_controller.py:1461
 msgid "Invalid Quantity"
 msgstr ""
 
@@ -25122,12 +25103,12 @@ msgstr ""
 msgid "Invalid Selling Price"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:937
 msgid "Invalid Serial and Batch Bundle"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:43
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:65
 msgid "Invalid Source and Target Warehouse"
 msgstr ""
 
@@ -25152,7 +25133,7 @@ msgstr ""
 msgid "Invalid condition expression"
 msgstr ""
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1057
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1058
 msgid "Invalid file URL"
 msgstr ""
 
@@ -25199,7 +25180,7 @@ msgstr ""
 msgid "Invalid {0}"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2353
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2434
 msgid "Invalid {0} for Inter Company Transaction."
 msgstr ""
 
@@ -25209,7 +25190,7 @@ msgid "Invalid {0}: {1}"
 msgstr ""
 
 #. Label of the inventory_section (Tab Break) field in DocType 'Item'
-#: erpnext/setup/install.py:385 erpnext/stock/doctype/item/item.json
+#: erpnext/setup/install.py:417 erpnext/stock/doctype/item/item.json
 msgid "Inventory"
 msgstr ""
 
@@ -25258,8 +25239,8 @@ msgstr ""
 msgid "Investment Banking"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:72
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:124
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:76
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:129
 msgid "Investments"
 msgstr ""
 
@@ -25309,7 +25290,7 @@ msgstr ""
 msgid "Invoice Document Type Selection Error"
 msgstr ""
 
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1268
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1191
 msgid "Invoice Grand Total"
 msgstr ""
 
@@ -25414,7 +25395,7 @@ msgstr ""
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:171
 #: erpnext/accounts/report/accounts_payable/accounts_payable.html:139
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:140
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1270
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1193
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:166
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:194
 msgid "Invoiced Amount"
@@ -25435,7 +25416,7 @@ msgstr "Fakturirana Količina"
 #: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
 #: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2404
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2485
 #: erpnext/buying/doctype/supplier/supplier.json
 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
 msgid "Invoices"
@@ -25531,8 +25512,7 @@ msgstr ""
 msgid "Is Billable"
 msgstr "Je plačljivo"
 
-#. Label of the is_billing_contact (Check) field in DocType 'Contact'
-#: erpnext/erpnext_integrations/custom/contact.json
+#: erpnext/setup/install.py:170
 msgid "Is Billing Contact"
 msgstr "Je Faktura Kontakt"
 
@@ -25974,8 +25954,7 @@ msgstr ""
 msgid "Is Transporter"
 msgstr ""
 
-#. Label of the is_your_company_address (Check) field in DocType 'Address'
-#: erpnext/accounts/custom/address.json
+#: erpnext/setup/install.py:161
 msgid "Is Your Company Address"
 msgstr ""
 
@@ -26081,7 +26060,7 @@ msgstr ""
 #. Description of the 'Is Rate Adjustment Entry (Debit Note)' (Check) field in
 #. DocType 'Sales Invoice'
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-msgid "Issue a debit note with 0 qty against an existing Sales Invoice"
+msgid "Issue a debit note against an existing Sales Invoice to adjust the rate. The quantity will be retained from the original invoice."
 msgstr ""
 
 #. Option for the 'Current State' (Select) field in DocType 'Share Balance'
@@ -26116,7 +26095,7 @@ msgstr ""
 msgid "It can take upto few hours for accurate stock values to be visible after merging items."
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:2533
+#: erpnext/public/js/controllers/transaction.js:2535
 msgid "It is needed to fetch Item Details."
 msgstr ""
 
@@ -26488,7 +26467,7 @@ msgstr ""
 #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:86
 #: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:119
 #: erpnext/projects/doctype/timesheet/timesheet.js:214
-#: erpnext/public/js/controllers/transaction.js:2827
+#: erpnext/public/js/controllers/transaction.js:2829
 #: erpnext/public/js/stock_reservation.js:112
 #: erpnext/public/js/stock_reservation.js:318 erpnext/public/js/utils.js:579
 #: erpnext/public/js/utils.js:736
@@ -26550,7 +26529,7 @@ msgstr ""
 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:8
 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:433
 #: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:7
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:138
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:126
 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:104
 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:25
 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:26
@@ -26749,7 +26728,7 @@ msgstr ""
 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:55
 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:37
 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:99
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:148
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:136
 #: erpnext/stock/report/stock_analytics/stock_analytics.js:8
 #: erpnext/stock/report/stock_analytics/stock_analytics.py:52
 #: erpnext/stock/report/stock_balance/stock_balance.js:32
@@ -26972,7 +26951,7 @@ msgstr ""
 #: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:371
 #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:92
 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:138
-#: erpnext/public/js/controllers/transaction.js:2833
+#: erpnext/public/js/controllers/transaction.js:2835
 #: erpnext/public/js/utils.js:826
 #: erpnext/selling/doctype/quotation_item/quotation_item.json
 #: erpnext/selling/doctype/sales_order/sales_order.js:1324
@@ -27012,7 +26991,7 @@ msgstr ""
 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54
 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133
 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:145
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:133
 #: erpnext/stock/report/stock_analytics/stock_analytics.py:45
 #: erpnext/stock/report/stock_balance/stock_balance.py:480
 #: erpnext/stock/report/stock_ledger/stock_ledger.py:292
@@ -27056,10 +27035,6 @@ msgstr ""
 msgid "Item Price"
 msgstr ""
 
-#: erpnext/stock/get_item_details.py:1136
-msgid "Item Price Added for {0} in Price List {1}"
-msgstr ""
-
 #. Label of the item_price_settings_section (Section Break) field in DocType
 #. 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -27075,8 +27050,9 @@ msgstr ""
 msgid "Item Price Stock"
 msgstr ""
 
-#: erpnext/stock/get_item_details.py:1160
-msgid "Item Price added for {0} in Price List {1}"
+#: erpnext/stock/get_item_details.py:1155
+#: erpnext/stock/get_item_details.py:1179
+msgid "Item Price added for {0} in Price List - {1}"
 msgstr ""
 
 #: erpnext/stock/doctype/item_price/item_price.py:140
@@ -27087,7 +27063,7 @@ msgstr ""
 msgid "Item Price created at rate {0}"
 msgstr ""
 
-#: erpnext/stock/get_item_details.py:1119
+#: erpnext/stock/get_item_details.py:1138
 msgid "Item Price updated for {0} in Price List {1}"
 msgstr ""
 
@@ -27274,7 +27250,7 @@ msgstr ""
 msgid "Item Variant Settings"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:1007
+#: erpnext/stock/doctype/item/item.js:994
 msgid "Item Variant {0} already exists with same attributes"
 msgstr ""
 
@@ -27379,7 +27355,7 @@ msgstr ""
 msgid "Item and Warranty Details"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:297
 msgid "Item for row {0} does not match Material Request"
 msgstr ""
 
@@ -27409,11 +27385,7 @@ msgstr ""
 msgid "Item operation"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4099
-msgid "Item qty can not be updated as raw materials are already processed."
-msgstr ""
-
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:605
 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}"
 msgstr ""
 
@@ -27436,7 +27408,7 @@ msgstr ""
 msgid "Item variant {0} exists with same attributes"
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:564
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:563
 msgid "Item with name {0} not found in the Purchase Order"
 msgstr ""
 
@@ -27465,7 +27437,7 @@ msgstr ""
 msgid "Item {0} does not exist."
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:855
+#: erpnext/controllers/selling_controller.py:856
 msgid "Item {0} entered multiple times."
 msgstr ""
 
@@ -27477,11 +27449,11 @@ msgstr ""
 msgid "Item {0} has been disabled"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:790
+#: erpnext/selling/doctype/sales_order/sales_order.py:793
 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No"
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:583
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:582
 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity."
 msgstr ""
 
@@ -27505,7 +27477,7 @@ msgstr ""
 msgid "Item {0} is disabled"
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:569
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:568
 msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated."
 msgstr ""
 
@@ -27525,7 +27497,7 @@ msgstr ""
 msgid "Item {0} is not a template item."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1302
 msgid "Item {0} is not active or end of life has been reached"
 msgstr ""
 
@@ -27541,7 +27513,7 @@ msgstr ""
 msgid "Item {0} must be a non-stock item"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py:59
 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}"
 msgstr ""
 
@@ -27557,7 +27529,7 @@ msgstr ""
 msgid "Item {0}: {1} qty produced. "
 msgstr ""
 
-#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462
+#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1384
 msgid "Item {} does not exist."
 msgstr ""
 
@@ -27603,7 +27575,7 @@ msgstr ""
 msgid "Item-wise sales Register"
 msgstr ""
 
-#: erpnext/stock/get_item_details.py:724
+#: erpnext/stock/get_item_details.py:743
 msgid "Item/Item Code required to get Item Tax Template."
 msgstr ""
 
@@ -27627,7 +27599,7 @@ msgstr ""
 msgid "Items Filter"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1688
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1690
 #: erpnext/selling/doctype/sales_order/sales_order.js:1757
 msgid "Items Required"
 msgstr ""
@@ -27651,11 +27623,11 @@ msgstr ""
 msgid "Items and Pricing"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4255
+#: erpnext/controllers/accounts_controller.py:4243
 msgid "Items cannot be updated as Subcontracting Inward Order(s) exist against this Subcontracted Sales Order."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4248
+#: erpnext/controllers/accounts_controller.py:4236
 msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}."
 msgstr ""
 
@@ -27667,7 +27639,7 @@ msgstr ""
 msgid "Items not found."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:601
 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}"
 msgstr ""
 
@@ -27677,7 +27649,7 @@ msgstr ""
 msgid "Items to Be Repost"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1687
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1689
 msgid "Items to Manufacture are required to pull the Raw Materials associated with it."
 msgstr ""
 
@@ -27742,9 +27714,9 @@ msgstr ""
 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
 #: erpnext/manufacturing/doctype/bom/bom.json
 #: erpnext/manufacturing/doctype/job_card/job_card.json
-#: erpnext/manufacturing/doctype/job_card/job_card.py:998
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1004
 #: erpnext/manufacturing/doctype/operation/operation.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:415
+#: erpnext/manufacturing/doctype/work_order/work_order.js:396
 #: erpnext/manufacturing/doctype/work_order/work_order.json
 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:29
 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:86
@@ -27806,7 +27778,7 @@ msgstr ""
 msgid "Job Card and Capacity Planning"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1474
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1491
 msgid "Job Card {0} has been completed"
 msgstr ""
 
@@ -27882,7 +27854,7 @@ msgstr ""
 msgid "Job Worker Warehouse"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2708
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2706
 msgid "Job card {0} created"
 msgstr ""
 
@@ -28102,7 +28074,7 @@ msgstr ""
 msgid "Kilowatt-Hour"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1000
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1006
 msgid "Kindly cancel the Manufacturing Entries first against the work order {0}."
 msgstr ""
 
@@ -28230,7 +28202,7 @@ msgstr ""
 msgid "Last Fiscal Year"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:660
+#: erpnext/accounts/doctype/account/account.py:661
 msgid "Last GL Entry update was done {}. This operation is not allowed while system is actively being used. Please wait for 5 minutes before retrying."
 msgstr ""
 
@@ -28312,7 +28284,7 @@ msgstr ""
 msgid "Last transacted"
 msgstr ""
 
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:185
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:173
 msgid "Latest"
 msgstr ""
 
@@ -28562,12 +28534,12 @@ msgstr ""
 msgid "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization."
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:111
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:190
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:115
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:195
 msgid "Legal Expenses"
 msgstr ""
 
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:19
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:31
 msgid "Legend"
 msgstr ""
 
@@ -28790,8 +28762,8 @@ msgstr ""
 msgid "Loan Start Date and Loan Period are mandatory to save the Invoice Discounting"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:176
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:300
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:180
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:305
 msgid "Loans (Liabilities)"
 msgstr ""
 
@@ -28836,8 +28808,8 @@ msgstr ""
 msgid "Logo"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:183
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:318
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:187
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:323
 msgid "Long-term Provisions"
 msgstr ""
 
@@ -29081,10 +29053,10 @@ msgstr "Okvara Stroja"
 msgid "Machine operator errors"
 msgstr "Napake Upravljavca Stroja"
 
-#: erpnext/setup/doctype/company/company.py:719
-#: erpnext/setup/doctype/company/company.py:734
-#: erpnext/setup/doctype/company/company.py:735
-#: erpnext/setup/doctype/company/company.py:736
+#: erpnext/setup/doctype/company/company.py:724
+#: erpnext/setup/doctype/company/company.py:739
+#: erpnext/setup/doctype/company/company.py:740
+#: erpnext/setup/doctype/company/company.py:741
 msgid "Main"
 msgstr ""
 
@@ -29327,9 +29299,9 @@ msgstr ""
 
 #. Label of the make (Data) field in DocType 'Vehicle'
 #: erpnext/accounts/doctype/journal_entry/journal_entry.js:127
-#: erpnext/manufacturing/doctype/job_card/job_card.js:550
-#: erpnext/manufacturing/doctype/work_order/work_order.js:857
-#: erpnext/manufacturing/doctype/work_order/work_order.js:891
+#: erpnext/manufacturing/doctype/job_card/job_card.js:480
+#: erpnext/manufacturing/doctype/work_order/work_order.js:839
+#: erpnext/manufacturing/doctype/work_order/work_order.js:873
 #: erpnext/setup/doctype/vehicle/vehicle.json
 msgid "Make"
 msgstr "Znamka"
@@ -29349,7 +29321,7 @@ msgstr ""
 msgid "Make Difference Entry"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:696
+#: erpnext/stock/doctype/item/item.js:683
 msgid "Make Lead Time"
 msgstr ""
 
@@ -29387,12 +29359,12 @@ msgstr ""
 msgid "Make Serial No / Batch from Work Order"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:109
+#: erpnext/manufacturing/doctype/job_card/job_card.js:106
 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:256
 msgid "Make Stock Entry"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:424
+#: erpnext/manufacturing/doctype/job_card/job_card.js:369
 msgid "Make Subcontracting PO"
 msgstr ""
 
@@ -29408,11 +29380,11 @@ msgstr ""
 msgid "Make project from a template."
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:804
+#: erpnext/stock/doctype/item/item.js:791
 msgid "Make {0} Variant"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:806
+#: erpnext/stock/doctype/item/item.js:793
 msgid "Make {0} Variants"
 msgstr ""
 
@@ -29420,8 +29392,8 @@ msgstr ""
 msgid "Making Journal Entries against advance accounts: {0} is not recommended. These Journals won't be available for Reconciliation."
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.js:161
-#: erpnext/setup/doctype/company/company.js:172
+#: erpnext/setup/doctype/company/company.js:177
+#: erpnext/setup/doctype/company/company.js:188
 msgid "Manage"
 msgstr ""
 
@@ -29440,7 +29412,7 @@ msgstr ""
 msgid "Manage your orders"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:498
+#: erpnext/setup/doctype/company/company.py:502
 msgid "Management"
 msgstr ""
 
@@ -29456,7 +29428,7 @@ msgstr ""
 msgid "Mandatory Accounting Dimension"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1881
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1962
 msgid "Mandatory Field"
 msgstr ""
 
@@ -29555,8 +29527,8 @@ msgstr ""
 #: erpnext/stock/doctype/material_request_item/material_request_item.json
 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
 #: erpnext/stock/doctype/stock_entry/stock_entry.json
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:696
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:713
 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json
 #: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
 #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -29660,7 +29632,7 @@ msgstr ""
 #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
 #: erpnext/selling/doctype/sales_order/sales_order_dashboard.py:29
-#: erpnext/setup/doctype/company/company.json erpnext/setup/install.py:390
+#: erpnext/setup/doctype/company/company.json erpnext/setup/install.py:422
 #: erpnext/setup/setup_wizard/data/industry_type.txt:31
 #: erpnext/stock/doctype/batch/batch.json erpnext/stock/doctype/item/item.json
 #: erpnext/stock/doctype/item_lead_time/item_lead_time.json
@@ -29705,10 +29677,6 @@ msgstr ""
 msgid "Manufacturing Manager"
 msgstr "Vodja Proizvodnje"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569
-msgid "Manufacturing Quantity is mandatory"
-msgstr "Proizvodnja Količina je obvezna"
-
 #. Label of the manufacturing_section_section (Section Break) field in DocType
 #. 'Sales Order Item'
 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -29889,12 +29857,12 @@ msgstr ""
 msgid "Market Segment"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:450
+#: erpnext/setup/doctype/company/company.py:454
 msgid "Marketing"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:112
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:191
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:116
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:196
 msgid "Marketing Expenses"
 msgstr ""
 
@@ -29973,7 +29941,7 @@ msgstr ""
 msgid "Material"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:882
+#: erpnext/manufacturing/doctype/work_order/work_order.js:864
 msgid "Material Consumption"
 msgstr ""
 
@@ -29981,7 +29949,7 @@ msgstr ""
 #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type'
 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114
 #: erpnext/stock/doctype/stock_entry/stock_entry.json
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:697
 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json
 msgid "Material Consumption for Manufacture"
 msgstr ""
@@ -30062,7 +30030,7 @@ msgstr ""
 #: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:33
 #: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:184
 #: erpnext/buying/workspace/buying/buying.json
-#: erpnext/manufacturing/doctype/job_card/job_card.js:166
+#: erpnext/manufacturing/doctype/job_card/job_card.js:214
 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:159
 #: erpnext/manufacturing/doctype/production_plan/production_plan.json
 #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
@@ -30159,11 +30127,11 @@ msgstr ""
 msgid "Material Request Type"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:1158
+#: erpnext/selling/doctype/sales_order/sales_order.py:1171
 msgid "Material Request already created for the ordered quantity"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:1969
+#: erpnext/selling/doctype/sales_order/sales_order.py:1991
 msgid "Material Request not created, as quantity for Raw Materials already available."
 msgstr ""
 
@@ -30231,7 +30199,7 @@ msgstr ""
 #. Option for the 'Purpose' (Select) field in DocType 'Pick List'
 #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry'
 #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type'
-#: erpnext/manufacturing/doctype/job_card/job_card.js:180
+#: erpnext/manufacturing/doctype/job_card/job_card.js:225
 #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:83
 #: erpnext/stock/doctype/item/item.json
@@ -30297,12 +30265,12 @@ msgstr ""
 msgid "Materials To Be Transferred"
 msgstr ""
 
-#: erpnext/controllers/subcontracting_controller.py:1543
+#: erpnext/controllers/subcontracting_controller.py:1545
 msgid "Materials are already received against the {0} {1}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:184
-#: erpnext/manufacturing/doctype/job_card/job_card.py:854
+#: erpnext/manufacturing/doctype/job_card/job_card.py:185
+#: erpnext/manufacturing/doctype/job_card/job_card.py:855
 msgid "Materials needs to be transferred to the work in progress warehouse for the job card {0}"
 msgstr ""
 
@@ -30373,9 +30341,9 @@ msgstr ""
 msgid "Max discount allowed for item: {0} is {1}%"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1058
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1065
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1088
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1040
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1047
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1070
 #: erpnext/stock/doctype/pick_list/pick_list.js:203
 #: erpnext/stock/doctype/stock_entry/stock_entry.js:382
 msgid "Max: {0}"
@@ -30407,11 +30375,11 @@ msgstr ""
 msgid "Maximum Producible Items"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:1049
 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:1038
 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}."
 msgstr ""
 
@@ -30472,7 +30440,7 @@ msgstr ""
 msgid "Megawatt"
 msgstr ""
 
-#: erpnext/stock/stock_ledger.py:2072
+#: erpnext/stock/stock_ledger.py:2038
 msgid "Mention Valuation Rate in the Item master."
 msgstr ""
 
@@ -30530,7 +30498,7 @@ msgstr ""
 msgid "Merged"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:603
+#: erpnext/accounts/doctype/account/account.py:604
 msgid "Merging is only possible if following properties are same in both records. Is Group, Root Type, Company and Account Currency"
 msgstr ""
 
@@ -30560,7 +30528,7 @@ msgstr ""
 msgid "Messages greater than 160 characters will be split into multiple messages"
 msgstr ""
 
-#: erpnext/setup/install.py:137
+#: erpnext/setup/install.py:138
 msgid "Messaging CRM Campaign"
 msgstr ""
 
@@ -30761,7 +30729,7 @@ msgstr ""
 msgid "Min Qty should be greater than Recurse Over Qty"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:958
+#: erpnext/stock/doctype/item/item.js:945
 msgid "Min Value: {0}, Max Value: {1}, in Increments of: {2}"
 msgstr ""
 
@@ -30850,8 +30818,8 @@ msgstr ""
 msgid "Miscellaneous"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:116
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:224
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:120
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:229
 msgid "Miscellaneous Expenses"
 msgstr ""
 
@@ -30859,15 +30827,15 @@ msgstr ""
 msgid "Mismatch"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463
+#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1385
 msgid "Missing"
 msgstr ""
 
 #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:97
 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:201
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:594
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2421
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3029
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2502
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3110
 #: erpnext/assets/doctype/asset_category/asset_category.py:126
 msgid "Missing Account"
 msgstr ""
@@ -30897,7 +30865,7 @@ msgstr ""
 msgid "Missing Finance Book"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:872
 msgid "Missing Finished Good"
 msgstr ""
 
@@ -30905,7 +30873,7 @@ msgstr ""
 msgid "Missing Formula"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:787
 msgid "Missing Item"
 msgstr ""
 
@@ -30942,7 +30910,7 @@ msgid "Missing required filter: {0}"
 msgstr ""
 
 #: erpnext/manufacturing/doctype/bom/bom.py:1228
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1498
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1499
 msgid "Missing value"
 msgstr ""
 
@@ -31191,7 +31159,7 @@ msgstr ""
 msgid "Multiple Accounts (Journal Template)"
 msgstr ""
 
-#: erpnext/selling/doctype/customer/customer.py:440
+#: erpnext/selling/doctype/customer/customer.py:430
 msgid "Multiple Loyalty Programs found for Customer {}. Please select manually."
 msgstr ""
 
@@ -31217,11 +31185,11 @@ msgstr ""
 msgid "Multiple company fields available: {0}. Please select manually."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:1306
+#: erpnext/controllers/accounts_controller.py:1307
 msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:879
 msgid "Multiple items cannot be marked as finished item"
 msgstr ""
 
@@ -31230,7 +31198,7 @@ msgid "Music"
 msgstr ""
 
 #. Label of the must_be_whole_number (Check) field in DocType 'UOM'
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1445
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1446
 #: erpnext/setup/doctype/uom/uom.json
 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:267
 #: erpnext/utilities/transaction_base.py:628
@@ -31317,7 +31285,7 @@ msgstr ""
 msgid "Naming Series updated"
 msgstr ""
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:938
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:939
 msgid "Naming series '{0}' for DocType '{1}' does not contain standard '.' or '{{' separator. Using fallback extraction."
 msgstr ""
 
@@ -31676,7 +31644,7 @@ msgstr ""
 msgid "Net Weight UOM"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:1666
+#: erpnext/controllers/accounts_controller.py:1667
 msgid "Net total calculation precision loss"
 msgstr ""
 
@@ -31853,7 +31821,7 @@ msgstr ""
 msgid "New Workplace"
 msgstr ""
 
-#: erpnext/selling/doctype/customer/customer.py:405
+#: erpnext/selling/doctype/customer/customer.py:395
 msgid "New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0}"
 msgstr ""
 
@@ -31907,7 +31875,7 @@ msgstr ""
 msgid "No <strong>Account Data</strong> row found"
 msgstr ""
 
-#: erpnext/setup/doctype/company/test_company.py:93
+#: erpnext/setup/doctype/company/test_company.py:94
 msgid "No Account matched these filters: {}"
 msgstr ""
 
@@ -31920,7 +31888,7 @@ msgstr ""
 msgid "No Answer"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2526
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2607
 msgid "No Customer found for Inter Company Transactions which represents company {0}"
 msgstr ""
 
@@ -31933,7 +31901,7 @@ msgstr ""
 msgid "No Delivery Note selected for Customer {}"
 msgstr ""
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:755
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:756
 msgid "No DocTypes in To Delete list. Please generate or import the list before submitting."
 msgstr ""
 
@@ -31949,7 +31917,7 @@ msgstr ""
 msgid "No Item with Serial No {0}"
 msgstr ""
 
-#: erpnext/controllers/subcontracting_controller.py:1459
+#: erpnext/controllers/subcontracting_controller.py:1461
 msgid "No Items selected for transfer."
 msgstr ""
 
@@ -32013,7 +31981,7 @@ msgstr ""
 msgid "No Summary"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2510
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2591
 msgid "No Supplier found for Inter Company Transactions which represents company {0}"
 msgstr ""
 
@@ -32025,7 +31993,7 @@ msgstr ""
 msgid "No Tax withholding account set for Company {0} in Tax Withholding Category {1}."
 msgstr ""
 
-#: erpnext/accounts/report/gross_profit/gross_profit.py:998
+#: erpnext/accounts/report/gross_profit/gross_profit.py:990
 msgid "No Terms"
 msgstr ""
 
@@ -32055,7 +32023,7 @@ msgstr ""
 msgid "No accounts found."
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:796
+#: erpnext/selling/doctype/sales_order/sales_order.py:799
 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured"
 msgstr ""
 
@@ -32377,7 +32345,7 @@ msgstr ""
 msgid "No vouchers found for this transaction"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2574
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2655
 msgid "No {0} found for Inter Company Transactions."
 msgstr ""
 
@@ -32422,8 +32390,8 @@ msgstr ""
 msgid "Non stock items"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:182
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:317
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:186
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:322
 msgid "Non-Current Liabilities"
 msgstr ""
 
@@ -32524,7 +32492,7 @@ msgstr ""
 msgid "Not allow to set alternative item for the item {0}"
 msgstr ""
 
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:59
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:60
 msgid "Not allowed to create accounting dimension for {0}"
 msgstr ""
 
@@ -32578,7 +32546,7 @@ msgstr ""
 msgid "Note: Item {0} added multiple times"
 msgstr "Opomba: Artikla {0} je bil dodan večkrat"
 
-#: erpnext/controllers/accounts_controller.py:712
+#: erpnext/controllers/accounts_controller.py:713
 msgid "Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified"
 msgstr ""
 
@@ -32828,18 +32796,18 @@ msgstr ""
 msgid "Offer Date"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:56
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:92
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:60
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:97
 msgid "Office Equipment"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:120
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:196
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:124
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:201
 msgid "Office Maintenance Expenses"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:121
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:200
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:125
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:205
 msgid "Office Rent"
 msgstr ""
 
@@ -32967,7 +32935,7 @@ msgstr ""
 msgid "Once set, this invoice will be on hold till the set date"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:769
+#: erpnext/manufacturing/doctype/work_order/work_order.js:751
 msgid "Once the Work Order is Closed. It can't be resumed."
 msgstr ""
 
@@ -33007,7 +32975,7 @@ msgstr ""
 msgid "Only CSV and Excel files can be used to for importing data. Please check the file format you are trying to upload"
 msgstr ""
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1071
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1072
 msgid "Only CSV files are allowed"
 msgstr ""
 
@@ -33026,7 +32994,7 @@ msgstr ""
 msgid "Only Include Allocated Payments"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:136
+#: erpnext/accounts/doctype/account/account.py:137
 msgid "Only Parent can be of type {0}"
 msgstr ""
 
@@ -33063,7 +33031,7 @@ msgstr ""
 msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:712
 msgid "Only one {0} entry can be created against the Work Order {1}"
 msgstr ""
 
@@ -33280,8 +33248,8 @@ msgstr ""
 msgid "Opening Balance Details"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:192
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:343
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:196
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:348
 msgid "Opening Balance Equity"
 msgstr ""
 
@@ -33337,7 +33305,7 @@ msgid "Opening Invoice Tool"
 msgstr ""
 
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1651
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1990
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2071
 msgid "Opening Invoice has rounding adjustment of {0}.<br><br> '{1}' account is required to post these values. Please set it in Company: {2}.<br><br> Or, '{3}' can be enabled to not post any rounding adjustment."
 msgstr ""
 
@@ -33405,7 +33373,10 @@ msgid "Opening stock creation has been queued and will be created in the backgro
 msgstr ""
 
 #. Label of the operating_component (Link) field in DocType 'Workstation Cost'
+#. Label of the operating_component (Data) field in DocType 'Landed Cost Taxes
+#. and Charges'
 #: erpnext/manufacturing/doctype/workstation_cost/workstation_cost.json
+#: erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
 msgid "Operating Component"
 msgstr ""
 
@@ -33437,7 +33408,7 @@ msgstr ""
 msgid "Operating Cost Per BOM Quantity"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:1731
+#: erpnext/manufacturing/doctype/bom/bom.py:1749
 msgid "Operating Cost as per Work Order / BOM"
 msgstr ""
 
@@ -33480,15 +33451,15 @@ msgstr ""
 
 #. Label of the operation_row_id (Int) field in DocType 'BOM Item'
 #. Label of the operation_id (Data) field in DocType 'Job Card'
+#. Label of the operation_id (Data) field in DocType 'Landed Cost Taxes and
+#. Charges'
 #: erpnext/manufacturing/doctype/bom_item/bom_item.json
 #: erpnext/manufacturing/doctype/job_card/job_card.json
+#: erpnext/manufacturing/doctype/work_order/work_order.js:332
+#: erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
 msgid "Operation ID"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:351
-msgid "Operation Id"
-msgstr ""
-
 #. Label of the operation_row_id (Int) field in DocType 'Job Card'
 #: erpnext/manufacturing/doctype/job_card/job_card.json
 msgid "Operation Row ID"
@@ -33513,7 +33484,7 @@ msgstr ""
 msgid "Operation Time"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1504
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1505
 msgid "Operation Time must be greater than 0 for Operation {0}"
 msgstr ""
 
@@ -33528,11 +33499,11 @@ msgstr ""
 msgid "Operation time does not depend on quantity to produce"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:592
+#: erpnext/manufacturing/doctype/job_card/job_card.js:518
 msgid "Operation {0} added multiple times in the work order {1}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1247
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1255
 msgid "Operation {0} does not belong to the work order {1}"
 msgstr ""
 
@@ -33548,9 +33519,9 @@ msgstr ""
 #. Label of the operations (Table) field in DocType 'Work Order'
 #. Label of the operation (Section Break) field in DocType 'Email Digest'
 #: erpnext/manufacturing/doctype/bom/bom.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:332
+#: erpnext/manufacturing/doctype/work_order/work_order.js:313
 #: erpnext/manufacturing/doctype/work_order/work_order.json
-#: erpnext/setup/doctype/company/company.py:468
+#: erpnext/setup/doctype/company/company.py:472
 #: erpnext/setup/doctype/email_digest/email_digest.json
 #: erpnext/templates/generators/bom.html:61
 msgid "Operations"
@@ -33723,7 +33694,7 @@ msgstr ""
 msgid "Optimize Route"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1035
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1017
 msgid "Optional. Select a specific manufacture entry to reverse."
 msgstr ""
 
@@ -33873,7 +33844,7 @@ msgstr ""
 
 #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11
 #: erpnext/selling/doctype/customer/customer_dashboard.py:20
-#: erpnext/selling/doctype/sales_order/sales_order.py:1005
+#: erpnext/selling/doctype/sales_order/sales_order.py:1018
 #: erpnext/setup/doctype/company/company_dashboard.py:23
 msgid "Orders"
 msgstr ""
@@ -34091,7 +34062,7 @@ msgstr ""
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 #: erpnext/accounts/report/accounts_payable/accounts_payable.html:140
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:141
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1277
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1200
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:169
 #: erpnext/accounts/report/purchase_register/purchase_register.py:289
 #: erpnext/accounts/report/sales_register/sales_register.py:319
@@ -34157,7 +34128,7 @@ msgstr ""
 msgid "Over Picking Allowance"
 msgstr ""
 
-#: erpnext/controllers/stock_controller.py:1737
+#: erpnext/controllers/stock_controller.py:1738
 msgid "Over Receipt"
 msgstr ""
 
@@ -34185,7 +34156,7 @@ msgstr ""
 msgid "Overbilling of {0} {1} ignored for item {2} because you have {3} role."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2184
+#: erpnext/controllers/accounts_controller.py:2185
 msgid "Overbilling of {} ignored because you have {} role."
 msgstr ""
 
@@ -34670,7 +34641,7 @@ msgstr ""
 msgid "Packed Items"
 msgstr "Pakirani Artikli"
 
-#: erpnext/controllers/stock_controller.py:1571
+#: erpnext/controllers/stock_controller.py:1572
 msgid "Packed Items cannot be transferred internally"
 msgstr ""
 
@@ -34707,7 +34678,7 @@ msgstr "Pakirni List"
 msgid "Packing Slip Item"
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:659
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:700
 msgid "Packing Slip(s) cancelled"
 msgstr ""
 
@@ -34748,7 +34719,7 @@ msgstr ""
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:173
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1271
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1194
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:167
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:201
 #: erpnext/accounts/report/pos_register/pos_register.py:209
@@ -34908,7 +34879,7 @@ msgstr "Nadrejena Šarža"
 msgid "Parent Company"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:603
+#: erpnext/setup/doctype/company/company.py:607
 msgid "Parent Company must be a group company"
 msgstr ""
 
@@ -35248,7 +35219,7 @@ msgstr ""
 #: erpnext/accounts/report/accounts_payable/accounts_payable.js:105
 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:82
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:65
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1204
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1127
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:82
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:147
 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49
@@ -35275,7 +35246,7 @@ msgstr ""
 
 #. Name of a DocType
 #: erpnext/accounts/doctype/party_account/party_account.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1216
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1139
 msgid "Party Account"
 msgstr ""
 
@@ -35308,7 +35279,7 @@ msgstr ""
 msgid "Party Account No. (Bank Statement)"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2468
+#: erpnext/controllers/accounts_controller.py:2469
 msgid "Party Account {0} currency ({1}) and document currency ({2}) should be same"
 msgstr ""
 
@@ -35460,7 +35431,7 @@ msgstr ""
 #: erpnext/accounts/report/accounts_payable/accounts_payable.js:92
 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:69
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:52
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1198
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1121
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:69
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:141
 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42
@@ -35569,7 +35540,7 @@ msgstr ""
 msgid "Pause"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:263
+#: erpnext/manufacturing/doctype/job_card/job_card.js:660
 msgid "Pause Job"
 msgstr ""
 
@@ -35620,7 +35591,7 @@ msgid "Payable"
 msgstr ""
 
 #: erpnext/accounts/report/accounts_payable/accounts_payable.js:50
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1214
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1137
 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:209
 #: erpnext/accounts/report/purchase_register/purchase_register.py:194
 #: erpnext/accounts/report/purchase_register/purchase_register.py:235
@@ -35654,7 +35625,7 @@ msgstr ""
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:98
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py:25
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:42
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:51
 #: erpnext/buying/doctype/purchase_order/purchase_order.js:394
 #: erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py:24
 #: erpnext/selling/doctype/sales_order/sales_order.js:1213
@@ -35801,7 +35772,7 @@ msgstr ""
 msgid "Payment Entry is already created"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:1617
+#: erpnext/controllers/accounts_controller.py:1618
 msgid "Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice."
 msgstr ""
 
@@ -36091,7 +36062,7 @@ msgstr ""
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 #: erpnext/buying/doctype/purchase_order/purchase_order.json
-#: erpnext/controllers/accounts_controller.py:2748
+#: erpnext/controllers/accounts_controller.py:2749
 #: erpnext/selling/doctype/quotation/quotation.json
 #: erpnext/selling/doctype/sales_order/sales_order.json
 msgid "Payment Schedule"
@@ -36120,7 +36091,7 @@ msgstr ""
 #: erpnext/accounts/doctype/payment_schedule/payment_schedule.json
 #: erpnext/accounts/doctype/payment_term/payment_term.json
 #: erpnext/accounts/doctype/payment_terms_template_detail/payment_terms_template_detail.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1267
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1190
 #: erpnext/accounts/report/gross_profit/gross_profit.py:449
 #: erpnext/accounts/workspace/invoicing/invoicing.json
 #: erpnext/public/js/controllers/transaction.js:498
@@ -36247,7 +36218,7 @@ msgstr ""
 msgid "Payment methods are mandatory. Please add at least one payment method."
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3033
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3114
 msgid "Payment methods refreshed. Please review before proceeding."
 msgstr ""
 
@@ -36322,8 +36293,8 @@ msgstr ""
 msgid "Payroll Entry"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:156
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:262
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:160
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:267
 msgid "Payroll Payable"
 msgstr ""
 
@@ -36370,10 +36341,14 @@ msgstr ""
 msgid "Pending Amount"
 msgstr "Čakajoči Znesek"
 
+#. Label of the pending_qty (Float) field in DocType 'Job Card'
 #. Label of the pending_qty (Float) field in DocType 'Production Plan Item'
+#. Label of the pending_qty (Float) field in DocType 'Work Order Operation'
 #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:254
+#: erpnext/manufacturing/doctype/job_card/job_card.json
 #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:356
+#: erpnext/manufacturing/doctype/work_order/work_order.js:337
+#: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
 #: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:182
 #: erpnext/selling/doctype/sales_order/sales_order.js:1726
 #: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:45
@@ -36382,9 +36357,18 @@ msgstr ""
 
 #: erpnext/buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:54
 #: erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.py:44
+#: erpnext/manufacturing/doctype/job_card/job_card.js:273
 msgid "Pending Quantity"
 msgstr ""
 
+#: erpnext/manufacturing/doctype/job_card/job_card.js:70
+msgid "Pending Quantity cannot be greater than {0}"
+msgstr ""
+
+#: erpnext/manufacturing/doctype/job_card/job_card.js:62
+msgid "Pending Quantity cannot be less than 0"
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'Task'
 #. Option in a Select field in the tasks Web Form
 #: erpnext/projects/doctype/task/task.json
@@ -36414,6 +36398,14 @@ msgstr ""
 msgid "Pending processing"
 msgstr ""
 
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1464
+msgid "Pending quantity cannot be greater than the for quantity."
+msgstr ""
+
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1458
+msgid "Pending quantity cannot be negative."
+msgstr ""
+
 #: erpnext/setup/setup_wizard/data/industry_type.txt:36
 msgid "Pension Funds"
 msgstr ""
@@ -37087,8 +37079,8 @@ msgstr ""
 msgid "Plant Floor"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:57
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:97
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:61
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:102
 msgid "Plants and Machineries"
 msgstr ""
 
@@ -37172,7 +37164,7 @@ msgstr ""
 msgid "Please add the account to root level Company - {0}"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:233
+#: erpnext/accounts/doctype/account/account.py:234
 msgid "Please add the account to root level Company - {}"
 msgstr ""
 
@@ -37180,7 +37172,7 @@ msgstr ""
 msgid "Please add {1} role to user {0}."
 msgstr ""
 
-#: erpnext/controllers/stock_controller.py:1748
+#: erpnext/controllers/stock_controller.py:1749
 msgid "Please adjust the qty or edit {0} to proceed."
 msgstr ""
 
@@ -37188,7 +37180,7 @@ msgstr ""
 msgid "Please attach CSV file"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3174
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3255
 msgid "Please cancel and amend the Payment Entry"
 msgstr ""
 
@@ -37222,7 +37214,7 @@ msgstr ""
 msgid "Please check the 'Activate Serial and Batch No for Item' checkbox in the {0} to make Serial and Batch Bundle for the item."
 msgstr ""
 
-#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:562
+#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:605
 msgid "Please check the error message and take necessary actions to fix the error and then restart the reposting again."
 msgstr ""
 
@@ -37247,11 +37239,15 @@ msgstr ""
 msgid "Please click on 'Generate Schedule' to get schedule"
 msgstr ""
 
+#: erpnext/manufacturing/doctype/job_card/job_card.js:58
+msgid "Please complete the job first before entering Pending Quantity"
+msgstr ""
+
 #: erpnext/accounts/doctype/bank_transaction_rule/bank_transaction_rule.py:80
 msgid "Please configure accounts for the Bank Entry rule."
 msgstr ""
 
-#: erpnext/selling/doctype/customer/customer.py:642
+#: erpnext/selling/doctype/customer/customer.py:632
 msgid "Please contact any of the following users to extend the credit limits for {0}: {1}"
 msgstr ""
 
@@ -37259,11 +37255,11 @@ msgstr ""
 msgid "Please contact any of the following users to {} this transaction."
 msgstr ""
 
-#: erpnext/selling/doctype/customer/customer.py:635
+#: erpnext/selling/doctype/customer/customer.py:625
 msgid "Please contact your administrator to extend the credit limits for {0}."
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:384
+#: erpnext/accounts/doctype/account/account.py:385
 msgid "Please convert the parent account in corresponding child company to a group account."
 msgstr ""
 
@@ -37275,11 +37271,11 @@ msgstr ""
 msgid "Please create Landed Cost Vouchers against Invoices that have 'Update Stock' enabled."
 msgstr ""
 
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:74
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:75
 msgid "Please create a new Accounting Dimension if required."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:805
+#: erpnext/controllers/accounts_controller.py:806
 msgid "Please create purchase from internal sale or delivery document itself"
 msgstr ""
 
@@ -37323,7 +37319,7 @@ msgstr ""
 msgid "Please enable {0} in the {1}."
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:857
+#: erpnext/controllers/selling_controller.py:858
 msgid "Please enable {} in {} to allow same item in multiple rows"
 msgstr ""
 
@@ -37343,7 +37339,7 @@ msgstr ""
 msgid "Please ensure {} account {} is a Receivable account."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:757
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:145
 msgid "Please enter <b>Difference Account</b> or set default <b>Stock Adjustment Account</b> for company {0}"
 msgstr ""
 
@@ -37364,7 +37360,7 @@ msgstr ""
 msgid "Please enter Cost Center"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:425
+#: erpnext/selling/doctype/sales_order/sales_order.py:435
 msgid "Please enter Delivery Date"
 msgstr ""
 
@@ -37381,7 +37377,7 @@ msgstr ""
 msgid "Please enter Item Code to get Batch Number"
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:2989
+#: erpnext/public/js/controllers/transaction.js:2991
 msgid "Please enter Item Code to get batch no"
 msgstr ""
 
@@ -37397,7 +37393,7 @@ msgstr ""
 msgid "Please enter Planned Qty for Item {0} at row {1}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:73
+#: erpnext/manufacturing/doctype/work_order/work_order.js:44
 msgid "Please enter Production Item first"
 msgstr ""
 
@@ -37454,7 +37450,7 @@ msgstr ""
 msgid "Please enter company name first"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2974
+#: erpnext/controllers/accounts_controller.py:2968
 msgid "Please enter default currency in Company Master"
 msgstr ""
 
@@ -37482,7 +37478,7 @@ msgstr ""
 msgid "Please enter serial nos"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.js:214
+#: erpnext/setup/doctype/company/company.js:230
 msgid "Please enter the company name to confirm"
 msgstr ""
 
@@ -37550,11 +37546,11 @@ msgstr ""
 msgid "Please make sure the file you are using has 'Parent Account' column present in the header."
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.js:216
+#: erpnext/setup/doctype/company/company.js:232
 msgid "Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone."
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:709
+#: erpnext/stock/doctype/item/item.js:696
 msgid "Please mention 'Weight UOM' along with Weight."
 msgstr ""
 
@@ -37613,7 +37609,7 @@ msgstr ""
 msgid "Please select Apply Discount On"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:1884
+#: erpnext/selling/doctype/sales_order/sales_order.py:1906
 msgid "Please select BOM against item {0}"
 msgstr ""
 
@@ -37659,7 +37655,7 @@ msgstr ""
 msgid "Please select Customer first"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:534
+#: erpnext/setup/doctype/company/company.py:538
 msgid "Please select Existing Company for creating Chart of Accounts"
 msgstr ""
 
@@ -37668,8 +37664,8 @@ msgstr ""
 msgid "Please select Finished Good Item for Service Item {0}"
 msgstr ""
 
-#: erpnext/assets/doctype/asset/asset.js:752
-#: erpnext/assets/doctype/asset/asset.js:767
+#: erpnext/assets/doctype/asset/asset.js:754
+#: erpnext/assets/doctype/asset/asset.js:769
 msgid "Please select Item Code first"
 msgstr ""
 
@@ -37701,7 +37697,7 @@ msgstr ""
 msgid "Please select Price List"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:1886
+#: erpnext/selling/doctype/sales_order/sales_order.py:1908
 msgid "Please select Qty against item {0}"
 msgstr ""
 
@@ -37721,7 +37717,7 @@ msgstr ""
 msgid "Please select Stock Asset Account"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2823
+#: erpnext/controllers/accounts_controller.py:2824
 msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
 msgstr ""
 
@@ -37738,7 +37734,7 @@ msgstr ""
 #: erpnext/manufacturing/doctype/bom/bom.js:727
 #: erpnext/manufacturing/doctype/bom/bom.py:280
 #: erpnext/public/js/controllers/accounts.js:277
-#: erpnext/public/js/controllers/transaction.js:3288
+#: erpnext/public/js/controllers/transaction.js:3290
 msgid "Please select a Company first."
 msgstr ""
 
@@ -37762,7 +37758,7 @@ msgstr ""
 msgid "Please select a Warehouse"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1601
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1618
 msgid "Please select a Work Order first."
 msgstr ""
 
@@ -37839,7 +37835,7 @@ msgstr ""
 msgid "Please select at least one filter: Item Code, Batch, or Serial No."
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:557
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:556
 msgid "Please select at least one item to update delivered quantity."
 msgstr ""
 
@@ -37859,7 +37855,7 @@ msgstr ""
 msgid "Please select atleast one item to continue"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:399
+#: erpnext/manufacturing/doctype/work_order/work_order.js:380
 msgid "Please select atleast one operation to create Job Card"
 msgstr ""
 
@@ -37917,7 +37913,7 @@ msgstr ""
 msgid "Please select the Multiple Tier Program type for more than one collection rules."
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:371
+#: erpnext/stock/doctype/item/item.js:364
 msgid "Please select the Warehouse first"
 msgstr ""
 
@@ -37971,7 +37967,7 @@ msgstr ""
 msgid "Please set Account"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1881
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1962
 msgid "Please set Account for Change Amount"
 msgstr ""
 
@@ -38065,7 +38061,7 @@ msgstr ""
 msgid "Please set a Cost Center for the Asset or set an Asset Depreciation Cost Center for the Company {}"
 msgstr ""
 
-#: erpnext/projects/doctype/project/project.py:735
+#: erpnext/projects/doctype/project/project.py:773
 msgid "Please set a default Holiday List for Company {0}"
 msgstr ""
 
@@ -38102,23 +38098,23 @@ msgstr ""
 msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2418
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2499
 msgid "Please set default Cash or Bank account in Mode of Payment {0}"
 msgstr ""
 
 #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:94
 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:198
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3026
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3107
 msgid "Please set default Cash or Bank account in Mode of Payment {}"
 msgstr ""
 
 #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:96
 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:200
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3028
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3109
 msgid "Please set default Cash or Bank account in Mode of Payments {}"
 msgstr ""
 
-#: erpnext/accounts/utils.py:2541
+#: erpnext/accounts/utils.py:2540
 msgid "Please set default Exchange Gain/Loss Account in Company {}"
 msgstr ""
 
@@ -38147,7 +38143,7 @@ msgstr ""
 msgid "Please set filter based on Item or Warehouse"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2384
+#: erpnext/controllers/accounts_controller.py:2385
 msgid "Please set one of the following:"
 msgstr ""
 
@@ -38155,7 +38151,7 @@ msgstr ""
 msgid "Please set opening number of booked depreciations"
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:2676
+#: erpnext/public/js/controllers/transaction.js:2678
 msgid "Please set recurring after saving"
 msgstr ""
 
@@ -38167,15 +38163,15 @@ msgstr ""
 msgid "Please set the Default Cost Center in {0} company."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:686
+#: erpnext/manufacturing/doctype/work_order/work_order.js:668
 msgid "Please set the Item Code first"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1664
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1681
 msgid "Please set the Target Warehouse in the Job Card"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1668
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1685
 msgid "Please set the WIP Warehouse in the Job Card"
 msgstr ""
 
@@ -38214,7 +38210,7 @@ msgstr ""
 msgid "Please set {0} in Company {1} to account for Exchange Gain / Loss"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:594
+#: erpnext/controllers/accounts_controller.py:595
 msgid "Please set {0} to {1}, the same account that was used in the original invoice {2}."
 msgstr ""
 
@@ -38236,7 +38232,7 @@ msgstr ""
 msgid "Please specify Company to proceed"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3207
+#: erpnext/controllers/accounts_controller.py:3201
 #: erpnext/public/js/controllers/accounts.js:117
 msgid "Please specify a valid Row ID for row {0} in table {1}"
 msgstr ""
@@ -38354,8 +38350,8 @@ msgstr ""
 msgid "Post Title Key"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:122
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:201
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:126
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:206
 msgid "Postal Expenses"
 msgstr ""
 
@@ -38438,7 +38434,7 @@ msgstr ""
 #: erpnext/accounts/report/accounts_payable/accounts_payable.js:16
 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:15
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:18
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1196
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1119
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:15
 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:38
 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:7
@@ -38560,10 +38556,6 @@ msgstr ""
 msgid "Posting Time"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519
-msgid "Posting date and posting time is mandatory"
-msgstr ""
-
 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:841
 msgid "Posting date does not match the selected transaction"
 msgstr ""
@@ -38637,15 +38629,15 @@ msgstr ""
 msgid "Pre Sales"
 msgstr ""
 
-#: erpnext/accounts/utils.py:2779
+#: erpnext/accounts/utils.py:2778
 msgid "Pre-Submit Warning"
 msgstr ""
 
-#: erpnext/accounts/utils.py:2828
+#: erpnext/accounts/utils.py:2827
 msgid "Pre-Submit Warning: Credit Limit"
 msgstr ""
 
-#: erpnext/accounts/utils.py:2840
+#: erpnext/accounts/utils.py:2839
 msgid "Pre-Submit Warning: Packed Qty"
 msgstr ""
 
@@ -38895,7 +38887,7 @@ msgstr ""
 msgid "Price List Currency"
 msgstr "Valuta Cenika"
 
-#: erpnext/stock/get_item_details.py:1334
+#: erpnext/stock/get_item_details.py:1357
 msgid "Price List Currency not selected"
 msgstr ""
 
@@ -39250,7 +39242,7 @@ msgstr ""
 msgid "Print Receipt on Order Complete"
 msgstr ""
 
-#: erpnext/setup/install.py:114
+#: erpnext/setup/install.py:115
 msgid "Print UOM after Quantity"
 msgstr "Izpis Enote po Količini"
 
@@ -39259,8 +39251,8 @@ msgstr "Izpis Enote po Količini"
 msgid "Print Without Amount"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:123
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:202
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:127
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:207
 msgid "Print and Stationery"
 msgstr ""
 
@@ -39268,7 +39260,7 @@ msgstr ""
 msgid "Print settings updated in respective print format"
 msgstr ""
 
-#: erpnext/setup/install.py:121
+#: erpnext/setup/install.py:122
 msgid "Print taxes with zero amount"
 msgstr ""
 
@@ -39371,10 +39363,6 @@ msgstr ""
 msgid "Procedure"
 msgstr ""
 
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.js:47
-msgid "Procedures dropped"
-msgstr ""
-
 #. Label of the process_deferred_accounting (Link) field in DocType 'Journal
 #. Entry'
 #. Name of a DocType
@@ -39428,7 +39416,7 @@ msgstr ""
 msgid "Process Loss Qty"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:346
+#: erpnext/manufacturing/doctype/job_card/job_card.js:289
 msgid "Process Loss Quantity"
 msgstr ""
 
@@ -39509,6 +39497,10 @@ msgstr ""
 msgid "Process in Single Transaction"
 msgstr ""
 
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1461
+msgid "Process loss quantity cannot be negative."
+msgstr ""
+
 #. Label of the processed_boms (Long Text) field in DocType 'BOM Update Log'
 #: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.json
 msgid "Processed BOMs"
@@ -39670,7 +39662,7 @@ msgstr ""
 #. Label of a Card Break in the Manufacturing Workspace
 #: erpnext/manufacturing/doctype/workstation/workstation.json
 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
-#: erpnext/setup/doctype/company/company.py:474
+#: erpnext/setup/doctype/company/company.py:478
 msgid "Production"
 msgstr ""
 
@@ -39884,7 +39876,7 @@ msgstr ""
 msgid "Progress (%)"
 msgstr ""
 
-#: erpnext/projects/doctype/project/project.py:374
+#: erpnext/projects/doctype/project/project.py:412
 msgid "Project Collaboration Invitation"
 msgstr ""
 
@@ -39928,7 +39920,7 @@ msgstr ""
 msgid "Project Summary"
 msgstr ""
 
-#: erpnext/projects/doctype/project/project.py:673
+#: erpnext/projects/doctype/project/project.py:711
 msgid "Project Summary for {0}"
 msgstr ""
 
@@ -40059,7 +40051,7 @@ msgstr ""
 #. Label of a Card Break in the Projects Workspace
 #. Title of a Workspace Sidebar
 #: erpnext/config/projects.py:7 erpnext/desktop_icon/projects.json
-#: erpnext/projects/doctype/project/project.py:451
+#: erpnext/projects/doctype/project/project.py:489
 #: erpnext/projects/workspace/projects/projects.json
 #: erpnext/selling/doctype/customer/customer_dashboard.py:26
 #: erpnext/selling/doctype/sales_order/sales_order_dashboard.py:28
@@ -40205,7 +40197,7 @@ msgid "Prospects Engaged But Not Converted"
 msgstr ""
 
 #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:198
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:785
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:786
 msgid "Protected DocType"
 msgstr ""
 
@@ -40220,7 +40212,7 @@ msgstr ""
 msgid "Providing"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:573
+#: erpnext/setup/doctype/company/company.py:577
 msgid "Provisional Account"
 msgstr ""
 
@@ -40292,7 +40284,7 @@ msgstr ""
 #: erpnext/accounts/doctype/tax_rule/tax_rule.json
 #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
 #: erpnext/projects/doctype/project/project_dashboard.py:16
-#: erpnext/setup/doctype/company/company.py:462 erpnext/setup/install.py:404
+#: erpnext/setup/doctype/company/company.py:466 erpnext/setup/install.py:436
 #: erpnext/stock/doctype/item/item.json
 #: erpnext/stock/doctype/item_lead_time/item_lead_time.json
 #: erpnext/stock/doctype/item_reorder/item_reorder.json
@@ -40616,7 +40608,7 @@ msgstr ""
 msgid "Purchase Order {0} is not submitted"
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:922
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:930
 msgid "Purchase Orders"
 msgstr ""
 
@@ -40646,7 +40638,7 @@ msgstr ""
 msgid "Purchase Orders to Receive"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2016
+#: erpnext/controllers/accounts_controller.py:2017
 msgid "Purchase Orders {0} are un-linked"
 msgstr ""
 
@@ -40780,7 +40772,7 @@ msgstr ""
 #. Label of the purchase_tax_template (Link) field in DocType 'Tax Rule'
 #. Label of a Workspace Sidebar Item
 #: erpnext/accounts/doctype/tax_rule/tax_rule.json
-#: erpnext/setup/doctype/company/company.js:145
+#: erpnext/setup/doctype/company/company.js:161
 #: erpnext/workspace_sidebar/taxes.json
 msgid "Purchase Tax Template"
 msgstr ""
@@ -40887,10 +40879,6 @@ msgstr "Nakup"
 msgid "Purpose"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:574
-msgid "Purpose must be one of {0}"
-msgstr ""
-
 #. Label of the purposes (Table) field in DocType 'Maintenance Visit'
 #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
 msgid "Purposes"
@@ -40946,6 +40934,7 @@ msgstr ""
 #. Label of the qty (Float) field in DocType 'Delivery Schedule Item'
 #. Label of the qty (Float) field in DocType 'Product Bundle Item'
 #. Label of the qty (Float) field in DocType 'Landed Cost Item'
+#. Label of the qty (Float) field in DocType 'Landed Cost Taxes and Charges'
 #. Option for the 'Distribute Charges Based On' (Select) field in DocType
 #. 'Landed Cost Voucher'
 #. Label of the qty (Float) field in DocType 'Packed Item'
@@ -40994,6 +40983,7 @@ msgstr ""
 #: erpnext/selling/doctype/sales_order/sales_order.js:1506
 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:255
 #: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
+#: erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
 #: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
 #: erpnext/stock/doctype/packed_item/packed_item.json
 #: erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -41102,11 +41092,11 @@ msgstr ""
 msgid "Qty To Manufacture"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1441
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1442
 msgid "Qty To Manufacture ({0}) cannot be a fraction for the UOM {2}. To allow this, disable '{1}' in the UOM {2}."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:260
+#: erpnext/manufacturing/doctype/job_card/job_card.py:261
 msgid "Qty To Manufacture in the job card cannot be greater than Qty To Manufacture in the work order for the operation {0}. <br><br><b>Solution: </b> Either you can reduce the Qty To Manufacture in the job card or set the 'Overproduction Percentage For Work Order' in the {1}."
 msgstr ""
 
@@ -41157,8 +41147,8 @@ msgstr "Količina na Zalogo Enota"
 msgid "Qty for which recursion isn't applicable."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1063
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1086
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1045
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1068
 msgid "Qty for {0}"
 msgstr ""
 
@@ -41213,8 +41203,8 @@ msgstr ""
 msgid "Qty to Fetch"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:318
-#: erpnext/manufacturing/doctype/job_card/job_card.py:890
+#: erpnext/manufacturing/doctype/job_card/job_card.js:247
+#: erpnext/manufacturing/doctype/job_card/job_card.py:893
 msgid "Qty to Manufacture"
 msgstr ""
 
@@ -41450,17 +41440,17 @@ msgstr ""
 msgid "Quality Inspection Template Name"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:799
+#: erpnext/manufacturing/doctype/job_card/job_card.py:800
 msgid "Quality Inspection is required for the item {0} before completing the job card {1}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:810
-#: erpnext/manufacturing/doctype/job_card/job_card.py:819
+#: erpnext/manufacturing/doctype/job_card/job_card.py:811
+#: erpnext/manufacturing/doctype/job_card/job_card.py:820
 msgid "Quality Inspection {0} is not submitted for the item: {1}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:829
-#: erpnext/manufacturing/doctype/job_card/job_card.py:838
+#: erpnext/manufacturing/doctype/job_card/job_card.py:830
+#: erpnext/manufacturing/doctype/job_card/job_card.py:839
 msgid "Quality Inspection {0} is rejected for the item: {1}"
 msgstr ""
 
@@ -41474,7 +41464,7 @@ msgstr ""
 msgid "Quality Inspections"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:504
+#: erpnext/setup/doctype/company/company.py:508
 msgid "Quality Management"
 msgstr ""
 
@@ -41741,7 +41731,7 @@ msgstr ""
 msgid "Quantity must be less than or equal to {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1116
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1098
 #: erpnext/stock/doctype/pick_list/pick_list.js:209
 msgid "Quantity must not be more than {0}"
 msgstr ""
@@ -41751,21 +41741,21 @@ msgid "Quantity required for Item {0} in row {1}"
 msgstr ""
 
 #: erpnext/manufacturing/doctype/bom/bom.py:724
-#: erpnext/manufacturing/doctype/job_card/job_card.js:399
-#: erpnext/manufacturing/doctype/job_card/job_card.js:469
+#: erpnext/manufacturing/doctype/job_card/job_card.js:342
+#: erpnext/manufacturing/doctype/job_card/job_card.js:410
 #: erpnext/manufacturing/doctype/workstation/workstation.js:303
 msgid "Quantity should be greater than 0"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:361
+#: erpnext/manufacturing/doctype/work_order/work_order.js:342
 msgid "Quantity to Manufacture"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2646
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2644
 msgid "Quantity to Manufacture can not be zero for the operation {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1433
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1434
 msgid "Quantity to Manufacture must be greater than 0."
 msgstr ""
 
@@ -41907,11 +41897,11 @@ msgstr ""
 msgid "Quotation Trends"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:489
+#: erpnext/selling/doctype/sales_order/sales_order.py:494
 msgid "Quotation {0} is cancelled"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:402
+#: erpnext/selling/doctype/sales_order/sales_order.py:413
 msgid "Quotation {0} not of type {1}"
 msgstr ""
 
@@ -42218,7 +42208,7 @@ msgstr ""
 msgid "Rate at which this tax is applied"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3925
+#: erpnext/controllers/accounts_controller.py:3931
 msgid "Rate of '{}' items cannot be changed"
 msgstr ""
 
@@ -42384,7 +42374,7 @@ msgstr ""
 msgid "Raw Materials Consumption"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:320
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:60
 msgid "Raw Materials Missing"
 msgstr ""
 
@@ -42423,12 +42413,6 @@ msgstr ""
 msgid "Raw Materials to Customer"
 msgstr ""
 
-#. Option for the 'Data Fetch Method' (Select) field in DocType 'Accounts
-#. Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Raw SQL"
-msgstr ""
-
 #. Description of the 'Validate consumed quantity (as per BOM)' (Check) field
 #. in DocType 'Buying Settings'
 #: erpnext/buying/doctype/buying_settings/buying_settings.json
@@ -42437,7 +42421,7 @@ msgstr ""
 
 #: erpnext/buying/doctype/purchase_order/purchase_order.js:345
 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:124
-#: erpnext/manufacturing/doctype/work_order/work_order.js:785
+#: erpnext/manufacturing/doctype/work_order/work_order.js:767
 #: erpnext/selling/doctype/sales_order/sales_order.js:1012
 #: erpnext/selling/doctype/sales_order/sales_order_list.js:70
 #: erpnext/stock/doctype/material_request/material_request.js:243
@@ -42618,7 +42602,7 @@ msgid "Receivable / Payable Account"
 msgstr ""
 
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:79
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1212
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1135
 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:241
 #: erpnext/accounts/report/sales_register/sales_register.py:217
 #: erpnext/accounts/report/sales_register/sales_register.py:271
@@ -43079,7 +43063,7 @@ msgstr "Referenčni #"
 msgid "Reference #{0} dated {1}"
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:2789
+#: erpnext/public/js/controllers/transaction.js:2791
 msgid "Reference Date for Early Payment Discount"
 msgstr ""
 
@@ -43243,11 +43227,11 @@ msgstr ""
 msgid "References"
 msgstr "Reference"
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:403
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:404
 msgid "References to Sales Invoices are Incomplete"
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:395
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:396
 msgid "References to Sales Orders are Incomplete"
 msgstr ""
 
@@ -43409,7 +43393,7 @@ msgid "Remaining Amount"
 msgstr ""
 
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:189
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1289
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1212
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:180
 msgid "Remaining Balance"
 msgstr ""
@@ -43467,7 +43451,7 @@ msgstr ""
 #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:11
 #: erpnext/accounts/report/accounts_payable/accounts_payable.html:135
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1244
 #: erpnext/accounts/report/general_ledger/general_ledger.html:163
 #: erpnext/accounts/report/general_ledger/general_ledger.py:818
 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112
@@ -43531,7 +43515,7 @@ msgstr ""
 msgid "Rename Log"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:558
+#: erpnext/accounts/doctype/account/account.py:559
 msgid "Rename Not Allowed"
 msgstr ""
 
@@ -43548,7 +43532,7 @@ msgstr ""
 msgid "Rename jobs for doctype {0} have not been enqueued."
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:550
+#: erpnext/accounts/doctype/account/account.py:551
 msgid "Renaming it is only allowed via parent company {0}, to avoid mismatch."
 msgstr ""
 
@@ -43667,11 +43651,11 @@ msgstr ""
 msgid "Report Template"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:462
+#: erpnext/accounts/doctype/account/account.py:463
 msgid "Report Type is mandatory"
 msgstr ""
 
-#: erpnext/setup/install.py:216
+#: erpnext/setup/install.py:248
 msgid "Report an Issue"
 msgstr ""
 
@@ -43916,7 +43900,7 @@ msgstr ""
 #: erpnext/buying/doctype/buying_settings/buying_settings.json
 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:430
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:434
 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:88
 #: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:70
@@ -44097,7 +44081,7 @@ msgstr ""
 msgid "Research"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:510
+#: erpnext/setup/doctype/company/company.py:514
 msgid "Research & Development"
 msgstr ""
 
@@ -44142,7 +44126,7 @@ msgstr ""
 msgid "Reservation Based On"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:943
+#: erpnext/manufacturing/doctype/work_order/work_order.js:925
 #: erpnext/selling/doctype/sales_order/sales_order.js:107
 #: erpnext/stock/doctype/pick_list/pick_list.js:153
 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:179
@@ -44186,7 +44170,7 @@ msgstr ""
 msgid "Reserved"
 msgstr ""
 
-#: erpnext/controllers/stock_controller.py:1329
+#: erpnext/controllers/stock_controller.py:1330
 msgid "Reserved Batch Conflict"
 msgstr ""
 
@@ -44256,14 +44240,14 @@ msgstr ""
 msgid "Reserved Quantity for Production"
 msgstr ""
 
-#: erpnext/stock/stock_ledger.py:2340
+#: erpnext/stock/stock_ledger.py:2306
 msgid "Reserved Serial No."
 msgstr ""
 
 #. Label of the reserved_stock (Float) field in DocType 'Bin'
 #. Name of a report
 #: erpnext/manufacturing/doctype/plant_floor/stock_summary_template.html:24
-#: erpnext/manufacturing/doctype/work_order/work_order.js:959
+#: erpnext/manufacturing/doctype/work_order/work_order.js:941
 #: erpnext/public/js/stock_reservation.js:236
 #: erpnext/selling/doctype/sales_order/sales_order.js:128
 #: erpnext/selling/doctype/sales_order/sales_order.js:495
@@ -44272,13 +44256,13 @@ msgstr ""
 #: erpnext/stock/doctype/pick_list/pick_list.js:173
 #: erpnext/stock/report/reserved_stock/reserved_stock.json
 #: erpnext/stock/report/stock_balance/stock_balance.py:576
-#: erpnext/stock/stock_ledger.py:2324
+#: erpnext/stock/stock_ledger.py:2290
 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:204
 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:332
 msgid "Reserved Stock"
 msgstr ""
 
-#: erpnext/stock/stock_ledger.py:2369
+#: erpnext/stock/stock_ledger.py:2335
 msgid "Reserved Stock for Batch"
 msgstr ""
 
@@ -44544,7 +44528,7 @@ msgstr ""
 msgid "Resume"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:247
+#: erpnext/manufacturing/doctype/job_card/job_card.js:659
 msgid "Resume Job"
 msgstr ""
 
@@ -44569,8 +44553,8 @@ msgstr ""
 msgid "Retain Sample"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:196
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:348
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:200
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:353
 msgid "Retained Earnings"
 msgstr ""
 
@@ -44645,7 +44629,7 @@ msgstr ""
 msgid "Return Against Subcontracting Receipt"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:302
+#: erpnext/manufacturing/doctype/work_order/work_order.js:283
 msgid "Return Components"
 msgstr ""
 
@@ -44779,8 +44763,8 @@ msgstr "Vračila"
 msgid "Revaluation Journals"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:197
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:353
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:201
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:358
 msgid "Revaluation Surplus"
 msgstr ""
 
@@ -45008,11 +44992,11 @@ msgstr ""
 msgid "Root Type for {0} must be one of the Asset, Liability, Income, Expense and Equity"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:459
+#: erpnext/accounts/doctype/account/account.py:460
 msgid "Root Type is mandatory"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:215
+#: erpnext/accounts/doctype/account/account.py:216
 msgid "Root cannot be edited."
 msgstr ""
 
@@ -45031,8 +45015,8 @@ msgstr ""
 #. Option for the 'Account Type' (Select) field in DocType 'Account'
 #. Label of the round_off_section (Section Break) field in DocType 'Company'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:124
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:206
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:128
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:211
 #: erpnext/accounts/report/account_balance/account_balance.js:56
 #: erpnext/setup/doctype/company/company.json
 msgid "Round Off"
@@ -45212,17 +45196,17 @@ msgstr ""
 msgid "Row # {0}: Returned Item {1} does not exist in {2} {3}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:279
+#: erpnext/manufacturing/doctype/work_order/work_order.py:280
 msgid "Row #1: Sequence ID must be 1 for Operation {0}."
 msgstr ""
 
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:565
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2073
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2154
 msgid "Row #{0} (Payment Table): Amount must be negative"
 msgstr ""
 
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:563
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2068
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2149
 msgid "Row #{0} (Payment Table): Amount must be positive"
 msgstr ""
 
@@ -45247,7 +45231,7 @@ msgstr ""
 msgid "Row #{0}: Accepted Warehouse is mandatory for the accepted Item {1}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:1294
+#: erpnext/controllers/accounts_controller.py:1295
 msgid "Row #{0}: Account {1} does not belong to company {2}"
 msgstr ""
 
@@ -45308,31 +45292,31 @@ msgstr ""
 msgid "Row #{0}: Cannot create entry with different taxable AND withholding document links."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3802
+#: erpnext/controllers/accounts_controller.py:3808
 msgid "Row #{0}: Cannot delete item {1} which has already been billed."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3776
+#: erpnext/controllers/accounts_controller.py:3782
 msgid "Row #{0}: Cannot delete item {1} which has already been delivered"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3795
+#: erpnext/controllers/accounts_controller.py:3801
 msgid "Row #{0}: Cannot delete item {1} which has already been received"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3782
+#: erpnext/controllers/accounts_controller.py:3788
 msgid "Row #{0}: Cannot delete item {1} which has work order assigned to it."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3788
+#: erpnext/controllers/accounts_controller.py:3794
 msgid "Row #{0}: Cannot delete item {1} which is already ordered against this Sales Order."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3936
+#: erpnext/controllers/accounts_controller.py:3942
 msgid "Row #{0}: Cannot set Rate if the billed amount is greater than the amount for Item {1}."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1128
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1136
 msgid "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}"
 msgstr ""
 
@@ -45382,11 +45366,11 @@ msgstr ""
 msgid "Row #{0}: Customer Provided Item {1} cannot be added multiple times in the Subcontracting Inward process."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:356
+#: erpnext/manufacturing/doctype/work_order/work_order.py:357
 msgid "Row #{0}: Customer Provided Item {1} cannot be added multiple times."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:381
+#: erpnext/manufacturing/doctype/work_order/work_order.py:382
 msgid "Row #{0}: Customer Provided Item {1} does not exist in the Required Items table linked to the Subcontracting Inward Order."
 msgstr ""
 
@@ -45394,7 +45378,7 @@ msgstr ""
 msgid "Row #{0}: Customer Provided Item {1} exceeds quantity available through Subcontracting Inward Order"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:369
+#: erpnext/manufacturing/doctype/work_order/work_order.py:370
 msgid "Row #{0}: Customer Provided Item {1} has insufficient quantity in the Subcontracting Inward Order. Available quantity is {2}."
 msgstr ""
 
@@ -45450,7 +45434,7 @@ msgstr ""
 msgid "Row #{0}: Finished Good Item {1} must be a sub-contracted item"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:530
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:395
 msgid "Row #{0}: Finished Good must be {1}"
 msgstr ""
 
@@ -45479,7 +45463,7 @@ msgstr ""
 msgid "Row #{0}: From Date cannot be before To Date"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:880
+#: erpnext/manufacturing/doctype/job_card/job_card.py:881
 msgid "Row #{0}: From Time and To Time fields are required"
 msgstr ""
 
@@ -45487,7 +45471,7 @@ msgstr ""
 msgid "Row #{0}: Item added"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py:78
 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}"
 msgstr ""
 
@@ -45556,7 +45540,7 @@ msgstr ""
 msgid "Row #{0}: Next Depreciation Date cannot be before Purchase Date"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:675
+#: erpnext/selling/doctype/sales_order/sales_order.py:678
 msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
 msgstr ""
 
@@ -45568,10 +45552,6 @@ msgstr ""
 msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:955
-msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}."
-msgstr ""
-
 #: erpnext/controllers/subcontracting_inward_controller.py:208
 #: erpnext/controllers/subcontracting_inward_controller.py:342
 msgid "Row #{0}: Overconsumption of Customer Provided Item {1} against Work Order {2} is not allowed in the Subcontracting Inward process."
@@ -45597,7 +45577,7 @@ msgstr ""
 msgid "Row #{0}: Please set reorder quantity"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:617
+#: erpnext/controllers/accounts_controller.py:618
 msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master"
 msgstr ""
 
@@ -45619,15 +45599,15 @@ msgstr ""
 msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}."
 msgstr ""
 
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1467
 msgid "Row #{0}: Quality Inspection is required for Item {1}"
 msgstr ""
 
-#: erpnext/controllers/stock_controller.py:1481
+#: erpnext/controllers/stock_controller.py:1482
 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
 msgstr ""
 
-#: erpnext/controllers/stock_controller.py:1496
+#: erpnext/controllers/stock_controller.py:1497
 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
 msgstr ""
 
@@ -45635,7 +45615,7 @@ msgstr ""
 msgid "Row #{0}: Quantity cannot be a non-positive number. Please increase the quantity or remove the Item {1}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:1457
+#: erpnext/controllers/accounts_controller.py:1458
 msgid "Row #{0}: Quantity for Item {1} cannot be zero."
 msgstr ""
 
@@ -45651,8 +45631,8 @@ msgstr ""
 msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:872
-#: erpnext/controllers/accounts_controller.py:884
+#: erpnext/controllers/accounts_controller.py:873
+#: erpnext/controllers/accounts_controller.py:885
 #: erpnext/utilities/transaction_base.py:172
 #: erpnext/utilities/transaction_base.py:178
 msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})"
@@ -45701,7 +45681,7 @@ msgid "Row #{0}: Selling rate for item {1} is lower than its {2}.\n"
 "\t\t\t\t\tthis validation."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:285
+#: erpnext/manufacturing/doctype/work_order/work_order.py:286
 msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}."
 msgstr ""
 
@@ -45721,19 +45701,19 @@ msgstr ""
 msgid "Row #{0}: Serial No(s) {1} are not a part of the linked Subcontracting Inward Order. Please select valid Serial No(s)."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:645
+#: erpnext/controllers/accounts_controller.py:646
 msgid "Row #{0}: Service End Date cannot be before Invoice Posting Date"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:639
+#: erpnext/controllers/accounts_controller.py:640
 msgid "Row #{0}: Service Start Date cannot be greater than Service End Date"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:633
+#: erpnext/controllers/accounts_controller.py:634
 msgid "Row #{0}: Service Start and End Date is required for deferred accounting"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:497
+#: erpnext/selling/doctype/sales_order/sales_order.py:502
 msgid "Row #{0}: Set Supplier for item {1}"
 msgstr ""
 
@@ -45745,19 +45725,19 @@ msgstr ""
 msgid "Row #{0}: Source Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:390
+#: erpnext/manufacturing/doctype/work_order/work_order.py:391
 msgid "Row #{0}: Source Warehouse {1} for item {2} cannot be a customer warehouse."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:345
+#: erpnext/manufacturing/doctype/work_order/work_order.py:346
 msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:40
 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:62
 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer"
 msgstr ""
 
@@ -45773,6 +45753,10 @@ msgstr ""
 msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}"
 msgstr ""
 
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:485
+msgid "Row #{0}: Stock Delivered But Not Billed account cannot be used for items linked to a Sales Invoice"
+msgstr ""
+
 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:403
 msgid "Row #{0}: Stock cannot be reserved for Item {1} against a disabled Batch {2}."
 msgstr ""
@@ -45789,7 +45773,7 @@ msgstr ""
 msgid "Row #{0}: Stock is already reserved for the Item {1}."
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:557
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:598
 msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
 msgstr ""
 
@@ -45866,7 +45850,7 @@ msgstr ""
 msgid "Row #{0}: {1} of {2} should be {3}. Please update the {1} or select a different account."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4042
+#: erpnext/controllers/accounts_controller.py:4048
 msgid "Row #{0}:Quantity for Item {1} cannot be zero."
 msgstr ""
 
@@ -45975,7 +45959,7 @@ msgstr ""
 msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:747
+#: erpnext/manufacturing/doctype/job_card/job_card.py:748
 msgid "Row {0} : Operation is required against the raw material item {1}"
 msgstr ""
 
@@ -45983,7 +45967,7 @@ msgstr ""
 msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py:94
 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}"
 msgstr ""
 
@@ -46015,11 +45999,11 @@ msgstr ""
 msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:691
 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials."
 msgstr ""
 
-#: erpnext/stock/doctype/material_request/material_request.py:862
+#: erpnext/stock/doctype/material_request/material_request.py:861
 msgid "Row {0}: Bill of Materials not found for the Item {1}"
 msgstr ""
 
@@ -46036,7 +46020,7 @@ msgstr ""
 msgid "Row {0}: Conversion Factor is mandatory"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3245
+#: erpnext/controllers/accounts_controller.py:3239
 msgid "Row {0}: Cost Center {1} does not belong to Company {2}"
 msgstr ""
 
@@ -46056,7 +46040,7 @@ msgstr ""
 msgid "Row {0}: Debit entry can not be linked with a {1}"
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:879
+#: erpnext/controllers/selling_controller.py:880
 msgid "Row {0}: Delivery Warehouse ({1}) and Customer Warehouse ({2}) can not be same"
 msgstr ""
 
@@ -46064,7 +46048,7 @@ msgstr ""
 msgid "Row {0}: Delivery Warehouse cannot be same as Customer Warehouse for Item {1}."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2736
+#: erpnext/controllers/accounts_controller.py:2737
 msgid "Row {0}: Due Date in the Payment Terms table cannot be before Posting Date"
 msgstr ""
 
@@ -46109,16 +46093,16 @@ msgstr ""
 msgid "Row {0}: From Time and To Time is mandatory."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:325
+#: erpnext/manufacturing/doctype/job_card/job_card.py:326
 #: erpnext/projects/doctype/timesheet/timesheet.py:225
 msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
 msgstr ""
 
-#: erpnext/controllers/stock_controller.py:1562
+#: erpnext/controllers/stock_controller.py:1563
 msgid "Row {0}: From Warehouse is mandatory for internal transfers"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:316
+#: erpnext/manufacturing/doctype/job_card/job_card.py:317
 msgid "Row {0}: From time must be less than to time"
 msgstr ""
 
@@ -46134,7 +46118,7 @@ msgstr ""
 msgid "Row {0}: Item Tax template updated as per validity and rate applied"
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:644
+#: erpnext/controllers/selling_controller.py:645
 msgid "Row {0}: Item rate has been updated as per valuation rate since its an internal stock transfer"
 msgstr ""
 
@@ -46158,7 +46142,7 @@ msgstr ""
 msgid "Row {0}: Operation time should be greater than 0 for operation {1}"
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:655
 msgid "Row {0}: Packed Qty must be equal to {1} Qty."
 msgstr ""
 
@@ -46226,7 +46210,7 @@ msgstr ""
 msgid "Row {0}: Qty cannot be greater than {1} for the Item {2}."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:621
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:195
 msgid "Row {0}: Qty in Stock UOM can not be zero."
 msgstr ""
 
@@ -46238,10 +46222,6 @@ msgstr ""
 msgid "Row {0}: Quantity cannot be negative."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029
-msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})"
-msgstr ""
-
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:886
 msgid "Row {0}: Sales Invoice {1} is already created for {2}"
 msgstr ""
@@ -46250,11 +46230,11 @@ msgstr ""
 msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py:105
 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
 msgstr ""
 
-#: erpnext/controllers/stock_controller.py:1553
+#: erpnext/controllers/stock_controller.py:1554
 msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
 msgstr ""
 
@@ -46266,11 +46246,11 @@ msgstr ""
 msgid "Row {0}: The entire expense amount for account {1} in {2} has already been allocated."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:667
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:108
 msgid "Row {0}: The item {1}, quantity must be positive number"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3222
+#: erpnext/controllers/accounts_controller.py:3216
 msgid "Row {0}: The {3} Account {1} does not belong to the company {2}"
 msgstr ""
 
@@ -46278,11 +46258,11 @@ msgstr ""
 msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:348
 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:615
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:189
 msgid "Row {0}: UOM Conversion Factor is mandatory"
 msgstr ""
 
@@ -46295,11 +46275,11 @@ msgid "Row {0}: Warehouse {1} is linked to company {2}. Please select a warehous
 msgstr ""
 
 #: erpnext/manufacturing/doctype/bom/bom.py:1248
-#: erpnext/manufacturing/doctype/work_order/work_order.py:419
+#: erpnext/manufacturing/doctype/work_order/work_order.py:420
 msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:1176
+#: erpnext/controllers/accounts_controller.py:1177
 msgid "Row {0}: user has not applied the rule {1} on the item {2}"
 msgstr ""
 
@@ -46311,7 +46291,7 @@ msgstr ""
 msgid "Row {0}: {1} must be greater than 0"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:782
+#: erpnext/controllers/accounts_controller.py:783
 msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
 msgstr ""
 
@@ -46357,7 +46337,7 @@ msgstr ""
 msgid "Rows with Same Account heads will be merged on Ledger"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2747
+#: erpnext/controllers/accounts_controller.py:2748
 msgid "Rows with duplicate due dates in other rows were found: {0}"
 msgstr ""
 
@@ -46365,7 +46345,7 @@ msgstr ""
 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:283
+#: erpnext/controllers/accounts_controller.py:284
 msgid "Rows: {0} in {1} section are Invalid. Reference Name should point to a valid Payment Entry or Journal Entry."
 msgstr ""
 
@@ -46572,8 +46552,8 @@ msgstr ""
 #. Label of the salary_information (Tab Break) field in DocType 'Employee'
 #. Label of the salary (Currency) field in DocType 'Employee External Work
 #. History'
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:125
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:211
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:129
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:216
 #: erpnext/setup/doctype/employee/employee.json
 #: erpnext/setup/doctype/employee_external_work_history/employee_external_work_history.json
 msgid "Salary"
@@ -46595,8 +46575,8 @@ msgstr ""
 #. Option for the 'Order Type' (Select) field in DocType 'Quotation'
 #. Option for the 'Order Type' (Select) field in DocType 'Sales Order'
 #. Label of the sales_details (Tab Break) field in DocType 'Item'
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:142
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:238
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:146
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:243
 #: erpnext/accounts/doctype/item_tax_template/item_tax_template_dashboard.py:9
 #: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
 #: erpnext/accounts/doctype/payment_term/payment_term_dashboard.py:8
@@ -46610,18 +46590,18 @@ msgstr ""
 #: erpnext/regional/report/vat_audit_report/vat_audit_report.py:143
 #: erpnext/selling/doctype/quotation/quotation.json
 #: erpnext/selling/doctype/sales_order/sales_order.json
-#: erpnext/setup/doctype/company/company.py:456
-#: erpnext/setup/doctype/company/company.py:648
+#: erpnext/setup/doctype/company/company.py:460
+#: erpnext/setup/doctype/company/company.py:653
 #: erpnext/setup/doctype/company/company_dashboard.py:9
 #: erpnext/setup/doctype/sales_person/sales_person_dashboard.py:12
-#: erpnext/setup/install.py:399
+#: erpnext/setup/install.py:431
 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:297
 #: erpnext/stock/doctype/item/item.json
 #: erpnext/stock/doctype/pick_list/pick_list_dashboard.py:16
 msgid "Sales"
 msgstr "Prodaja"
 
-#: erpnext/setup/doctype/company/company.py:648
+#: erpnext/setup/doctype/company/company.py:653
 msgid "Sales Account"
 msgstr "Prodajni Račun"
 
@@ -46645,8 +46625,8 @@ msgstr ""
 msgid "Sales Defaults"
 msgstr "Privzete Prodaje"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:126
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:212
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:130
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:217
 msgid "Sales Expenses"
 msgstr "Prodajni Stroški"
 
@@ -46815,11 +46795,11 @@ msgstr ""
 msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:634
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:675
 msgid "Sales Invoice {0} has already been submitted"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:593
+#: erpnext/selling/doctype/sales_order/sales_order.py:597
 msgid "Sales Invoice {0} must be deleted before cancelling this Sales Order"
 msgstr ""
 
@@ -47021,8 +47001,8 @@ msgstr ""
 msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:1921
-#: erpnext/selling/doctype/sales_order/sales_order.py:1934
+#: erpnext/selling/doctype/sales_order/sales_order.py:1943
+#: erpnext/selling/doctype/sales_order/sales_order.py:1956
 msgid "Sales Order {0} is not available for production"
 msgstr ""
 
@@ -47030,12 +47010,12 @@ msgstr ""
 msgid "Sales Order {0} is not submitted"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:495
+#: erpnext/manufacturing/doctype/work_order/work_order.py:496
 msgid "Sales Order {0} is not valid"
 msgstr ""
 
 #: erpnext/controllers/selling_controller.py:476
-#: erpnext/manufacturing/doctype/work_order/work_order.py:500
+#: erpnext/manufacturing/doctype/work_order/work_order.py:501
 msgid "Sales Order {0} is {1}"
 msgstr ""
 
@@ -47091,7 +47071,7 @@ msgstr "Prodajna Naročila za Dostavo"
 #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:130
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1310
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1233
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:114
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:196
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:74
@@ -47197,7 +47177,7 @@ msgstr ""
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:158
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:136
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1307
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1230
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:120
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:193
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:80
@@ -47290,7 +47270,7 @@ msgstr ""
 msgid "Sales Representative"
 msgstr ""
 
-#: erpnext/accounts/report/gross_profit/gross_profit.py:997
+#: erpnext/accounts/report/gross_profit/gross_profit.py:989
 #: erpnext/stock/doctype/delivery_note/delivery_note.js:270
 msgid "Sales Return"
 msgstr ""
@@ -47314,7 +47294,7 @@ msgstr ""
 #. Label of the sales_tax_template (Link) field in DocType 'Tax Rule'
 #. Label of a Workspace Sidebar Item
 #: erpnext/accounts/doctype/tax_rule/tax_rule.json
-#: erpnext/setup/doctype/company/company.js:133
+#: erpnext/setup/doctype/company/company.js:149
 #: erpnext/workspace_sidebar/taxes.json
 msgid "Sales Tax Template"
 msgstr ""
@@ -47465,12 +47445,12 @@ msgstr ""
 
 #. Label of the sample_size (Float) field in DocType 'Quality Inspection'
 #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:93
-#: erpnext/public/js/controllers/transaction.js:2846
+#: erpnext/public/js/controllers/transaction.js:2848
 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json
 msgid "Sample Size"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:1021
 msgid "Sample quantity {0} cannot be more than received quantity {1}"
 msgstr ""
 
@@ -47831,8 +47811,8 @@ msgstr ""
 msgid "Secretary"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:177
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:301
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:181
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:306
 msgid "Secured Loans"
 msgstr ""
 
@@ -47870,7 +47850,7 @@ msgstr ""
 msgid "Select Alternative Items for Sales Order"
 msgstr "Izberi Alternativne Artikle za Prodajno Naročilo"
 
-#: erpnext/stock/doctype/item/item.js:820
+#: erpnext/stock/doctype/item/item.js:807
 msgid "Select Attribute Values"
 msgstr ""
 
@@ -47912,7 +47892,7 @@ msgstr ""
 msgid "Select Company Address"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:547
+#: erpnext/manufacturing/doctype/job_card/job_card.js:477
 msgid "Select Corrective Operation"
 msgstr ""
 
@@ -47948,7 +47928,7 @@ msgstr ""
 msgid "Select Dispatch Address "
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:229
+#: erpnext/manufacturing/doctype/job_card/job_card.js:702
 msgid "Select Employees"
 msgstr ""
 
@@ -47973,7 +47953,7 @@ msgstr ""
 msgid "Select Items based on Delivery Date"
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:2885
+#: erpnext/public/js/controllers/transaction.js:2887
 msgid "Select Items for Quality Inspection"
 msgstr ""
 
@@ -48011,7 +47991,7 @@ msgstr ""
 msgid "Select Possible Supplier"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1122
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1104
 #: erpnext/stock/doctype/pick_list/pick_list.js:219
 msgid "Select Quantity"
 msgstr ""
@@ -48109,7 +48089,7 @@ msgstr ""
 msgid "Select all"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:1153
+#: erpnext/stock/doctype/item/item.js:1140
 msgid "Select an Item Group."
 msgstr ""
 
@@ -48125,7 +48105,7 @@ msgstr ""
 msgid "Select an item from each set to be used in the Sales Order."
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:834
+#: erpnext/stock/doctype/item/item.js:821
 msgid "Select at least one value from each of the attributes."
 msgstr ""
 
@@ -48143,7 +48123,7 @@ msgstr ""
 msgid "Select date"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2995
+#: erpnext/controllers/accounts_controller.py:2989
 msgid "Select finance book for the item {0} at row {1}"
 msgstr ""
 
@@ -48175,7 +48155,7 @@ msgstr ""
 msgid "Select the Default Workstation where the Operation will be performed. This will be fetched in BOMs and Work Orders."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1224
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1206
 msgid "Select the Item to be manufactured."
 msgstr ""
 
@@ -48192,7 +48172,7 @@ msgstr ""
 msgid "Select the customer or supplier."
 msgstr ""
 
-#: erpnext/assets/doctype/asset/asset.js:929
+#: erpnext/assets/doctype/asset/asset.js:931
 msgid "Select the date"
 msgstr ""
 
@@ -48227,7 +48207,7 @@ msgstr ""
 msgid "Selected POS Opening Entry should be open."
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2569
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2650
 msgid "Selected Price List should have buying and selling fields checked."
 msgstr ""
 
@@ -48258,22 +48238,22 @@ msgstr ""
 msgid "Self delivery"
 msgstr ""
 
-#: erpnext/assets/doctype/asset/asset.js:640
+#: erpnext/assets/doctype/asset/asset.js:642
 #: erpnext/stock/doctype/batch/batch_dashboard.py:9
 #: erpnext/stock/doctype/item/item_dashboard.py:20
 msgid "Sell"
 msgstr "Prodaja"
 
 #: erpnext/assets/doctype/asset/asset.js:171
-#: erpnext/assets/doctype/asset/asset.js:629
+#: erpnext/assets/doctype/asset/asset.js:631
 msgid "Sell Asset"
 msgstr ""
 
-#: erpnext/assets/doctype/asset/asset.js:634
+#: erpnext/assets/doctype/asset/asset.js:636
 msgid "Sell Qty"
 msgstr ""
 
-#: erpnext/assets/doctype/asset/asset.js:650
+#: erpnext/assets/doctype/asset/asset.js:652
 msgid "Sell quantity cannot exceed the asset quantity"
 msgstr ""
 
@@ -48281,7 +48261,7 @@ msgstr ""
 msgid "Sell quantity cannot exceed the asset quantity. Asset {0} has only {1} item(s)."
 msgstr ""
 
-#: erpnext/assets/doctype/asset/asset.js:646
+#: erpnext/assets/doctype/asset/asset.js:648
 msgid "Sell quantity must be greater than zero"
 msgstr ""
 
@@ -48534,7 +48514,7 @@ msgstr ""
 #: erpnext/manufacturing/doctype/job_card/job_card.json
 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:74
 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:114
-#: erpnext/public/js/controllers/transaction.js:2859
+#: erpnext/public/js/controllers/transaction.js:2861
 #: erpnext/public/js/utils/serial_no_batch_selector.js:433
 #: erpnext/selling/doctype/installation_note_item/installation_note_item.json
 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -48739,7 +48719,7 @@ msgstr ""
 msgid "Serial Nos are created successfully"
 msgstr ""
 
-#: erpnext/stock/stock_ledger.py:2330
+#: erpnext/stock/stock_ledger.py:2296
 msgid "Serial Nos are reserved in Stock Reservation Entries, you need to unreserve them before proceeding."
 msgstr ""
 
@@ -49223,7 +49203,7 @@ msgstr ""
 
 #. Label of the set_basic_rate_manually (Check) field in DocType 'Stock Entry
 #. Detail'
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:300
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:706
 #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
 msgid "Set Basic Rate Manually"
 msgstr ""
@@ -49242,8 +49222,8 @@ msgstr ""
 msgid "Set Dropship Items Delivered Quantity"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:418
-#: erpnext/manufacturing/doctype/job_card/job_card.js:487
+#: erpnext/manufacturing/doctype/job_card/job_card.js:363
+#: erpnext/manufacturing/doctype/job_card/job_card.js:425
 msgid "Set Finished Good Quantity"
 msgstr ""
 
@@ -49410,11 +49390,11 @@ msgstr ""
 msgid "Set closing balance as per bank statement"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:546
+#: erpnext/setup/doctype/company/company.py:550
 msgid "Set default inventory account for perpetual inventory"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:572
+#: erpnext/setup/doctype/company/company.py:576
 msgid "Set default {0} account for non stock items"
 msgstr ""
 
@@ -49446,7 +49426,7 @@ msgstr ""
 msgid "Set targets Item Group-wise for this Sales Person."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1281
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1263
 msgid "Set the Planned Start Date (an Estimated Date at which you want the Production to begin)"
 msgstr ""
 
@@ -49557,7 +49537,7 @@ msgid "Setting up company"
 msgstr ""
 
 #: erpnext/manufacturing/doctype/bom/bom.py:1227
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1497
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1498
 msgid "Setting {0} is required"
 msgstr ""
 
@@ -49577,6 +49557,10 @@ msgstr ""
 msgid "Settled"
 msgstr ""
 
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:33
+msgid "Settled with Credit Note"
+msgstr ""
+
 #. Title of an Onboarding Step
 #. Label of an action in the Onboarding Step 'Setup Company'
 #: erpnext/setup/onboarding_step/setup_company/setup_company.json
@@ -49769,7 +49753,7 @@ msgstr ""
 msgid "Shipment details"
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:805
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:846
 msgid "Shipments"
 msgstr ""
 
@@ -49807,7 +49791,7 @@ msgstr ""
 msgid "Shipping Address Template"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:576
+#: erpnext/controllers/accounts_controller.py:577
 msgid "Shipping Address does not belong to the {0}"
 msgstr ""
 
@@ -49950,8 +49934,8 @@ msgstr ""
 msgid "Short-term Investments"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:175
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:296
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:179
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:301
 msgid "Short-term Provisions"
 msgstr ""
 
@@ -50283,7 +50267,7 @@ msgstr ""
 msgid "Since there are active depreciable assets under this category, the following accounts are required. <br><br>"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:745
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:504
 msgid "Since there is a process loss of {0} units for the finished good {1}, you should reduce the quantity by {0} units for the finished good {1} in the Items Table."
 msgstr ""
 
@@ -50328,7 +50312,7 @@ msgstr ""
 
 #. Label of the skip_material_transfer (Check) field in DocType 'Work Order
 #. Operation'
-#: erpnext/manufacturing/doctype/work_order/work_order.js:380
+#: erpnext/manufacturing/doctype/work_order/work_order.js:361
 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
 #: erpnext/manufacturing/doctype/workstation/workstation.js:454
 msgid "Skip Material Transfer"
@@ -50370,8 +50354,8 @@ msgstr ""
 msgid "Soap & Detergent"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:62
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:107
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:66
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:112
 #: erpnext/setup/setup_wizard/data/industry_type.txt:45
 msgid "Software"
 msgstr ""
@@ -50395,7 +50379,7 @@ msgstr ""
 msgid "Solvency Ratios"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4391
+#: erpnext/controllers/accounts_controller.py:4379
 msgid "Some required Company details are missing. You don't have permission to update them. Please contact your System Manager."
 msgstr ""
 
@@ -50459,7 +50443,7 @@ msgstr ""
 msgid "Source Location"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1032
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1014
 msgid "Source Manufacture Entry"
 msgstr ""
 
@@ -50468,11 +50452,11 @@ msgstr ""
 msgid "Source Stock Entry (Manufacture)"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:907
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:524
 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:84
 msgid "Source Stock Entry {0} has no finished goods quantity"
 msgstr ""
 
@@ -50530,7 +50514,12 @@ msgstr ""
 msgid "Source Warehouse is mandatory for the Item {0}."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:304
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_receipt_issue.py:38
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:23
+msgid "Source Warehouse is required for item {0}"
+msgstr ""
+
+#: erpnext/manufacturing/doctype/work_order/work_order.py:305
 msgid "Source Warehouse {0} must be same as Customer Warehouse {1} in the Subcontracting Inward Order."
 msgstr ""
 
@@ -50538,23 +50527,22 @@ msgstr ""
 msgid "Source and Target Location cannot be same"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:873
-msgid "Source and target warehouse cannot be same for row {0}"
-msgstr ""
-
 #: erpnext/stock/dashboard/item_dashboard.js:295
 msgid "Source and target warehouse must be different"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:152
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:254
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:156
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:259
 msgid "Source of Funds (Liabilities)"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:840
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:856
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:863
-msgid "Source warehouse is mandatory for row {0}"
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:28
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:44
+msgid "Source or Target Warehouse is required for item {0}"
+msgstr ""
+
+#: erpnext/selling/doctype/sales_order/sales_order.py:465
+msgid "Source warehouse required for stock item {0}"
 msgstr ""
 
 #. Label of the sourced_by_supplier (Check) field in DocType 'BOM Creator Item'
@@ -50596,7 +50584,7 @@ msgstr ""
 msgid "Spent"
 msgstr ""
 
-#: erpnext/assets/doctype/asset/asset.js:690
+#: erpnext/assets/doctype/asset/asset.js:692
 #: erpnext/stock/doctype/batch/batch.js:104
 #: erpnext/stock/doctype/batch/batch.js:185
 #: erpnext/support/doctype/issue/issue.js:114
@@ -50604,7 +50592,7 @@ msgid "Split"
 msgstr "Razdeli"
 
 #: erpnext/assets/doctype/asset/asset.js:147
-#: erpnext/assets/doctype/asset/asset.js:674
+#: erpnext/assets/doctype/asset/asset.js:676
 msgid "Split Asset"
 msgstr ""
 
@@ -50628,7 +50616,7 @@ msgstr ""
 msgid "Split Issue"
 msgstr ""
 
-#: erpnext/assets/doctype/asset/asset.js:680
+#: erpnext/assets/doctype/asset/asset.js:682
 msgid "Split Qty"
 msgstr ""
 
@@ -50712,7 +50700,7 @@ msgstr ""
 msgid "Standard Description"
 msgstr ""
 
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:115
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:127
 msgid "Standard Rated Expenses"
 msgstr ""
 
@@ -50739,8 +50727,8 @@ msgstr ""
 msgid "Standard Terms and Conditions that can be added to Sales and Purchases. Examples: Validity of the offer, Payment Terms, Safety and Usage, etc."
 msgstr ""
 
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:96
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:102
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:108
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:114
 msgid "Standard rated supplies in {0}"
 msgstr ""
 
@@ -50775,7 +50763,7 @@ msgstr ""
 msgid "Start Date should be lower than End Date"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:223
+#: erpnext/manufacturing/doctype/job_card/job_card.js:658
 #: erpnext/manufacturing/doctype/workstation/workstation.js:124
 msgid "Start Job"
 msgstr ""
@@ -50904,7 +50892,7 @@ msgstr ""
 msgid "Status and Reference"
 msgstr ""
 
-#: erpnext/projects/doctype/project/project.py:716
+#: erpnext/projects/doctype/project/project.py:754
 msgid "Status must be Cancelled or Completed"
 msgstr ""
 
@@ -50942,8 +50930,8 @@ msgstr ""
 
 #. Option for the 'Account Type' (Select) field in DocType 'Account'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:96
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:158
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:100
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:163
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1362
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1388
 #: erpnext/accounts/report/account_balance/account_balance.js:58
@@ -51043,6 +51031,16 @@ msgstr ""
 msgid "Stock Closing Log"
 msgstr ""
 
+#. Option for the 'Account Type' (Select) field in DocType 'Account'
+#. Label of the stock_delivered_but_not_billed (Link) field in DocType
+#. 'Company'
+#: erpnext/accounts/doctype/account/account.json
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:38
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:65
+#: erpnext/setup/doctype/company/company.json
+msgid "Stock Delivered But Not Billed"
+msgstr ""
+
 #. Label of the warehouse_and_reference (Section Break) field in DocType 'POS
 #. Invoice Item'
 #. Label of the warehouse_and_reference (Section Break) field in DocType 'Sales
@@ -51052,10 +51050,6 @@ msgstr ""
 msgid "Stock Details"
 msgstr "Podrobnosti o Zalogi"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:997
-msgid "Stock Entries already created for Work Order {0}: {1}"
-msgstr ""
-
 #. Label of the stock_entry (Link) field in DocType 'Journal Entry'
 #. Label of a Link in the Manufacturing Workspace
 #. Option for the 'Receipt Document Type' (Select) field in DocType 'Landed
@@ -51119,7 +51113,7 @@ msgstr ""
 msgid "Stock Entry {0} created"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1527
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1544
 msgid "Stock Entry {0} has created"
 msgstr ""
 
@@ -51127,8 +51121,8 @@ msgstr ""
 msgid "Stock Entry {0} is not submitted"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:83
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:142
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:87
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:147
 msgid "Stock Expenses"
 msgstr ""
 
@@ -51206,8 +51200,8 @@ msgstr ""
 msgid "Stock Levels HTML"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:160
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:273
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:164
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:278
 msgid "Stock Liabilities"
 msgstr ""
 
@@ -51310,8 +51304,8 @@ msgstr ""
 #. Option for the 'Account Type' (Select) field in DocType 'Account'
 #. Label of the stock_received_but_not_billed (Link) field in DocType 'Company'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:161
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:274
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:165
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:279
 #: erpnext/accounts/report/account_balance/account_balance.js:59
 #: erpnext/setup/doctype/company/company.json
 msgid "Stock Received But Not Billed"
@@ -51360,9 +51354,9 @@ msgstr ""
 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:289
 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:297
 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:303
-#: erpnext/manufacturing/doctype/work_order/work_order.js:945
-#: erpnext/manufacturing/doctype/work_order/work_order.js:954
-#: erpnext/manufacturing/doctype/work_order/work_order.js:961
+#: erpnext/manufacturing/doctype/work_order/work_order.js:927
+#: erpnext/manufacturing/doctype/work_order/work_order.js:936
+#: erpnext/manufacturing/doctype/work_order/work_order.js:943
 #: erpnext/manufacturing/doctype/work_order/work_order_dashboard.py:14
 #: erpnext/public/js/stock_reservation.js:12
 #: erpnext/selling/doctype/sales_order/sales_order.js:109
@@ -51398,10 +51392,10 @@ msgstr ""
 msgid "Stock Reservation Entries Cancelled"
 msgstr ""
 
-#: erpnext/controllers/subcontracting_inward_controller.py:1021
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2148
-#: erpnext/selling/doctype/sales_order/sales_order.py:874
+#: erpnext/controllers/subcontracting_inward_controller.py:1029
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2261
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2150
+#: erpnext/selling/doctype/sales_order/sales_order.py:887
 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786
 msgid "Stock Reservation Entries Created"
 msgstr ""
@@ -51429,7 +51423,7 @@ msgstr ""
 msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:567
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:608
 msgid "Stock Reservation Warehouse Mismatch"
 msgstr ""
 
@@ -51469,7 +51463,7 @@ msgstr "Zaloga Rezervirana Količina (na Enoti Zaloge)"
 #: erpnext/selling/doctype/selling_settings/selling_settings.py:115
 #: erpnext/setup/doctype/company/company.json
 #: erpnext/setup/workspace/erpnext_settings/erpnext_settings.json
-#: erpnext/stock/doctype/item/item.js:420
+#: erpnext/stock/doctype/item/item.js:413
 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:681
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 #: erpnext/stock/workspace/stock/stock.json
@@ -51776,11 +51770,11 @@ msgstr ""
 msgid "Stop Reason"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1105
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1106
 msgid "Stopped Work Order cannot be cancelled, Unstop it first to cancel"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:383
+#: erpnext/setup/doctype/company/company.py:387
 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33
 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537
 #: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248
@@ -51841,7 +51835,7 @@ msgstr ""
 
 #. Label of the operation (Link) field in DocType 'Job Card Time Log'
 #. Name of a DocType
-#: erpnext/manufacturing/doctype/job_card/job_card.js:363
+#: erpnext/manufacturing/doctype/job_card/job_card.js:310
 #: erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json
 #: erpnext/manufacturing/doctype/sub_operation/sub_operation.json
 msgid "Sub Operation"
@@ -52103,7 +52097,7 @@ msgstr ""
 msgid "Subcontracting Order Supplied Item"
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:965
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:973
 msgid "Subcontracting Order {0} created."
 msgstr ""
 
@@ -52192,7 +52186,7 @@ msgstr ""
 msgid "Subdivision"
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:961
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:969
 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122
 msgid "Submit Action Failed"
 msgstr ""
@@ -52213,7 +52207,7 @@ msgstr ""
 msgid "Submit Journal Entries"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:192
+#: erpnext/manufacturing/doctype/work_order/work_order.js:173
 msgid "Submit this Work Order for further processing."
 msgstr ""
 
@@ -52658,7 +52652,7 @@ msgstr ""
 #: erpnext/accounts/doctype/tax_rule/tax_rule.json
 #: erpnext/accounts/report/accounts_payable/accounts_payable.js:119
 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:102
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1314
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1237
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:200
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:178
 #: erpnext/accounts/report/purchase_register/purchase_register.js:27
@@ -52757,7 +52751,7 @@ msgstr ""
 #. Label of the supplier_name (Data) field in DocType 'Purchase Receipt'
 #. Label of the supplier_name (Data) field in DocType 'Stock Entry'
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1229
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1152
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:157
 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:196
 #: erpnext/accounts/report/purchase_register/purchase_register.py:177
@@ -52845,7 +52839,7 @@ msgstr ""
 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:40
 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
-#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:235
+#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:240
 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:60
 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:256
 #: erpnext/buying/workspace/buying/buying.json
@@ -52874,7 +52868,7 @@ msgstr ""
 msgid "Supplier Quotation Item"
 msgstr ""
 
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:506
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:510
 msgid "Supplier Quotation {0} Created"
 msgstr ""
 
@@ -52963,7 +52957,7 @@ msgstr ""
 #. Label of the supplier_warehouse (Link) field in DocType 'Purchase Receipt'
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/buying/doctype/purchase_order/purchase_order.json
-#: erpnext/manufacturing/doctype/job_card/job_card.js:97
+#: erpnext/manufacturing/doctype/job_card/job_card.js:91
 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
 msgid "Supplier Warehouse"
 msgstr "Skladišče Dobavitelja"
@@ -52990,7 +52984,7 @@ msgstr ""
 msgid "Supplier of Goods or Services."
 msgstr ""
 
-#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:188
+#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:190
 msgid "Supplier {0} not found in {1}"
 msgstr ""
 
@@ -53003,8 +52997,8 @@ msgstr "Dobavitelj(ji)"
 msgid "Suppliers"
 msgstr "Dobavitelji"
 
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:60
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:122
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:72
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:134
 msgid "Supplies subject to the reverse charge provision"
 msgstr ""
 
@@ -53095,7 +53089,7 @@ msgstr ""
 msgid "Synchronize all accounts every hour"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:663
+#: erpnext/accounts/doctype/account/account.py:664
 msgid "System In Use"
 msgstr ""
 
@@ -53125,7 +53119,7 @@ msgstr ""
 msgid "System will fetch all the entries if limit value is zero."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2229
+#: erpnext/controllers/accounts_controller.py:2230
 msgid "System will not check over billing since amount for Item {0} in {1} is zero"
 msgstr ""
 
@@ -53146,7 +53140,7 @@ msgstr ""
 msgid "TDS Deducted"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:287
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:292
 msgid "TDS Payable"
 msgstr ""
 
@@ -53297,7 +53291,7 @@ msgstr ""
 msgid "Target Warehouse Address Link"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:249
+#: erpnext/manufacturing/doctype/work_order/work_order.py:250
 msgid "Target Warehouse Reservation Error"
 msgstr ""
 
@@ -53305,24 +53299,23 @@ msgstr ""
 msgid "Target Warehouse for Finished Good must be same as Finished Good Warehouse {1} in Work Order {2} linked to the Subcontracting Inward Order."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:793
+#: erpnext/manufacturing/doctype/work_order/work_order.py:794
 msgid "Target Warehouse is required before Submit"
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:885
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_receipt_issue.py:25
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:21
+msgid "Target Warehouse is required for item {0}"
+msgstr ""
+
+#: erpnext/controllers/selling_controller.py:886
 msgid "Target Warehouse is set for some items but the customer is not an internal customer."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:320
+#: erpnext/manufacturing/doctype/work_order/work_order.py:321
 msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcontracting Inward Order Item."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:846
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:852
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:867
-msgid "Target warehouse is mandatory for row {0}"
-msgstr ""
-
 #. Label of the targets (Table) field in DocType 'Sales Partner'
 #. Label of the targets (Table) field in DocType 'Sales Person'
 #. Label of the targets (Table) field in DocType 'Territory'
@@ -53439,8 +53432,8 @@ msgstr "Znesek DDV po Znesku Popusta (Valuta Podjetja)"
 msgid "Tax Amount will be rounded on a row(items) level"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:41
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:69
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:45
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:74
 #: erpnext/setup/setup_wizard/operations/taxes_setup.py:256
 msgid "Tax Assets"
 msgstr ""
@@ -53472,7 +53465,6 @@ msgstr ""
 msgid "Tax Breakup"
 msgstr "Razčlenitev DDV"
 
-#. Label of the tax_category (Link) field in DocType 'Address'
 #. Label of the tax_category (Link) field in DocType 'POS Invoice'
 #. Label of the tax_category (Link) field in DocType 'POS Profile'
 #. Label of the tax_category (Link) field in DocType 'Purchase Invoice'
@@ -53494,7 +53486,6 @@ msgstr "Razčlenitev DDV"
 #. Label of the tax_category (Link) field in DocType 'Item Tax'
 #. Label of the tax_category (Link) field in DocType 'Purchase Receipt'
 #. Label of a Workspace Sidebar Item
-#: erpnext/accounts/custom/address.json
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
 #: erpnext/accounts/doctype/pos_profile/pos_profile.json
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -53510,6 +53501,7 @@ msgstr "Razčlenitev DDV"
 #: erpnext/selling/doctype/customer/customer.json
 #: erpnext/selling/doctype/quotation/quotation.json
 #: erpnext/selling/doctype/sales_order/sales_order.json
+#: erpnext/setup/install.py:154
 #: erpnext/stock/doctype/delivery_note/delivery_note.json
 #: erpnext/stock/doctype/item_tax/item_tax.json
 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -53521,8 +53513,8 @@ msgstr "DDV Kategorija"
 msgid "Tax Category has been changed to \"Total\" because all the Items are non-stock items"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:136
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:230
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:140
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:235
 msgid "Tax Expense"
 msgstr ""
 
@@ -53596,7 +53588,7 @@ msgstr ""
 msgid "Tax Rates"
 msgstr ""
 
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:52
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:64
 msgid "Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme"
 msgstr ""
 
@@ -53614,7 +53606,7 @@ msgstr ""
 msgid "Tax Rule"
 msgstr ""
 
-#: erpnext/accounts/doctype/tax_rule/tax_rule.py:137
+#: erpnext/accounts/doctype/tax_rule/tax_rule.py:138
 msgid "Tax Rule Conflicts with {0}"
 msgstr ""
 
@@ -53629,7 +53621,7 @@ msgstr ""
 msgid "Tax Template"
 msgstr ""
 
-#: erpnext/accounts/doctype/tax_rule/tax_rule.py:85
+#: erpnext/accounts/doctype/tax_rule/tax_rule.py:86
 msgid "Tax Template is mandatory."
 msgstr ""
 
@@ -53981,8 +53973,8 @@ msgstr ""
 msgid "Telecommunications"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:127
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:213
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:131
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:218
 msgid "Telephone Expenses"
 msgstr ""
 
@@ -54033,13 +54025,13 @@ msgstr ""
 msgid "Temporary"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:73
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:129
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:77
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:134
 msgid "Temporary Accounts"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:74
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:130
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:78
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:135
 msgid "Temporary Opening"
 msgstr ""
 
@@ -54221,7 +54213,7 @@ msgstr ""
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 #: erpnext/accounts/doctype/territory_item/territory_item.json
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:142
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1298
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1221
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:108
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:184
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:68
@@ -54320,7 +54312,7 @@ msgstr ""
 msgid "The 'From Package No.' field must neither be empty nor it's value less than 1."
 msgstr ""
 
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:415
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:419
 msgid "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings."
 msgstr ""
 
@@ -54373,7 +54365,8 @@ msgstr ""
 msgid "The Pick List having Stock Reservation Entries cannot be updated. If you need to make changes, we recommend canceling the existing Stock Reservation Entries before updating the Pick List."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1428
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:119
 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty"
 msgstr ""
 
@@ -54389,7 +54382,7 @@ msgstr ""
 msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:934
 msgid "The Serial and Batch Bundle {0} is not valid for this transaction. The 'Type of Transaction' should be 'Outward' instead of 'Inward' in Serial and Batch Bundle {0}"
 msgstr ""
 
@@ -54425,7 +54418,7 @@ msgstr ""
 msgid "The bank account is not a company account. Please select a company account"
 msgstr ""
 
-#: erpnext/controllers/stock_controller.py:1318
+#: erpnext/controllers/stock_controller.py:1319
 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}."
 msgstr ""
 
@@ -54433,7 +54426,11 @@ msgstr ""
 msgid "The company {0} is not in South Africa. VAT Audit Report is only available for companies in South Africa."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1320
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:21
+msgid "The company {0} is not in United Arab Emirates. UAE VAT 201 report is only available for companies in United Arab Emirates."
+msgstr ""
+
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1328
 msgid "The completed quantity {0} of an operation {1} cannot be greater than the completed quantity {2} of a previous operation {3}."
 msgstr ""
 
@@ -54453,7 +54450,7 @@ msgstr ""
 msgid "The date of the transaction"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1229
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1211
 msgid "The default BOM for that item will be fetched by the system. You can also change the BOM."
 msgstr ""
 
@@ -54486,7 +54483,7 @@ msgstr ""
 msgid "The field To Shareholder cannot be blank"
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:418
 msgid "The field {0} in row {1} is not set"
 msgstr ""
 
@@ -54527,7 +54524,7 @@ msgstr ""
 msgid "The following batches are expired, please restock them: <br> {0}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:427
+#: erpnext/controllers/accounts_controller.py:428
 msgid "The following cancelled repost entries exist for <b>{0}</b>:<br><br>{1}<br><br>Kindly delete these entries before continuing."
 msgstr ""
 
@@ -54552,7 +54549,7 @@ msgstr ""
 msgid "The following rows are duplicates:"
 msgstr ""
 
-#: erpnext/stock/doctype/material_request/material_request.py:872
+#: erpnext/stock/doctype/material_request/material_request.py:871
 msgid "The following {0} were created: {1}"
 msgstr ""
 
@@ -54637,7 +54634,7 @@ msgstr ""
 msgid "The original invoice should be consolidated before or along with the return invoice."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:205
+#: erpnext/controllers/accounts_controller.py:206
 msgid "The outstanding amount {0} in {1} is lesser than {2}. Updating the outstanding to this invoice."
 msgstr ""
 
@@ -54690,7 +54687,7 @@ msgstr ""
 msgid "The reserved stock will be released. Are you certain you wish to proceed?"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:218
+#: erpnext/accounts/doctype/account/account.py:219
 msgid "The root account {0} must be a group"
 msgstr ""
 
@@ -54706,7 +54703,7 @@ msgstr ""
 msgid "The selected item cannot have Batch"
 msgstr ""
 
-#: erpnext/assets/doctype/asset/asset.js:655
+#: erpnext/assets/doctype/asset/asset.js:657
 msgid "The sell quantity is less than the total asset quantity. The remaining quantity will be split into a new asset. This action cannot be undone. <br><br><b>Do you want to continue?</b>"
 msgstr ""
 
@@ -54813,15 +54810,15 @@ msgstr ""
 msgid "The value {0} is already assigned to an existing Item {1}."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1257
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1239
 msgid "The warehouse where you store finished Items before they are shipped."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1250
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1232
 msgid "The warehouse where you store your raw materials. Each required item can have a separate source warehouse. Group warehouse also can be selected as source warehouse. On submission of the Work Order, the raw materials will be reserved in these warehouses for production usage."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1262
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1244
 msgid "The warehouse where your Items will be transferred when you begin production. Group Warehouse can also be selected as a Work in Progress warehouse."
 msgstr ""
 
@@ -54829,11 +54826,11 @@ msgstr ""
 msgid "The withdrawal or deposit amounts - only required if there's no amount column."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:893
+#: erpnext/manufacturing/doctype/job_card/job_card.py:896
 msgid "The {0} ({1}) must be equal to {2} ({3})"
 msgstr ""
 
-#: erpnext/public/js/controllers/transaction.js:3328
+#: erpnext/public/js/controllers/transaction.js:3330
 msgid "The {0} contains Unit Price Items."
 msgstr ""
 
@@ -54841,7 +54838,7 @@ msgstr ""
 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error."
 msgstr ""
 
-#: erpnext/stock/doctype/material_request/material_request.py:878
+#: erpnext/stock/doctype/material_request/material_request.py:877
 msgid "The {0} {1} created successfully"
 msgstr ""
 
@@ -54849,7 +54846,7 @@ msgstr ""
 msgid "The {0} {1} does not match with the {0} {2} in the {3} {4}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:996
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1002
 msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
 msgstr ""
 
@@ -54865,7 +54862,7 @@ msgstr ""
 msgid "There are inconsistencies between the rate, no of shares and the amount calculated"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:203
+#: erpnext/accounts/doctype/account/account.py:204
 msgid "There are ledger entries against this account. Changing {0} to non-{1} in live system will cause incorrect output in 'Accounts {2}' report"
 msgstr ""
 
@@ -54894,7 +54891,7 @@ msgstr ""
 msgid "There are no transactions in the system for the selected bank account and dates that match the filters."
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:1177
+#: erpnext/stock/doctype/item/item.js:1164
 msgid "There are two options to maintain valuation of stock. FIFO (first in - first out) and Moving Average. To understand this topic in detail please visit <a href='https://docs.frappe.io/erpnext/user/manual/en/calculation-of-valuation-rate-in-fifo-and-moving-average' target='_blank'>Item Valuation, FIFO and Moving Average.</a>"
 msgstr ""
 
@@ -54934,7 +54931,7 @@ msgstr ""
 msgid "There is one unreconciled transaction before {0}."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:871
 msgid "There must be atleast 1 Finished Good in this Stock Entry"
 msgstr ""
 
@@ -54990,11 +54987,11 @@ msgstr ""
 msgid "This Month's Summary"
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:974
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:982
 msgid "This Purchase Order has been fully subcontracted."
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:2187
+#: erpnext/selling/doctype/sales_order/sales_order.py:2209
 msgid "This Sales Order has been fully subcontracted."
 msgstr ""
 
@@ -55131,11 +55128,11 @@ msgstr ""
 msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1243
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1225
 msgid "This is enabled by default. If you want to plan materials for sub-assemblies of the Item you're manufacturing leave this enabled. If you plan and manufacture the sub-assemblies separately, you can disable this checkbox."
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:1165
+#: erpnext/stock/doctype/item/item.js:1152
 msgid "This is for raw material Items that'll be used to create finished goods. If the Item is an additional service like 'washing' that'll be used in the BOM, keep this unchecked."
 msgstr ""
 
@@ -55297,7 +55294,7 @@ msgstr ""
 msgid "This will restrict user access to other employee records"
 msgstr ""
 
-#: erpnext/controllers/selling_controller.py:886
+#: erpnext/controllers/selling_controller.py:887
 msgid "This {} will be treated as material transfer."
 msgstr ""
 
@@ -55408,7 +55405,7 @@ msgstr ""
 msgid "Time in mins."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:872
+#: erpnext/manufacturing/doctype/job_card/job_card.py:873
 msgid "Time logs are required for {0} {1}"
 msgstr ""
 
@@ -55517,7 +55514,7 @@ msgstr "Za Fakturiranje"
 msgid "To Currency"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:626
+#: erpnext/controllers/accounts_controller.py:627
 #: erpnext/setup/doctype/holiday_list/holiday_list.py:121
 msgid "To Date cannot be before From Date"
 msgstr ""
@@ -55791,7 +55788,7 @@ msgid "To include sub-assembly costs and secondary items in Finished Goods on a
 msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:2249
-#: erpnext/controllers/accounts_controller.py:3255
+#: erpnext/controllers/accounts_controller.py:3249
 msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included"
 msgstr ""
 
@@ -55803,7 +55800,7 @@ msgstr ""
 msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:554
+#: erpnext/accounts/doctype/account/account.py:555
 msgid "To overrule this, enable '{0}' in company {1}"
 msgstr ""
 
@@ -56085,12 +56082,12 @@ msgstr ""
 
 #. Label of the total_completed_qty (Float) field in DocType 'Job Card'
 #: erpnext/manufacturing/doctype/job_card/job_card.json
-#: erpnext/manufacturing/doctype/job_card/job_card.py:889
+#: erpnext/manufacturing/doctype/job_card/job_card.py:892
 #: erpnext/manufacturing/report/job_card_summary/job_card_summary.py:174
 msgid "Total Completed Qty"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:191
+#: erpnext/manufacturing/doctype/job_card/job_card.py:192
 msgid "Total Completed Qty is required for Job Card {0}, please start and complete the job card before submission"
 msgstr ""
 
@@ -56392,7 +56389,7 @@ msgstr ""
 msgid "Total Paid Amount"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2801
+#: erpnext/controllers/accounts_controller.py:2802
 msgid "Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total"
 msgstr ""
 
@@ -56404,7 +56401,7 @@ msgstr ""
 msgid "Total Payments"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:724
+#: erpnext/selling/doctype/sales_order/sales_order.py:727
 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings."
 msgstr ""
 
@@ -56687,7 +56684,7 @@ msgstr ""
 msgid "Total allocated percentage for sales team should be 100"
 msgstr ""
 
-#: erpnext/selling/doctype/customer/customer.py:194
+#: erpnext/selling/doctype/customer/customer.py:184
 msgid "Total contribution percentage should be equal to 100"
 msgstr ""
 
@@ -56862,7 +56859,7 @@ msgstr ""
 msgid "Transaction Dates"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:1093
+#: erpnext/setup/doctype/company/company.py:1097
 msgid "Transaction Deletion Document {0} has been triggered for company {1}"
 msgstr ""
 
@@ -56886,11 +56883,11 @@ msgstr ""
 msgid "Transaction Deletion Record To Delete"
 msgstr ""
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1102
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1103
 msgid "Transaction Deletion Record {0} is already running. {1}"
 msgstr ""
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1121
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1122
 msgid "Transaction Deletion Record {0} is currently deleting {1}. Cannot save documents until deletion completes."
 msgstr ""
 
@@ -56995,7 +56992,8 @@ msgstr ""
 msgid "Transaction from which tax is withheld"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:865
+#: erpnext/manufacturing/doctype/job_card/job_card.py:866
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/base.py:38
 msgid "Transaction not allowed against stopped Work Order {0}"
 msgstr ""
 
@@ -57227,8 +57225,8 @@ msgstr ""
 msgid "Transporter Name"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:128
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:214
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:132
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:219
 msgid "Travel Expenses"
 msgstr ""
 
@@ -57507,7 +57505,7 @@ msgstr ""
 #: erpnext/stock/report/item_prices/item_prices.py:55
 #: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60
 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:186
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:174
 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59
 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136
 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json
@@ -57568,7 +57566,7 @@ msgstr ""
 msgid "UOM Conversion Factor"
 msgstr "Faktor Pretvorbe Enote"
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1467
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1469
 msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}"
 msgstr ""
 
@@ -57581,7 +57579,7 @@ msgstr ""
 msgid "UOM Name"
 msgstr "Ime Enote"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1711
 msgid "UOM conversion factor required for UOM: {0} in Item: {1}"
 msgstr ""
 
@@ -57653,7 +57651,7 @@ msgstr ""
 msgid "Unable to find score starting at {0}. You need to have standing scores covering 0 to 100"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1063
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1064
 msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}."
 msgstr ""
 
@@ -57740,7 +57738,7 @@ msgstr ""
 msgid "Undo {}?"
 msgstr ""
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:937
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:938
 msgid "Unexpected Naming Series Pattern"
 msgstr ""
 
@@ -57759,7 +57757,7 @@ msgstr "Enota"
 msgid "Unit Of Measure"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3925
+#: erpnext/controllers/accounts_controller.py:3931
 msgid "Unit Price"
 msgstr ""
 
@@ -57921,7 +57919,7 @@ msgstr ""
 msgid "Unreconciled Transactions"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:952
+#: erpnext/manufacturing/doctype/work_order/work_order.js:934
 #: erpnext/selling/doctype/sales_order/sales_order.js:122
 #: erpnext/stock/doctype/pick_list/pick_list.js:161
 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:192
@@ -57961,8 +57959,8 @@ msgstr ""
 msgid "Unscheduled"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:178
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:305
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:182
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:310
 msgid "Unsecured Loans"
 msgstr ""
 
@@ -58142,7 +58140,7 @@ msgstr ""
 #. Invoice'
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/controllers/accounts_controller.py:198
+#: erpnext/controllers/accounts_controller.py:199
 msgid "Update Outstanding for Self"
 msgstr ""
 
@@ -58225,7 +58223,7 @@ msgstr ""
 msgid "Updating Variants..."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1205
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1187
 msgid "Updating Work Order status"
 msgstr ""
 
@@ -58427,7 +58425,7 @@ msgstr ""
 msgid "Use Transaction Date Exchange Rate"
 msgstr ""
 
-#: erpnext/projects/doctype/project/project.py:567
+#: erpnext/projects/doctype/project/project.py:605
 msgid "Use a name that is different from previous project name"
 msgstr ""
 
@@ -58469,7 +58467,7 @@ msgstr ""
 msgid "Used with Financial Report Template"
 msgstr ""
 
-#: erpnext/setup/install.py:204
+#: erpnext/setup/install.py:236
 msgid "User Forum"
 msgstr ""
 
@@ -58555,8 +58553,8 @@ msgstr ""
 msgid "Using negative stock disables FIFO/Moving average valuation when inventory is negative."
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:129
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:215
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:133
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:220
 msgid "Utility Expenses"
 msgstr ""
 
@@ -58566,7 +58564,7 @@ msgstr ""
 msgid "VAT Accounts"
 msgstr ""
 
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:28
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:40
 msgid "VAT Amount (AED)"
 msgstr ""
 
@@ -58576,12 +58574,12 @@ msgid "VAT Audit Report"
 msgstr ""
 
 #: erpnext/regional/report/uae_vat_201/uae_vat_201.html:47
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:111
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:123
 msgid "VAT on Expenses and All Other Inputs"
 msgstr ""
 
 #: erpnext/regional/report/uae_vat_201/uae_vat_201.html:15
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:45
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:57
 msgid "VAT on Sales and All Other Outputs"
 msgstr ""
 
@@ -58806,11 +58804,11 @@ msgstr "Stopnja Vrednotenja"
 msgid "Valuation Rate (In / Out)"
 msgstr ""
 
-#: erpnext/stock/stock_ledger.py:2075
+#: erpnext/stock/stock_ledger.py:2041
 msgid "Valuation Rate Missing"
 msgstr ""
 
-#: erpnext/stock/stock_ledger.py:2053
+#: erpnext/stock/stock_ledger.py:2019
 msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}."
 msgstr ""
 
@@ -58842,7 +58840,7 @@ msgid "Valuation rate for the item as per Sales Invoice (Only for Internal Trans
 msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:2273
-#: erpnext/controllers/accounts_controller.py:3279
+#: erpnext/controllers/accounts_controller.py:3273
 msgid "Valuation type charges can not be marked as Inclusive"
 msgstr ""
 
@@ -58854,7 +58852,7 @@ msgstr ""
 msgid "Value (G - D)"
 msgstr ""
 
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:229
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:217
 msgid "Value ({0})"
 msgstr ""
 
@@ -59026,7 +59024,7 @@ msgstr ""
 msgid "Variant Of"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:857
+#: erpnext/stock/doctype/item/item.js:844
 msgid "Variant creation has been queued."
 msgstr ""
 
@@ -59392,7 +59390,7 @@ msgstr ""
 #: erpnext/accounts/doctype/repost_accounting_ledger_items/repost_accounting_ledger_items.json
 #: erpnext/accounts/doctype/repost_payment_ledger_items/repost_payment_ledger_items.json
 #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1253
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1176
 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56
 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221
 #: erpnext/accounts/report/general_ledger/general_ledger.js:49
@@ -59466,7 +59464,7 @@ msgstr ""
 #: erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json
 #: erpnext/accounts/doctype/repost_payment_ledger_items/repost_payment_ledger_items.json
 #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1174
 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212
 #: erpnext/accounts/report/general_ledger/general_ledger.py:760
 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
@@ -59674,7 +59672,7 @@ msgid "Warehouse not found against the account {0}"
 msgstr ""
 
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1215
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:444
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:445
 msgid "Warehouse required for stock Item {0}"
 msgstr ""
 
@@ -59699,7 +59697,7 @@ msgstr ""
 msgid "Warehouse {0} does not exist"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:246
+#: erpnext/manufacturing/doctype/work_order/work_order.py:247
 msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}"
 msgstr ""
 
@@ -59836,7 +59834,7 @@ msgstr ""
 msgid "Warning: Material Requested Qty is less than Minimum Order Qty"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1482
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1483
 msgid "Warning: Quantity exceeds maximum producible quantity based on quantity of raw materials received through the Subcontracting Inward Order {0}."
 msgstr ""
 
@@ -59930,7 +59928,7 @@ msgstr ""
 msgid "Wavelength In Megametres"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:193
+#: erpnext/controllers/accounts_controller.py:194
 msgid "We can see {0} is made against {1}. If you want {1}'s outstanding to be updated, uncheck the '{2}' checkbox."
 msgstr ""
 
@@ -60129,7 +60127,7 @@ msgstr ""
 msgid "When checked, the system will use the posting datetime of the document for naming the document instead of the creation datetime of the document."
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:1184
+#: erpnext/stock/doctype/item/item.js:1171
 msgid "When creating an Item, entering a value for this field will automatically create an Item Price at the backend."
 msgstr ""
 
@@ -60139,7 +60137,7 @@ msgstr ""
 msgid "When enabled, it adds a cutoff date filter to Delivery Notes created in bulk from Sales Orders. This allows you to process orders only with a transaction date up to the specified cutoff date, which is useful for period-end processing and batch fulfillment."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:297
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:703
 msgid "When there are multiple finished goods ({0}) in a Repack stock entry, the basic rate for all finished goods must be set manually. To set rate manually, enable the checkbox 'Set Basic Rate Manually' in the respective finished good row."
 msgstr ""
 
@@ -60149,11 +60147,11 @@ msgstr ""
 msgid "When you pay for something upfront (like annual insurance), the cost is held here and recognized gradually over time"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:380
+#: erpnext/accounts/doctype/account/account.py:381
 msgid "While creating account for Child Company {0}, parent account {1} found as a ledger account."
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:370
+#: erpnext/accounts/doctype/account/account.py:371
 msgid "While creating account for Child Company {0}, parent account {1} not found. Please create the parent account in corresponding COA"
 msgstr ""
 
@@ -60298,7 +60296,7 @@ msgstr ""
 #: erpnext/assets/doctype/asset/asset_list.js:12
 #: erpnext/manufacturing/doctype/job_card/job_card.json
 #: erpnext/manufacturing/doctype/job_card_operation/job_card_operation.json
-#: erpnext/setup/doctype/company/company.py:384
+#: erpnext/setup/doctype/company/company.py:388
 #: erpnext/support/doctype/warranty_claim/warranty_claim.json
 msgid "Work In Progress"
 msgstr ""
@@ -60335,7 +60333,7 @@ msgstr ""
 #: erpnext/selling/doctype/sales_order/sales_order.js:1094
 #: erpnext/stock/doctype/material_request/material_request.js:216
 #: erpnext/stock/doctype/material_request/material_request.json
-#: erpnext/stock/doctype/material_request/material_request.py:879
+#: erpnext/stock/doctype/material_request/material_request.py:878
 #: erpnext/stock/doctype/pick_list/pick_list.json
 #: erpnext/stock/doctype/serial_no/serial_no.json
 #: erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -60369,7 +60367,7 @@ msgstr ""
 msgid "Work Order Item"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:910
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:527
 msgid "Work Order Mismatch"
 msgstr ""
 
@@ -60410,19 +60408,23 @@ msgstr ""
 msgid "Work Order Summary Report"
 msgstr ""
 
-#: erpnext/stock/doctype/material_request/material_request.py:885
+#: erpnext/stock/doctype/material_request/material_request.py:884
 msgid "Work Order cannot be created for following reason: <br> {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1426
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1427
 msgid "Work Order cannot be raised against a Item Template"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2510
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2590
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2508
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2588
 msgid "Work Order has been {0}"
 msgstr ""
 
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:285
+msgid "Work Order is mandatory"
+msgstr ""
+
 #: erpnext/selling/doctype/sales_order/sales_order.js:1297
 msgid "Work Order not created"
 msgstr ""
@@ -60431,16 +60433,16 @@ msgstr ""
 msgid "Work Order {0} created"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:100
 msgid "Work Order {0} has no produced qty"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:947
-msgid "Work Order {0}: Job Card not found for the operation {1}"
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/base.py:35
+msgid "Work Order {0} must be submitted"
 msgstr ""
 
 #: erpnext/manufacturing/report/job_card_summary/job_card_summary.js:56
-#: erpnext/stock/doctype/material_request/material_request.py:873
+#: erpnext/stock/doctype/material_request/material_request.py:872
 msgid "Work Orders"
 msgstr ""
 
@@ -60465,7 +60467,7 @@ msgstr ""
 msgid "Work-in-Progress Warehouse"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:791
+#: erpnext/manufacturing/doctype/work_order/work_order.py:792
 msgid "Work-in-Progress Warehouse is required before Submit"
 msgstr ""
 
@@ -60513,7 +60515,7 @@ msgstr ""
 #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
 #: erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json
 #: erpnext/manufacturing/doctype/job_card/job_card.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:344
+#: erpnext/manufacturing/doctype/work_order/work_order.js:325
 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
 #: erpnext/manufacturing/doctype/workstation/workstation.json
 #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.js:35
@@ -60604,14 +60606,14 @@ msgstr ""
 #. Label of the write_off (Section Break) field in DocType 'Purchase Invoice'
 #. Label of the write_off_section (Section Break) field in DocType 'Sales
 #. Invoice'
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:130
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:216
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:134
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:221
 #: erpnext/accounts/doctype/journal_entry/journal_entry.json
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
 #: erpnext/accounts/doctype/pos_profile/pos_profile.json
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/setup/doctype/company/company.py:666
+#: erpnext/setup/doctype/company/company.py:671
 msgid "Write Off"
 msgstr "Odpis"
 
@@ -60716,7 +60718,7 @@ msgstr ""
 msgid "Wrong Company"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.js:233
+#: erpnext/setup/doctype/company/company.js:249
 msgid "Wrong Password"
 msgstr ""
 
@@ -60772,7 +60774,7 @@ msgstr ""
 msgid "You are importing data for the code list:"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4029
+#: erpnext/controllers/accounts_controller.py:4035
 msgid "You are not allowed to update as per the conditions set in {} Workflow."
 msgstr ""
 
@@ -60784,7 +60786,7 @@ msgstr ""
 msgid "You are not authorized to make/edit Stock Transactions for Item {0} under warehouse {1} before this time."
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:312
+#: erpnext/accounts/doctype/account/account.py:313
 msgid "You are not authorized to set Frozen value"
 msgstr ""
 
@@ -60853,11 +60855,11 @@ msgstr ""
 msgid "You can set up the rule to split the transaction across multiple accounts."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:214
+#: erpnext/controllers/accounts_controller.py:215
 msgid "You can use {0} to reconcile against {1} later."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1332
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1340
 msgid "You can't make any changes to Job Card since Work Order is closed."
 msgstr ""
 
@@ -60942,7 +60944,7 @@ msgstr ""
 msgid "You do not have permission to import bank transactions"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4005
+#: erpnext/controllers/accounts_controller.py:4011
 msgid "You do not have permissions to {} items in a {}."
 msgstr ""
 
@@ -60954,19 +60956,19 @@ msgstr ""
 msgid "You don't have enough points to redeem."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4466
+#: erpnext/controllers/accounts_controller.py:4454
 msgid "You don't have permission to create a Company Address. Please contact your System Manager."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4446
+#: erpnext/controllers/accounts_controller.py:4434
 msgid "You don't have permission to update Company details. Please contact your System Manager."
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:576
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:575
 msgid "You don't have permission to update Received Qty DocField for item {0}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4440
+#: erpnext/controllers/accounts_controller.py:4428
 msgid "You don't have permission to update this document. Please contact your System Manager."
 msgstr ""
 
@@ -60978,7 +60980,7 @@ msgstr ""
 msgid "You have already selected items from {0} {1}"
 msgstr ""
 
-#: erpnext/projects/doctype/project/project.py:362
+#: erpnext/projects/doctype/project/project.py:400
 msgid "You have been invited to collaborate on the project {0}."
 msgstr ""
 
@@ -61018,7 +61020,7 @@ msgstr ""
 msgid "You need to cancel POS Closing Entry {} to be able to cancel this document."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3230
+#: erpnext/controllers/accounts_controller.py:3224
 msgid "You selected the account group {1} as {2} Account in row {0}. Please select a single account."
 msgstr ""
 
@@ -61065,11 +61067,11 @@ msgstr ""
 msgid "Zero Balance"
 msgstr ""
 
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:65
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:77
 msgid "Zero Rated"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:621
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:195
 msgid "Zero quantity"
 msgstr ""
 
@@ -61095,7 +61097,7 @@ msgstr ""
 msgid "`Allow Negative rates for Items`"
 msgstr ""
 
-#: erpnext/stock/stock_ledger.py:2067
+#: erpnext/stock/stock_ledger.py:2033
 msgid "after"
 msgstr ""
 
@@ -61285,7 +61287,7 @@ msgstr ""
 msgid "per hour"
 msgstr ""
 
-#: erpnext/stock/stock_ledger.py:2068
+#: erpnext/stock/stock_ledger.py:2034
 msgid "performing either one below:"
 msgstr ""
 
@@ -61380,7 +61382,7 @@ msgstr ""
 msgid "to"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3176
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3257
 msgid "to unallocate the amount of this Return Invoice before cancelling it."
 msgstr ""
 
@@ -61407,7 +61409,7 @@ msgstr ""
 msgid "unique e.g. SAVE20  To be used to get discount"
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:606
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:605
 msgid "updated delivered quantity for item {0} to {1}"
 msgstr ""
 
@@ -61429,7 +61431,7 @@ msgstr ""
 msgid "you must select Capital Work in Progress Account in accounts table"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:1286
+#: erpnext/controllers/accounts_controller.py:1287
 msgid "{0} '{1}' is disabled"
 msgstr ""
 
@@ -61437,7 +61439,7 @@ msgstr ""
 msgid "{0} '{1}' not in Fiscal Year {2}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:677
+#: erpnext/manufacturing/doctype/work_order/work_order.py:678
 msgid "{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3}"
 msgstr ""
 
@@ -61445,7 +61447,7 @@ msgstr ""
 msgid "{0} <b>{1}</b> has submitted Assets. Remove Item <b>{2}</b> from table to continue."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2383
+#: erpnext/controllers/accounts_controller.py:2384
 msgid "{0} Account not found against Customer {1}."
 msgstr ""
 
@@ -61478,11 +61480,11 @@ msgstr ""
 msgid "{0} Number {1} is already used in {2} {3}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/bom/bom.py:1689
+#: erpnext/manufacturing/doctype/bom/bom.py:1703
 msgid "{0} Operating Cost for operation {1}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:578
+#: erpnext/manufacturing/doctype/work_order/work_order.js:560
 msgid "{0} Operations: {1}"
 msgstr ""
 
@@ -61578,7 +61580,7 @@ msgstr ""
 msgid "{0} creation for the following records will be skipped."
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:291
+#: erpnext/setup/doctype/company/company.py:295
 msgid "{0} currency must be same as company's default currency. Please select another account."
 msgstr ""
 
@@ -61594,7 +61596,7 @@ msgstr ""
 msgid "{0} does not belong to Company {1}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:353
+#: erpnext/controllers/accounts_controller.py:354
 msgid "{0} does not belong to the Company {1}."
 msgstr ""
 
@@ -61628,7 +61630,7 @@ msgstr ""
 msgid "{0} hours"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2741
+#: erpnext/controllers/accounts_controller.py:2742
 msgid "{0} in row {1}"
 msgstr ""
 
@@ -61650,7 +61652,7 @@ msgstr ""
 msgid "{0} is already running for {1}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:175
+#: erpnext/controllers/accounts_controller.py:176
 msgid "{0} is blocked so this transaction cannot proceed"
 msgstr ""
 
@@ -61671,7 +61673,7 @@ msgstr ""
 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3187
+#: erpnext/controllers/accounts_controller.py:3181
 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}."
 msgstr ""
 
@@ -61679,7 +61681,7 @@ msgstr ""
 msgid "{0} is not a CSV file."
 msgstr ""
 
-#: erpnext/selling/doctype/customer/customer.py:236
+#: erpnext/selling/doctype/customer/customer.py:226
 msgid "{0} is not a company bank account"
 msgstr ""
 
@@ -61687,7 +61689,7 @@ msgstr ""
 msgid "{0} is not a group node. Please select a group node as parent cost center"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:673
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:114
 msgid "{0} is not a stock Item"
 msgstr ""
 
@@ -61727,27 +61729,27 @@ msgstr ""
 msgid "{0} is open. Close the POS or cancel the existing POS Opening Entry to create a new POS Opening Entry."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:543
+#: erpnext/manufacturing/doctype/work_order/work_order.js:525
 msgid "{0} items disassembled"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:507
+#: erpnext/manufacturing/doctype/work_order/work_order.js:489
 msgid "{0} items in progress"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:531
+#: erpnext/manufacturing/doctype/work_order/work_order.js:513
 msgid "{0} items lost during process."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:488
+#: erpnext/manufacturing/doctype/work_order/work_order.js:470
 msgid "{0} items produced"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:511
+#: erpnext/manufacturing/doctype/work_order/work_order.js:493
 msgid "{0} items returned"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:514
+#: erpnext/manufacturing/doctype/work_order/work_order.js:496
 msgid "{0} items to return"
 msgstr ""
 
@@ -61755,7 +61757,7 @@ msgstr ""
 msgid "{0} must be negative in return document"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2366
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2447
 msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
 msgstr ""
 
@@ -61771,7 +61773,7 @@ msgstr ""
 msgid "{0} payment entries can not be filtered by {1}"
 msgstr ""
 
-#: erpnext/controllers/stock_controller.py:1740
+#: erpnext/controllers/stock_controller.py:1741
 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
 msgstr ""
 
@@ -61800,16 +61802,16 @@ msgstr ""
 msgid "{0} units of {1} are required in {2} with the inventory dimension: {3} on {4} {5} for {6} to complete the transaction."
 msgstr ""
 
-#: erpnext/stock/stock_ledger.py:1720 erpnext/stock/stock_ledger.py:2216
-#: erpnext/stock/stock_ledger.py:2230
+#: erpnext/stock/stock_ledger.py:1686 erpnext/stock/stock_ledger.py:2182
+#: erpnext/stock/stock_ledger.py:2196
 msgid "{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction."
 msgstr ""
 
-#: erpnext/stock/stock_ledger.py:2317 erpnext/stock/stock_ledger.py:2362
+#: erpnext/stock/stock_ledger.py:2283 erpnext/stock/stock_ledger.py:2328
 msgid "{0} units of {1} needed in {2} on {3} {4} to complete this transaction."
 msgstr ""
 
-#: erpnext/stock/stock_ledger.py:1714
+#: erpnext/stock/stock_ledger.py:1680
 msgid "{0} units of {1} needed in {2} to complete this transaction."
 msgstr ""
 
@@ -61821,7 +61823,7 @@ msgstr ""
 msgid "{0} valid serial nos for Item {1}"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:862
+#: erpnext/stock/doctype/item/item.js:849
 msgid "{0} variants created."
 msgstr ""
 
@@ -61837,7 +61839,7 @@ msgstr ""
 msgid "{0} will be set as the {1} in subsequently scanned items"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1005
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1011
 msgid "{0} {1}"
 msgstr ""
 
@@ -61875,8 +61877,8 @@ msgstr ""
 msgid "{0} {1} has already been partly paid. Please use the 'Get Outstanding Invoice' or the 'Get Outstanding Orders' button to get the latest outstanding amounts."
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:414
-#: erpnext/selling/doctype/sales_order/sales_order.py:602
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:413
+#: erpnext/selling/doctype/sales_order/sales_order.py:605
 #: erpnext/stock/doctype/material_request/material_request.py:257
 msgid "{0} {1} has been modified. Please refresh."
 msgstr ""
@@ -61986,7 +61988,7 @@ msgstr ""
 msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
 msgstr ""
 
-#: erpnext/controllers/stock_controller.py:953
+#: erpnext/controllers/stock_controller.py:954
 msgid "{0} {1}: Cost Center is mandatory for Item {2}"
 msgstr ""
 
@@ -62035,8 +62037,8 @@ msgstr ""
 msgid "{0}'s {1} cannot be after {2}'s Expected End Date."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1304
 #: erpnext/manufacturing/doctype/job_card/job_card.py:1312
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1320
 msgid "{0}, complete the operation {1} before the operation {2}."
 msgstr ""
 
@@ -62056,11 +62058,11 @@ msgstr ""
 msgid "{0}: Virtual DocType (no database table)"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:543
+#: erpnext/controllers/accounts_controller.py:544
 msgid "{0}: {1} does not belong to the Company: {2}"
 msgstr ""
 
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1410
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1333
 msgid "{0}: {1} does not exist"
 msgstr ""
 
@@ -62068,7 +62070,7 @@ msgstr ""
 msgid "{0}: {1} does not exists"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:278
+#: erpnext/setup/doctype/company/company.py:282
 msgid "{0}: {1} is a group account."
 msgstr ""
 
@@ -62084,7 +62086,7 @@ msgstr ""
 msgid "{doctype} {name} is cancelled or closed."
 msgstr ""
 
-#: erpnext/controllers/stock_controller.py:2147
+#: erpnext/controllers/stock_controller.py:2148
 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
 msgstr ""
 
@@ -62096,7 +62098,7 @@ msgstr ""
 msgid "{}"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2132
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2213
 msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
 msgstr ""