Врсту шаблона
msgid "Please select Apply Discount On"
msgstr "Молимо Вас да изаберете на шта ће се применити попуст"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1650
+#: erpnext/selling/doctype/sales_order/sales_order.py:1666
msgid "Please select BOM against item {0}"
msgstr "Молимо Вас да изаберете саставницу за ставку {0}"
@@ -37919,11 +37974,11 @@ msgstr "Молимо Вас да изаберете датум књижења п
msgid "Please select Posting Date first"
msgstr "Молимо Вас да прво изаберете датум књижења"
-#: erpnext/manufacturing/doctype/bom/bom.py:1106
+#: erpnext/manufacturing/doctype/bom/bom.py:1143
msgid "Please select Price List"
msgstr "Молимо Вас да изаберете ценовник"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1652
+#: erpnext/selling/doctype/sales_order/sales_order.py:1668
msgid "Please select Qty against item {0}"
msgstr "Молимо Вас да изаберете количину за ставку {0}"
@@ -37931,7 +37986,7 @@ msgstr "Молимо Вас да изаберете количину за ста
msgid "Please select Sample Retention Warehouse in Stock Settings first"
msgstr "Молимо Вас да прво изаберете складиште за задржане узорке у подешавањима залиха"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:415
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:417
msgid "Please select Serial/Batch Nos to reserve or change Reservation Based On to Qty."
msgstr "Молимо Вас да изаберете бројеве серије / шарже да бисте резервисали или променили резервацију на основу количине."
@@ -37951,17 +38006,17 @@ msgstr "Молимо Вас да изаберете налог за подуго
msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
msgstr "Молимо Вас да изаберете рачун нереализованог добитка/губитка или да додате подразумевани рачун нереализованог добитка/губитка за компанију {0}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1338
+#: erpnext/manufacturing/doctype/bom/bom.py:1375
msgid "Please select a BOM"
msgstr "Молимо Вас да изаберете саставницу"
#: erpnext/accounts/party.py:430
-#: erpnext/stock/doctype/pick_list/pick_list.py:1551
+#: erpnext/stock/doctype/pick_list/pick_list.py:1563
msgid "Please select a Company"
msgstr "Молимо Вас да изаберете компанију"
#: erpnext/accounts/doctype/payment_entry/payment_entry.js:267
-#: erpnext/manufacturing/doctype/bom/bom.js:603
+#: erpnext/manufacturing/doctype/bom/bom.js:624
#: erpnext/manufacturing/doctype/bom/bom.py:261
#: erpnext/public/js/controllers/accounts.js:249
#: erpnext/public/js/controllers/transaction.js:2812
@@ -38041,11 +38096,11 @@ msgstr "Молимо Вас да изаберете вредност за {0} п
msgid "Please select an item code before setting the warehouse."
msgstr "Молимо Вас да изаберете шифру ставке пре него што поставите складиште."
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:26
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:43
msgid "Please select at least one filter: Item Code, Batch, or Serial No."
msgstr "Молимо Вас да изаберете барем један филтер: Шифра ставке, шаржа или број серије."
-#: erpnext/selling/doctype/sales_order/sales_order.js:886
+#: erpnext/selling/doctype/sales_order/sales_order.js:889
msgid "Please select atleast one item to continue"
msgstr "Молимо Вас да изаберете барем једну ставку да бисте наставили"
@@ -38130,7 +38185,7 @@ msgstr "Молимо Вас да изаберете {0}"
msgid "Please select {0} first"
msgstr "Молимо Вас да прво изаберете {0}"
-#: erpnext/public/js/controllers/transaction.js:99
+#: erpnext/public/js/controllers/transaction.js:100
msgid "Please set 'Apply Additional Discount On'"
msgstr "Молимо Вас да поставите 'Примени додатни попуст на'"
@@ -38172,10 +38227,14 @@ msgstr "Молимо Вас да поставите рачуноводствен
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:58
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:68
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:78
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:756
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:765
msgid "Please set Company"
msgstr "Молимо Вас да поставите компанију"
+#: erpnext/regional/united_arab_emirates/utils.py:26
+msgid "Please set Customer Address to determine if the transaction is an export."
+msgstr "Молимо Вас да подесите адресу купца како би се утврдило да ли је трансакција извоз."
+
#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr "Молимо Вас да поставите рачун везана за амортизацију у категорији имовине {0} или у компанији {1}"
@@ -38198,7 +38257,7 @@ msgstr "Молимо Вас да поставите фискалну шифру
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr "Молимо Вас да поставите рачун основних средстава у категорији имовине {0}"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:585
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:587
msgid "Please set Fixed Asset Account in {} against {}."
msgstr "Молимо Вас да поставите рачун основних средстава у {} против {}."
@@ -38224,7 +38283,7 @@ msgstr "Молимо Вас да поставите рачун нереализ
msgid "Please set VAT Accounts in {0}"
msgstr "Молимо Вас да поставите рачун за ПДВ у {0}"
-#: erpnext/regional/united_arab_emirates/utils.py:61
+#: erpnext/regional/united_arab_emirates/utils.py:83
msgid "Please set Vat Accounts for Company: \"{0}\" in UAE VAT Settings"
msgstr "Молимо Вас да поставите рачун за ПДВ за компанију: \"{0}\" у поставкама ПДВ-а УАЕ"
@@ -38232,11 +38291,11 @@ msgstr "Молимо Вас да поставите рачун за ПДВ за
msgid "Please set a Company"
msgstr "Молимо Вас да поставите компанију"
-#: erpnext/assets/doctype/asset/asset.py:305
+#: erpnext/assets/doctype/asset/asset.py:306
msgid "Please set a Cost Center for the Asset or set an Asset Depreciation Cost Center for the Company {}"
msgstr "Молимо Вас да поставите трошковни центар за имовину или трошковни центар амортизације имовине за компанију {}"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1406
+#: erpnext/selling/doctype/sales_order/sales_order.py:1422
msgid "Please set a Supplier against the Items to be considered in the Purchase Order."
msgstr "Молимо Вас да поставите добављача за ставке које треба узети у обзир у набавној поруџбини."
@@ -38248,7 +38307,7 @@ msgstr "Молимо Вас да поставите подразумевану
msgid "Please set a default Holiday List for Employee {0} or Company {1}"
msgstr "Молимо Вас да поставите подразумевану листу празника за запослено лице {0} или компанију {1}"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1095
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1097
msgid "Please set account in Warehouse {0}"
msgstr "Молимо Вас да поставите рачун у складишту {0}"
@@ -38289,7 +38348,7 @@ msgstr "Молимо Вас да поставите као подразумев
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr "Молимо Вас да поставите као подразумевано благајну или текући рачун у начинима плаћања {}"
-#: erpnext/accounts/utils.py:2314
+#: erpnext/accounts/utils.py:2318
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr "Молимо Вас да поставите подразумевани рачун прихода/расхода курсних разлика у компанији {}"
@@ -38322,7 +38381,7 @@ msgstr "Молимо Вас да поставите филтере"
msgid "Please set one of the following:"
msgstr "Молимо Вас да поставите једно од следећег:"
-#: erpnext/assets/doctype/asset/asset.py:506
+#: erpnext/assets/doctype/asset/asset.py:522
msgid "Please set opening number of booked depreciations"
msgstr "Молимо Вас да унесете почетни број књижених амортизација"
@@ -38406,8 +38465,8 @@ msgid "Please specify Company"
msgstr "Молимо Вас да прецизирате компанију"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:447
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:503
msgid "Please specify Company to proceed"
msgstr "Молимо Вас да прецизирате компанију да бисте наставили"
@@ -38614,8 +38673,8 @@ msgstr "Поштански трошкови"
#: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:61
#: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:66
#: erpnext/accounts/report/cheques_and_deposits_incorrectly_cleared/cheques_and_deposits_incorrectly_cleared.py:151
-#: erpnext/accounts/report/general_ledger/general_ledger.py:650
-#: erpnext/accounts/report/gross_profit/gross_profit.py:269
+#: erpnext/accounts/report/general_ledger/general_ledger.py:670
+#: erpnext/accounts/report/gross_profit/gross_profit.py:275
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:183
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:204
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
@@ -38647,7 +38706,7 @@ msgstr "Поштански трошкови"
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:127
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:104
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:86
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:449
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:492
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:24
#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:112
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:144
@@ -38662,7 +38721,7 @@ msgstr "Датум књижења"
msgid "Posting Date Inheritance for Exchange Gain / Loss"
msgstr "Наслеђивање датума књижења за приход/расход курсних разлика"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:254
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:256
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:130
msgid "Posting Date cannot be future date"
msgstr "Датум књижења не може бити у будућности"
@@ -38702,7 +38761,7 @@ msgstr "Датум и време књижења"
#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:275
+#: erpnext/accounts/report/gross_profit/gross_profit.py:281
#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -39001,7 +39060,7 @@ msgstr "Земља ценовника"
msgid "Price List Currency"
msgstr "Валута ценовника"
-#: erpnext/stock/get_item_details.py:1236
+#: erpnext/stock/get_item_details.py:1231
msgid "Price List Currency not selected"
msgstr "Валута ценовника није изабрана"
@@ -39670,7 +39729,7 @@ msgstr "Опис процеса"
msgid "Process Loss"
msgstr "Губитак у процесу"
-#: erpnext/manufacturing/doctype/bom/bom.py:1089
+#: erpnext/manufacturing/doctype/bom/bom.py:1126
msgid "Process Loss Percentage cannot be greater than 100"
msgstr "Проценат губитка у процесу не може бити већи од 100"
@@ -39689,7 +39748,7 @@ msgstr "Проценат губитка у процесу не може бити
msgid "Process Loss Qty"
msgstr "Количина губитка у процесу"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:293
+#: erpnext/manufacturing/doctype/job_card/job_card.js:301
msgid "Process Loss Quantity"
msgstr "Количина губитка у процесу"
@@ -40154,15 +40213,15 @@ msgstr "Напредак (%)"
#: erpnext/accounts/doctype/psoa_project/psoa_project.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1052
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1061
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:109
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:74
#: erpnext/accounts/report/general_ledger/general_ledger.js:164
-#: erpnext/accounts/report/general_ledger/general_ledger.py:727
+#: erpnext/accounts/report/general_ledger/general_ledger.py:760
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
-#: erpnext/accounts/report/gross_profit/gross_profit.py:357
+#: erpnext/accounts/report/gross_profit/gross_profit.py:363
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:274
#: erpnext/accounts/report/purchase_register/purchase_register.py:207
@@ -40695,7 +40754,7 @@ msgstr "Детаљи набавке"
#: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
#: erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:134
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:289
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:296
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js:30
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
@@ -40729,16 +40788,16 @@ msgstr "Ставка улазне фактуре"
msgid "Purchase Invoice Trends"
msgstr "Трендови улазних фактура"
-#: erpnext/assets/doctype/asset/asset.py:267
+#: erpnext/assets/doctype/asset/asset.py:268
msgid "Purchase Invoice cannot be made against an existing asset {0}"
msgstr "Улазна фактура не може бити направљена за постојећу имовину {0}"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:431
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:445
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:433
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:447
msgid "Purchase Invoice {0} is already submitted"
msgstr "Улазна фактура {0} је већ поднета"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:2011
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:2013
msgid "Purchase Invoices"
msgstr "Улазне фактуре"
@@ -40815,7 +40874,7 @@ msgstr "Главни менџер за набавку"
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#: erpnext/stock/doctype/material_request/material_request.js:179
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:246
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:250
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -40891,11 +40950,11 @@ msgstr "Ставке набавне поруџбине нису примљене
msgid "Purchase Order Pricing Rule"
msgstr "Правило одређивања цене за набавну поруџбину"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:624
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:626
msgid "Purchase Order Required"
msgstr "Набавна поруџбина је обавезна"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:619
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:621
msgid "Purchase Order Required for item {}"
msgstr "Набавна поруџбина је обавезна за ставку {}"
@@ -40907,19 +40966,19 @@ msgstr "Набавна поруџбина је обавезна за ставк
msgid "Purchase Order Trends"
msgstr "Трендови набавних поруџбина"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1179
+#: erpnext/selling/doctype/sales_order/sales_order.js:1182
msgid "Purchase Order already created for all Sales Order items"
msgstr "Набавна поруџбина је већ креирана за све ставке из продајне поруџбине"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:320
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:322
msgid "Purchase Order number required for Item {0}"
msgstr "Набавна поруџбина је обавезна за ставку {0}"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:662
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:664
msgid "Purchase Order {0} is not submitted"
msgstr "Набавна поруџбина {0} није поднета"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:907
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:929
msgid "Purchase Orders"
msgstr "Набавне поруџбине"
@@ -40967,9 +41026,9 @@ msgstr "Ценовник набавке"
#. Reservation Entry'
#. Label of a Link in the Stock Workspace
#. Label of a shortcut in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:174
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:655
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:665
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:177
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:661
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:671
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:49
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:246
@@ -41032,11 +41091,11 @@ msgstr "Ставке пријемнице набавке"
msgid "Purchase Receipt No"
msgstr "Број пријемнице набавке"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:645
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:647
msgid "Purchase Receipt Required"
msgstr "Пријемница набавке је обавезна"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:640
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:642
msgid "Purchase Receipt Required for item {}"
msgstr "Пријемница набавке је обавезна за ставку {}"
@@ -41049,7 +41108,7 @@ msgstr "Пријемница набавке је обавезна за став
msgid "Purchase Receipt Trends"
msgstr "Трендови пријемница набавке"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:384
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:391
msgid "Purchase Receipt doesn't have any Item for which Retain Sample is enabled."
msgstr "Пријемница набавке нема ниједну ставку за коју је омогућено задржавање узорка."
@@ -41057,7 +41116,7 @@ msgstr "Пријемница набавке нема ниједну ставку
msgid "Purchase Receipt {0} created."
msgstr "Пријемница набавке {0} је креирана."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:669
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:671
msgid "Purchase Receipt {0} is not submitted"
msgstr "Пријемница набавке {0} није поднета"
@@ -41068,7 +41127,7 @@ msgstr "Пријемница набавке {0} није поднета"
msgid "Purchase Register"
msgstr "Регистар набавке"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:279
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:286
msgid "Purchase Return"
msgstr "Повраћај набавке"
@@ -41264,14 +41323,14 @@ msgstr "Правило складиштења већ постоји за ста
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91
-#: erpnext/accounts/report/gross_profit/gross_profit.py:314
+#: erpnext/accounts/report/gross_profit/gross_profit.py:320
#: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json
#: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240
#: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:224
#: erpnext/controllers/trends.py:242 erpnext/controllers/trends.py:254
#: erpnext/controllers/trends.py:259
#: erpnext/crm/doctype/opportunity_item/opportunity_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:964
+#: erpnext/manufacturing/doctype/bom/bom.js:999
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
#: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
@@ -41291,8 +41350,8 @@ msgstr "Правило складиштења већ постоји за ста
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:367
#: erpnext/selling/doctype/sales_order/sales_order.js:471
-#: erpnext/selling/doctype/sales_order/sales_order.js:863
-#: erpnext/selling/doctype/sales_order/sales_order.js:1015
+#: erpnext/selling/doctype/sales_order/sales_order.js:866
+#: erpnext/selling/doctype/sales_order/sales_order.js:1018
#: 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_voucher/landed_cost_voucher.json
@@ -41376,7 +41435,7 @@ msgstr "Количина по јединици"
#. Label of the for_quantity (Float) field in DocType 'Job Card'
#. Label of the qty (Float) field in DocType 'Work Order'
-#: erpnext/manufacturing/doctype/bom/bom.js:309
+#: erpnext/manufacturing/doctype/bom/bom.js:330
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/manufacturing/report/process_loss_report/process_loss_report.py:82
@@ -41491,7 +41550,7 @@ msgstr "Количина за испоруку"
msgid "Qty to Fetch"
msgstr "Количина за преузимање"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:265
+#: erpnext/manufacturing/doctype/job_card/job_card.js:273
#: erpnext/manufacturing/doctype/job_card/job_card.py:765
msgid "Qty to Manufacture"
msgstr "Количина за производњу"
@@ -41504,6 +41563,8 @@ msgstr "Количина за производњу"
msgid "Qty to Order"
msgstr "Количина за наручивање"
+#. Label of the finished_good_qty (Float) field in DocType 'BOM Operation'
+#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
#: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:129
msgid "Qty to Produce"
msgstr "Количина за производњу"
@@ -41630,7 +41691,7 @@ msgstr "Специфичан циљ квалитета"
#: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:186
+#: erpnext/manufacturing/doctype/bom/bom.js:207
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/quality_management/workspace/quality/quality.json
@@ -41705,7 +41766,7 @@ msgstr "Шаблон инспекције квалитета"
msgid "Quality Inspection Template Name"
msgstr "Назив шаблона инспекције квалитета"
-#: erpnext/public/js/controllers/transaction.js:359
+#: erpnext/public/js/controllers/transaction.js:360
#: erpnext/stock/doctype/stock_entry/stock_entry.js:165
msgid "Quality Inspection(s)"
msgstr "Инспекције квалитета"
@@ -41823,7 +41884,7 @@ msgstr "Циљ прегледа квалитета"
#: erpnext/buying/report/purchase_analytics/purchase_analytics.js:28
#: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:213
#: erpnext/manufacturing/doctype/blanket_order_item/blanket_order_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:396
+#: erpnext/manufacturing/doctype/bom/bom.js:417
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.js:68
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.json
@@ -41850,7 +41911,7 @@ msgstr "Циљ прегледа квалитета"
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py:36
#: erpnext/stock/report/delayed_item_report/delayed_item_report.py:154
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:423
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:466
#: erpnext/stock/report/stock_analytics/stock_analytics.js:27
#: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
#: erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json
@@ -41972,8 +42033,8 @@ msgid "Quantity required for Item {0} in row {1}"
msgstr "Потребна количина за ставку {0} у реду {1}"
#: erpnext/manufacturing/doctype/bom/bom.py:604
-#: erpnext/manufacturing/doctype/job_card/job_card.js:321
-#: erpnext/manufacturing/doctype/job_card/job_card.js:390
+#: erpnext/manufacturing/doctype/job_card/job_card.js:329
+#: erpnext/manufacturing/doctype/job_card/job_card.js:398
#: erpnext/manufacturing/doctype/workstation/workstation.js:303
msgid "Quantity should be greater than 0"
msgstr "Количина треба бити већа од 0"
@@ -42002,7 +42063,7 @@ msgstr "Количина за производњу"
msgid "Quantity to Produce should be greater than zero."
msgstr "Количина за производњу треба бити већа од нуле."
-#: erpnext/public/js/utils/barcode_scanner.js:236
+#: erpnext/public/js/utils/barcode_scanner.js:262
msgid "Quantity to Scan"
msgstr "Количина за скенирање"
@@ -42133,7 +42194,7 @@ msgstr "Понуда/Потенцијални клијент %"
#. Label of the prevdoc_docname (Link) field in DocType 'Sales Order Item'
#. Label of a Link in the Selling Workspace
#. Option for the 'Transaction' (Select) field in DocType 'Authorization Rule'
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:277
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:280
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:36
#: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html:20
#: erpnext/crm/doctype/contract/contract.json
@@ -42200,7 +42261,7 @@ msgstr "Понуда {0} је отказана"
msgid "Quotation {0} not of type {1}"
msgstr "Понуда {0} није врсте {1}"
-#: erpnext/selling/doctype/quotation/quotation.py:343
+#: erpnext/selling/doctype/quotation/quotation.py:345
#: erpnext/selling/page/sales_funnel/sales_funnel.py:57
msgid "Quotations"
msgstr "Понуде"
@@ -42652,8 +42713,8 @@ msgstr "Складиште сировина"
#. Label of the materials_section (Section Break) field in DocType 'BOM'
#. Label of the section_break_8 (Section Break) field in DocType 'Job Card'
#. Label of the mr_items (Table) field in DocType 'Production Plan'
-#: erpnext/manufacturing/doctype/bom/bom.js:349
-#: erpnext/manufacturing/doctype/bom/bom.js:938
+#: erpnext/manufacturing/doctype/bom/bom.js:370
+#: erpnext/manufacturing/doctype/bom/bom.js:972
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
@@ -42816,7 +42877,7 @@ msgid "Reason"
msgstr "Разлог"
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:282
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr "Разлог за стављање на чекање"
@@ -42827,7 +42888,7 @@ msgid "Reason for Failure"
msgstr "Разлог неуспеха"
#: erpnext/buying/doctype/purchase_order/purchase_order.js:748
-#: erpnext/selling/doctype/sales_order/sales_order.js:1338
+#: erpnext/selling/doctype/sales_order/sales_order.js:1341
msgid "Reason for Hold"
msgstr "Разлог за задржавање"
@@ -42836,7 +42897,7 @@ msgstr "Разлог за задржавање"
msgid "Reason for Leaving"
msgstr "Разлог за одсуство"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1353
+#: erpnext/selling/doctype/sales_order/sales_order.js:1356
msgid "Reason for hold:"
msgstr "Разлог за задржавање:"
@@ -43206,7 +43267,7 @@ msgstr "Забележити URL"
msgid "Records"
msgstr "Забелешке"
-#: erpnext/regional/united_arab_emirates/utils.py:171
+#: erpnext/regional/united_arab_emirates/utils.py:193
msgid "Recoverable Standard Rated expenses should not be set when Reverse Charge Applicable is Y"
msgstr "Повратни стандардни трошкови не смеју бити постављени када је обавеза обрнуто опорезивања примењива"
@@ -43648,11 +43709,11 @@ msgstr "Референца: {0}, шифра ставке: {1} и купац: {2}
msgid "References"
msgstr "Референце"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:385
msgid "References to Sales Invoices are Incomplete"
msgstr "Референце за излазне фактуре су непотпуне"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:380
msgid "References to Sales Orders are Incomplete"
msgstr "Референце за продајне поруџбине су непотпуне"
@@ -43797,14 +43858,14 @@ msgstr "Веза"
#. Label of the release_date (Date) field in DocType 'Purchase Invoice'
#. Label of the release_date (Date) field in DocType 'Supplier'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:268
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:312
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:274
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:318
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
msgstr "Датум издавања"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:315
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:317
msgid "Release date must be in the future"
msgstr "Датум издавања мора бити у будућности"
@@ -43879,7 +43940,7 @@ msgstr "Напомена"
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1254
#: erpnext/accounts/report/general_ledger/general_ledger.html:84
#: erpnext/accounts/report/general_ledger/general_ledger.html:110
-#: erpnext/accounts/report/general_ledger/general_ledger.py:752
+#: erpnext/accounts/report/general_ledger/general_ledger.py:785
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112
#: erpnext/accounts/report/purchase_register/purchase_register.py:296
#: erpnext/accounts/report/sales_register/sales_register.py:335
@@ -43976,8 +44037,8 @@ msgstr "Закупљено"
#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:58
#: erpnext/crm/doctype/opportunity/opportunity.js:130
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:354
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:305
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:360
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:312
#: erpnext/support/doctype/issue/issue.js:39
msgid "Reopen"
msgstr "Поново отвори"
@@ -44610,7 +44671,7 @@ msgstr "Резервисана количина за подуговор"
msgid "Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items."
msgstr "Резервисана количина за подуговор: Количина сировина потребна за израду подуговорених ставки."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:606
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:608
msgid "Reserved Qty should be greater than Delivered Qty."
msgstr "Резервисана количина треба да будећ већа од испоручене количине."
@@ -44911,7 +44972,7 @@ msgstr "Поље за наслов резултата"
msgid "Resume"
msgstr "Биографија"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:200
+#: erpnext/manufacturing/doctype/job_card/job_card.js:208
msgid "Resume Job"
msgstr "Наставити посао"
@@ -44941,7 +45002,7 @@ msgstr "Задржани узорак"
msgid "Retained Earnings"
msgstr "Нераспоређена добит"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:295
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:302
msgid "Retention Stock Entry"
msgstr "Унос залиха које се задржавају"
@@ -45035,13 +45096,13 @@ msgstr "Повраћај компоненти"
msgid "Return Issued"
msgstr "Издати повраћаји"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:355
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:362
msgid "Return Qty"
msgstr "Количина за повраћај"
#. Label of the return_qty_from_rejected_warehouse (Check) field in DocType
#. 'Purchase Receipt Item'
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:331
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:338
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
msgid "Return Qty from Rejected Warehouse"
msgstr "Количина за повраћај из складишта одбијених залиха"
@@ -45507,12 +45568,12 @@ msgstr "Ред # {0}: Враћена ставка {1} не постоји у {2}
msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr "Ред #1: ИД секвенце мора бити 1 за операцију {0}."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:518
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1919
msgid "Row #{0} (Payment Table): Amount must be negative"
msgstr "Ред #{0} (Евиденција плаћања): Износ мора бити негативан"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:515
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:516
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr "Ред #{0} (Евиденција плаћања): Износ мора бити позитиван"
@@ -45571,7 +45632,7 @@ msgstr "Ред #{0}: Имовина {1} је већ продата"
msgid "Row #{0}: BOM is not specified for subcontracting item {0}"
msgstr "Ред #{0}: Није наведена саставница за подуговорену ставку {0}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:405
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:407
msgid "Row #{0}: Batch No {1} is already selected."
msgstr "Ред #{0}: Број шарже {1} је већ изабран."
@@ -45607,7 +45668,7 @@ msgstr "Ред #{0}: Није могуће поставити цену укол
msgid "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}"
msgstr "Ред #{0}: Не може се пренети више од потребне количине {1} за ставку {2} према радној картици {3}"
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:86
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:87
msgid "Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save"
msgstr "Ред #{0}: Зависна ставка не би требала да буде пакет производа. Молимо Вас да уклоните ставку {1} и сачувате"
@@ -45647,7 +45708,7 @@ msgstr "Ред #{0}: Датуми се преклапају са другим р
msgid "Row #{0}: Default BOM not found for FG Item {1}"
msgstr "Ред #{0}: Подразумевана саставница није пронађена за готов производ {1}"
-#: erpnext/assets/doctype/asset/asset.py:533
+#: erpnext/assets/doctype/asset/asset.py:549
msgid "Row #{0}: Depreciation Start Date is required"
msgstr "Ред #{0}: Датум почетка амортизације је обавезан"
@@ -45699,7 +45760,7 @@ msgstr "Ред #{0}: Датум почетка не може бити пре д
msgid "Row #{0}: From Time and To Time fields are required"
msgstr "Ред #{0}: Поља за време почетка и време завршетка су обавезна"
-#: erpnext/public/js/utils/barcode_scanner.js:394
+#: erpnext/public/js/utils/barcode_scanner.js:428
msgid "Row #{0}: Item added"
msgstr "Ред #{0}: Ставка је додата"
@@ -45707,7 +45768,7 @@ msgstr "Ред #{0}: Ставка је додата"
msgid "Row #{0}: Item {1} does not exist"
msgstr "Ред #{0}: Ставка {1} не постоји"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1549
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr "Ред #{0}: Ставка {1} је одабрана, молимо Вас да резервишите залихе са листе за одабир."
@@ -45731,11 +45792,11 @@ msgstr "Ред #{0}: Ставка {1} није складишна ставка"
msgid "Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher"
msgstr "Ред #{0}: Налог књижења {1} не садржи рачун {2} или је већ повезан са другим документом"
-#: erpnext/assets/doctype/asset/asset.py:527
+#: erpnext/assets/doctype/asset/asset.py:543
msgid "Row #{0}: Next Depreciation Date cannot be before Available-for-use Date"
msgstr "Ред #{0}: Следећи датум амортизације не може бити пре датума доступности за употребу"
-#: erpnext/assets/doctype/asset/asset.py:522
+#: erpnext/assets/doctype/asset/asset.py:538
msgid "Row #{0}: Next Depreciation Date cannot be before Purchase Date"
msgstr "Ред #{0}: Следећи датум амортизације не може бити пре датума набавке"
@@ -45743,11 +45804,11 @@ msgstr "Ред #{0}: Следећи датум амортизације не м
msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
msgstr "Ред #{0}: Није дозвољено променити добављача јер набавна поруџбина већ постоји"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1632
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr "Ред #{0}: Само {1} је доступно за резервацију за ставку {2}"
-#: erpnext/assets/doctype/asset/asset.py:499
+#: erpnext/assets/doctype/asset/asset.py:515
msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}"
msgstr "Ред #{0}: Почетна акумулирана амортизација мора бити мања од или једнака {1}"
@@ -45755,15 +45816,15 @@ msgstr "Ред #{0}: Почетна акумулирана амортизаци
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 "Ред #{0}: Операција {1} није завршена за {2} количине готових производа у радном налогу {3}. Молимо Вас да ажурирате статус операције путем радне картице {4}."
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1009
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1010
msgid "Row #{0}: Please select Item Code in Assembly Items"
msgstr "Ред #{0}: Молимо Вас да изаберете шифру ставке у састављеним ставкама"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1012
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1013
msgid "Row #{0}: Please select the BOM No in Assembly Items"
msgstr "Ред #{0}: Молимо Вас да изаберете број саставнице у састављеним ставкама"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1006
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1007
msgid "Row #{0}: Please select the Sub Assembly Warehouse"
msgstr "Ред #{0}: Молимо Вас да изаберете складиште подсклопова"
@@ -45775,7 +45836,7 @@ msgstr "Ред #{0}: Молимо Вас да поставите количин
msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master"
msgstr "Ред #{0}: Молимо Вас да ажурирате рачун разграничених прихода/расхода у реду ставке или подразумевани рачун у мастер подацима компаније"
-#: erpnext/public/js/utils/barcode_scanner.js:392
+#: erpnext/public/js/utils/barcode_scanner.js:426
msgid "Row #{0}: Qty increased by {1}"
msgstr "Ред #{0}: Количина је повећана за {1}"
@@ -45784,7 +45845,7 @@ msgstr "Ред #{0}: Количина је повећана за {1}"
msgid "Row #{0}: Qty must be a positive number"
msgstr "Ред #{0}: Количина мора бити позитиван број"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:393
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:395
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 "Ред #{0}: Количина треба да буде мања или једнака доступној количини за резервацију (стварна количина - резервисана количина) {1} за ставку {2} против шарже {3} у складишту {4}."
@@ -45800,12 +45861,16 @@ msgstr "Ред #{0}: Инспекција квалитета {1} није под
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr "Ред #{0}: Инспекција квалитета {1} је одбијена за ставку {2}"
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:96
+msgid "Row #{0}: Quantity cannot be a non-positive number. Please increase the quantity or remove the Item {1}"
+msgstr "Ред #{0}: Количина мора бити позитиван број. Молимо Вас да повећате количину или уклоните ставку {1}"
+
#: erpnext/controllers/accounts_controller.py:1375
#: erpnext/controllers/accounts_controller.py:3663
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr "Ред #{0}: Количина за ставку {1} не може бити нула."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1617
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr "Ред #{0}: Количина за резервацију за ставку {1} мора бити већа од 0."
@@ -45858,11 +45923,11 @@ msgstr "Ред #{0}: ИД секвенце мора бити {1} или {2} за
msgid "Row #{0}: Serial No {1} does not belong to Batch {2}"
msgstr "Ред #{0}: Број серије {1} не припада шаржи {2}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:342
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:344
msgid "Row #{0}: Serial No {1} for Item {2} is not available in {3} {4} or might be reserved in another {5}."
msgstr "Ред #{0}: Број серије {1} за ставку {2} није доступан у {3} {4} или може бити резервисан у другом {5}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:358
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:360
msgid "Row #{0}: Serial No {1} is already selected."
msgstr "Ред #{0}: Број серије {1} је већ изабран."
@@ -45882,6 +45947,10 @@ msgstr "Ред #{0}: Датум почетка и датум завршетка
msgid "Row #{0}: Set Supplier for item {1}"
msgstr "Ред #{0}: Поставите добављача за ставку {1}"
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1017
+msgid "Row #{0}: Since 'Track Semi Finished Goods' is enabled, the BOM {1} cannot be used for Sub Assembly Items"
+msgstr "Ред #{0}: С обзиром да је 'Праћење полупроизвода' омогућено, саставница {1} не може бити коришћена за подсклопове"
+
#: erpnext/manufacturing/doctype/workstation/workstation.py:92
msgid "Row #{0}: Start Time and End Time are required"
msgstr "Ред #{0}: Почетно и завршно време је обавезно"
@@ -45898,32 +45967,32 @@ msgstr "Ред #{0}: Статус је обавезан"
msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}"
msgstr "Ред #{0}: Статус мора бити {1} за дисконтовање фактуре {2}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:367
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:369
msgid "Row #{0}: Stock cannot be reserved for Item {1} against a disabled Batch {2}."
msgstr "Ред #{0}: Складиште не може бити резервисано за ставку {1} против онемогућене шарже {2}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1562
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr "Ред #{0}: Складиште не може бити резервисано за ставке ван залиха {1}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1575
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr "Ред #{0}: Залихе не могу бити резервисане у групном складишту {1}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1589
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr "Ред #{0}: Залихе су већ резервисане за ставку {1}."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:539
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr "Ред #{0}: Залихе су већ резервисане за ставку {1} у складишту {2}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:377
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:379
msgid "Row #{0}: Stock not available to reserve for Item {1} against Batch {2} in Warehouse {3}."
msgstr "Ред #{0}: Залихе нису доступне за резервацију за ставку {1} против шарже {2} у складишту {3}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1224
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1603
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr "Ред #{0}: Залихе нису доступне за резервацију за ставку {1} у складишту {2}."
@@ -45939,7 +46008,7 @@ msgstr "Ред #{0}: Складиште {1} није зависно склади
msgid "Row #{0}: Timings conflicts with row {1}"
msgstr "Ред #{0}: Временски сукоб са редом {1}"
-#: erpnext/assets/doctype/asset/asset.py:512
+#: erpnext/assets/doctype/asset/asset.py:528
msgid "Row #{0}: Total Number of Depreciations cannot be less than or equal to Opening Number of Booked Depreciations"
msgstr "Ред #{0}: Укупан број амортизација не може бити мањи или једнак броју почетних књижених амортизација"
@@ -46011,11 +46080,11 @@ msgstr "Ред #{idx}: {schedule_date} не може бити пре {transactio
msgid "Row #{}: Currency of {} - {} doesn't matches company currency."
msgstr "Ред #{}: Валута за {} - {} се не поклапа са валутом компаније."
-#: erpnext/assets/doctype/asset/asset.py:349
+#: erpnext/assets/doctype/asset/asset.py:350
msgid "Row #{}: Finance Book should not be empty since you're using multiple."
msgstr "Ред #{}: Финансијска евиденција не сме бити празна, с обзиром да су у употреби више њих."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:406
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:407
msgid "Row #{}: Item Code: {} is not available under warehouse {}."
msgstr "Ред #{}: Шифра ставке: {} није доступно у складишту {}."
@@ -46035,23 +46104,23 @@ msgstr "Ред #{}: Фискални рачун {} још увек није по
msgid "Row #{}: Please assign task to a member."
msgstr "Ред #{}: Молимо Вас да доделите задатак члану тима."
-#: erpnext/assets/doctype/asset/asset.py:341
+#: erpnext/assets/doctype/asset/asset.py:342
msgid "Row #{}: Please use a different Finance Book."
msgstr "Ред #{}: Молимо Вас да користите другу финансијску евиденцију."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:477
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:478
msgid "Row #{}: Serial No {} cannot be returned since it was not transacted in original invoice {}"
msgstr "Ред #{}: Број серије {} не може бити враћен јер није било трансакција у оригиналној фактури {}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:413
-msgid "Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}. Available quantity {}."
-msgstr "Ред #{}: Количина залиха није довољна за шифру ставке: {} у складишту {}. Доступна количина {}."
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:414
+msgid "Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}."
+msgstr "Ред #{}: Нема довољно залиха за шифру ставке: {} унутар складишта {}."
#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:104
msgid "Row #{}: The original Invoice {} of return invoice {} is not consolidated."
msgstr "Ред #{}: оригинална фактура {} за рекламациону фактуру {} није консолидована."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:450
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:451
msgid "Row #{}: You cannot add positive quantities in a return invoice. Please remove item {} to complete the return."
msgstr "Ред #{}: Не можете додати позитивне количине у рекламациону фактуру. Молимо Вас да уклоните ставку {} да бисте завршили поврат."
@@ -46072,7 +46141,7 @@ msgstr "Ред #{}: {} {} не постоји."
msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}."
msgstr "Ред #{}: {} {} не припада компанији {}. Молимо Вас да изаберете важећи {}."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:434
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:436
msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}"
msgstr "Ред број {0}: Складиште је обавезно. Молимо Вас да поставите подразумевано складиште за ставку {1} и компанију {2}"
@@ -46181,19 +46250,19 @@ msgstr "Ред {0}: Ставка из отпремнице или референ
msgid "Row {0}: Exchange Rate is mandatory"
msgstr "Ред {0}: Девизни курс је обавезан"
-#: erpnext/assets/doctype/asset/asset.py:474
+#: erpnext/assets/doctype/asset/asset.py:490
msgid "Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount"
msgstr "Ред {0}: Очекивана вредност након корисног века мора бити мања од укупног износа набавке"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:525
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:527
msgid "Row {0}: Expense Head changed to {1} as no Purchase Receipt is created against Item {2}."
msgstr "Ред {0}: Група трошка је промењена на {1} јер није креирана пријемница набавке за ставку {2}."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:482
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:484
msgid "Row {0}: Expense Head changed to {1} because account {2} is not linked to warehouse {3} or it is not the default inventory account"
msgstr "Ред {0}: Група трошка је промењена на {1} јер рачун {2} није повезан са складиштем {3} или није подразумевани рачун инвентара"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:507
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:509
msgid "Row {0}: Expense Head changed to {1} because expense is booked against this account in Purchase Receipt {2}"
msgstr "Ред {0}: Група трошка је промењена на {1} јер је трошак књижен на овај рачун у пријемници набавке {2}"
@@ -46246,7 +46315,7 @@ msgstr "Ред {0}: Ставка {1} мора бити подуговорена
msgid "Row {0}: Item {1}'s quantity cannot be higher than the available quantity."
msgstr "Ред {0}: Количина ставке {1} не може бити већа од расположиве количине."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:596
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr "Ред {0}: Упакована количина мора бити једнака количини {1}."
@@ -46362,7 +46431,7 @@ msgstr "Ред {0}: За постављање периодичности {1}, р
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr "Ред {0}: Фактор конверзије јединица мере је обавезан"
-#: erpnext/manufacturing/doctype/bom/bom.py:1072
+#: erpnext/manufacturing/doctype/bom/bom.py:1109
#: erpnext/manufacturing/doctype/work_order/work_order.py:277
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr "Ред {0}: Радна станица или врста радне станице је обавезна за операцију {1}"
@@ -46589,6 +46658,8 @@ msgstr "Метод обрачуна зараде"
#: erpnext/accounts/doctype/shipping_rule/shipping_rule_dashboard.py:10
#: erpnext/accounts/doctype/tax_category/tax_category_dashboard.py:9
#: erpnext/accounts/doctype/tax_rule/tax_rule.json
+#: erpnext/crm/doctype/opportunity/opportunity.js:288
+#: erpnext/crm/doctype/opportunity/opportunity.py:158
#: erpnext/projects/doctype/project/project_dashboard.py:15
#: erpnext/regional/report/vat_audit_report/vat_audit_report.py:185
#: erpnext/selling/doctype/quotation/quotation.json
@@ -46681,8 +46752,8 @@ msgstr "Продајна улазна јединична цена"
#: erpnext/accounts/doctype/sales_invoice_reference/sales_invoice_reference.json
#: erpnext/accounts/print_format/sales_auditing_voucher/sales_auditing_voucher.html:5
#: erpnext/accounts/report/gross_profit/gross_profit.js:30
-#: erpnext/accounts/report/gross_profit/gross_profit.py:256
-#: erpnext/accounts/report/gross_profit/gross_profit.py:263
+#: erpnext/accounts/report/gross_profit/gross_profit.py:262
+#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: erpnext/accounts/workspace/accounting/accounting.json
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/crm/doctype/contract/contract.json
@@ -46694,7 +46765,7 @@ msgstr "Продајна улазна јединична цена"
#: erpnext/selling/workspace/selling/selling.json
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/setup/workspace/home/home.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:343
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:349
#: erpnext/stock/doctype/delivery_note/delivery_note_list.js:65
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
msgid "Sales Invoice"
@@ -46772,11 +46843,11 @@ msgstr "Излазна фактура није поднета"
msgid "Sales Invoice isn't created by user {}"
msgstr "Излазна фактура није креирана од стране корисника {}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:422
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:423
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr "Режим излазног фактурисања је активиран у малопродаји. Молимо Вас да направите излазну фактуру уместо тога."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:616
msgid "Sales Invoice {0} has already been submitted"
msgstr "Излазна фактура {0} је већ поднета"
@@ -46920,7 +46991,7 @@ msgstr "Продајне прилике по извору"
#: erpnext/selling/workspace/selling/selling.json
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.js:160
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:223
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:226
#: erpnext/stock/doctype/material_request/material_request.js:219
#: erpnext/stock/doctype/material_request_item/material_request_item.json
#: erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -46972,7 +47043,7 @@ msgstr "Датум продајне поруџбине"
#: erpnext/manufacturing/doctype/production_plan_item_reference/production_plan_item_reference.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/selling/doctype/sales_order/sales_order.js:313
-#: erpnext/selling/doctype/sales_order/sales_order.js:870
+#: erpnext/selling/doctype/sales_order/sales_order.js:873
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/stock/doctype/material_request_item/material_request_item.json
#: erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -47005,7 +47076,7 @@ msgstr "Статус продајне поруџбине"
msgid "Sales Order Trends"
msgstr "Трендови продајне поруџбине"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:268
msgid "Sales Order required for Item {0}"
msgstr "Продајна поруџбина је потребна за ставку {0}"
@@ -47175,7 +47246,7 @@ msgstr "Резиме уплата од продаје"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:191
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:80
#: erpnext/accounts/report/gross_profit/gross_profit.js:50
-#: erpnext/accounts/report/gross_profit/gross_profit.py:371
+#: erpnext/accounts/report/gross_profit/gross_profit.py:377
#: erpnext/crm/workspace/crm/crm.json
#: erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
#: erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
@@ -47256,8 +47327,8 @@ msgstr "Регистар продаје"
msgid "Sales Representative"
msgstr "Продајни представник"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:857
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:267
+#: erpnext/accounts/report/gross_profit/gross_profit.py:874
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:273
msgid "Sales Return"
msgstr "Повраћај продаје"
@@ -47515,8 +47586,8 @@ msgstr "Субота"
#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js:119
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:628
#: erpnext/accounts/doctype/ledger_merge/ledger_merge.js:75
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:292
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:328
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47554,7 +47625,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/public/js/utils/barcode_scanner.js:215
+#: erpnext/public/js/utils/barcode_scanner.js:241
#: erpnext/selling/doctype/quotation/quotation.json
#: erpnext/selling/doctype/sales_order/sales_order.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -47586,7 +47657,7 @@ msgstr "Режим скенирања"
msgid "Scan Serial No"
msgstr "Скенирај број серије"
-#: erpnext/public/js/utils/barcode_scanner.js:179
+#: erpnext/public/js/utils/barcode_scanner.js:205
msgid "Scan barcode for item {0}"
msgstr "Скенирај бар-код за ставку {0}"
@@ -47600,7 +47671,7 @@ msgstr "Режим скенирања је омогућен, постојећа
msgid "Scanned Cheque"
msgstr "Скенирани чек"
-#: erpnext/public/js/utils/barcode_scanner.js:247
+#: erpnext/public/js/utils/barcode_scanner.js:273
msgid "Scanned Quantity"
msgstr "Скенирана количина"
@@ -47894,7 +47965,7 @@ msgid "Segregate Serial / Batch Bundle"
msgstr "Раздвоји пакет серије / шарже"
#: erpnext/buying/doctype/purchase_order/purchase_order.js:250
-#: erpnext/selling/doctype/sales_order/sales_order.js:1107
+#: erpnext/selling/doctype/sales_order/sales_order.js:1110
#: erpnext/selling/doctype/sales_order/sales_order_list.js:96
#: erpnext/selling/report/sales_analytics/sales_analytics.js:93
msgid "Select"
@@ -47916,15 +47987,15 @@ msgstr "Изаберите алтернативну ставку за прода
msgid "Select Attribute Values"
msgstr "Изаберите вредности атрибута"
-#: erpnext/selling/doctype/sales_order/sales_order.js:853
+#: erpnext/selling/doctype/sales_order/sales_order.js:856
msgid "Select BOM"
msgstr "Изаберите саставницу"
-#: erpnext/selling/doctype/sales_order/sales_order.js:834
+#: erpnext/selling/doctype/sales_order/sales_order.js:837
msgid "Select BOM and Qty for Production"
msgstr "Изаберите саставницу и количину за производњу"
-#: erpnext/selling/doctype/sales_order/sales_order.js:985
+#: erpnext/selling/doctype/sales_order/sales_order.js:988
msgid "Select BOM, Qty and For Warehouse"
msgstr "Изаберите саставницу, количину и складиште"
@@ -47954,7 +48025,7 @@ msgstr "Изаберите колоне и филтере"
msgid "Select Company"
msgstr "Изаберите компанију"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:468
+#: erpnext/manufacturing/doctype/job_card/job_card.js:476
msgid "Select Corrective Operation"
msgstr "Изаберите корективну операцију"
@@ -47995,7 +48066,7 @@ msgstr "Изаберите адресу отпреме "
msgid "Select DocType"
msgstr "Изаберите DocType"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:186
+#: erpnext/manufacturing/doctype/job_card/job_card.js:194
msgid "Select Employees"
msgstr "Изаберите запослена лица"
@@ -48003,12 +48074,12 @@ msgstr "Изаберите запослена лица"
msgid "Select Finished Good"
msgstr "Изаберите готов производ"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1186
-#: erpnext/selling/doctype/sales_order/sales_order.js:1198
+#: erpnext/selling/doctype/sales_order/sales_order.js:1189
+#: erpnext/selling/doctype/sales_order/sales_order.js:1201
msgid "Select Items"
msgstr "Изаберите ставке"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1072
+#: erpnext/selling/doctype/sales_order/sales_order.js:1075
msgid "Select Items based on Delivery Date"
msgstr "Изаберите ставке на основу датума испоруке"
@@ -48019,7 +48090,7 @@ msgstr "Изаберите ставке за контролу квалитета
#. Label of the select_items_to_manufacture_section (Section Break) field in
#. DocType 'Production Plan'
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:881
+#: erpnext/selling/doctype/sales_order/sales_order.js:884
msgid "Select Items to Manufacture"
msgstr "Изаберите ставке за производњу"
@@ -48033,7 +48104,7 @@ msgstr "Изаберите ставке до датума испоруке"
msgid "Select Job Worker Address"
msgstr "Изаберите адресу запосленог"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1118
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1127
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:955
msgid "Select Loyalty Program"
msgstr "Изаберите програм лојалности"
@@ -48167,7 +48238,7 @@ msgstr "Изаберите финансијску евиденцију за ст
msgid "Select item group"
msgstr "Изаберите групу ставки"
-#: erpnext/manufacturing/doctype/bom/bom.js:376
+#: erpnext/manufacturing/doctype/bom/bom.js:397
msgid "Select template item"
msgstr "Изаберите шаблон ставке"
@@ -48184,7 +48255,7 @@ msgstr "Изаберите подразумевану радну станицу
msgid "Select the Item to be manufactured."
msgstr "Изаберите ставку која ће бити произведена."
-#: erpnext/manufacturing/doctype/bom/bom.js:858
+#: erpnext/manufacturing/doctype/bom/bom.js:879
msgid "Select the Item to be manufactured. The Item name, UoM, Company, and Currency will be fetched automatically."
msgstr "Изаберите ставку која ће бити произведена. Назив ставке, јединица мере, компанија и валута ће аутоматски бити преузети."
@@ -48205,11 +48276,11 @@ msgstr "Изаберите датум"
msgid "Select the date and your timezone"
msgstr "Изаберите датум и временску зону"
-#: erpnext/manufacturing/doctype/bom/bom.js:877
+#: erpnext/manufacturing/doctype/bom/bom.js:898
msgid "Select the raw materials (Items) required to manufacture the Item"
msgstr "Изаберите сировине (ставке) потребне за производњу ставке"
-#: erpnext/manufacturing/doctype/bom/bom.js:431
+#: erpnext/manufacturing/doctype/bom/bom.js:452
msgid "Select variant item code for the template item {0}"
msgstr "Изаберите шифру варијанте ставке за шаблон ставке {0}"
@@ -48294,7 +48365,7 @@ msgstr "Продаја имовине"
msgid "Selling"
msgstr "Продаја"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:330
+#: erpnext/accounts/report/gross_profit/gross_profit.py:336
msgid "Selling Amount"
msgstr "Продајни износ"
@@ -48466,7 +48537,7 @@ msgstr "Подешавање ставке серије и шарже"
msgid "Serial / Batch Bundle"
msgstr "Пакет серије / шарже"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:441
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:442
msgid "Serial / Batch Bundle Missing"
msgstr "Недостаје пакет серије / шарже"
@@ -48543,7 +48614,7 @@ msgstr "Бројеви серије / шарже"
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:65
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:149
#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:37
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:409
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:436
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:38
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:60
#: erpnext/stock/report/stock_ledger/stock_ledger.py:336
@@ -48643,7 +48714,7 @@ msgstr "Број серије је обавезан за ставку {0}"
msgid "Serial No {0} already exists"
msgstr "Број серије {0} већ постоји"
-#: erpnext/public/js/utils/barcode_scanner.js:321
+#: erpnext/public/js/utils/barcode_scanner.js:347
msgid "Serial No {0} already scanned"
msgstr "Број серије {0} је већ скениран"
@@ -48664,7 +48735,7 @@ msgstr "Број серије {0} не постоји"
msgid "Serial No {0} does not exists"
msgstr "Број серије {0} не постоји"
-#: erpnext/public/js/utils/barcode_scanner.js:402
+#: erpnext/public/js/utils/barcode_scanner.js:436
msgid "Serial No {0} is already added"
msgstr "Број серије {0} је већ додат"
@@ -48692,7 +48763,7 @@ msgstr "Број серије {0} није пронађен"
msgid "Serial No: {0} has already been transacted into another POS Invoice."
msgstr "Број серије: {0} је већ трансакцијски уписан у други фискални рачун."
-#: erpnext/public/js/utils/barcode_scanner.js:271
+#: erpnext/public/js/utils/barcode_scanner.js:297
#: erpnext/public/js/utils/serial_no_batch_selector.js:16
#: erpnext/public/js/utils/serial_no_batch_selector.js:190
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:50
@@ -49189,8 +49260,8 @@ msgstr "Постави основну цену ручно"
msgid "Set Default Supplier"
msgstr "Постави подразумеваног добављача"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:339
-#: erpnext/manufacturing/doctype/job_card/job_card.js:408
+#: erpnext/manufacturing/doctype/job_card/job_card.js:347
+#: erpnext/manufacturing/doctype/job_card/job_card.js:416
msgid "Set Finished Good Quantity"
msgstr "Постави количину готовог производа"
@@ -49221,11 +49292,11 @@ msgstr "Постави буџете по групама ставки за ову
msgid "Set Landed Cost Based on Purchase Invoice Rate"
msgstr "Постави укупне трошкове на основу цене улазне фактуре"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1130
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1139
msgid "Set Loyalty Program"
msgstr "Постави програм лојалности"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:312
msgid "Set New Release Date"
msgstr "Постави нови датум издавања"
@@ -49254,7 +49325,7 @@ msgstr "Постави лозинку"
msgid "Set Posting Date"
msgstr "Постави датум књижења"
-#: erpnext/manufacturing/doctype/bom/bom.js:904
+#: erpnext/manufacturing/doctype/bom/bom.js:925
msgid "Set Process Loss Item Quantity"
msgstr "Постави количину ставки за губитак у процесу"
@@ -49268,7 +49339,7 @@ msgstr "Постави статус пројекта"
msgid "Set Project and all Tasks to status {0}?"
msgstr "Поставу пројекат и све задатке у статус {0}?"
-#: erpnext/manufacturing/doctype/bom/bom.js:905
+#: erpnext/manufacturing/doctype/bom/bom.js:926
msgid "Set Quantity"
msgstr "Постави количину"
@@ -49375,7 +49446,7 @@ msgstr "Постави подразумевани рачун {0} за ставк
msgid "Set fieldname from which you want to fetch the data from the parent form."
msgstr "Поставите име поља са којег желите да преузмете податке из матичног обрасца."
-#: erpnext/manufacturing/doctype/bom/bom.js:894
+#: erpnext/manufacturing/doctype/bom/bom.js:915
msgid "Set quantity of process loss item:"
msgstr "Поставите количину ставки за губитак у процесу:"
@@ -49405,15 +49476,15 @@ msgstr "Поставите статус ручно."
msgid "Set this if the customer is a Public Administration company."
msgstr "Постави ово уколико је купац јавно предузеће."
-#: erpnext/assets/doctype/asset/asset.py:750
+#: erpnext/assets/doctype/asset/asset.py:766
msgid "Set {0} in asset category {1} for company {2}"
msgstr "Постави {0} у категорију имовине {1} за компанију {2}"
-#: erpnext/assets/doctype/asset/asset.py:1083
+#: erpnext/assets/doctype/asset/asset.py:1099
msgid "Set {0} in asset category {1} or company {2}"
msgstr "Постави {0} у категорију имовине {1} или у компанију {2}"
-#: erpnext/assets/doctype/asset/asset.py:1080
+#: erpnext/assets/doctype/asset/asset.py:1096
msgid "Set {0} in company {1}"
msgstr "Постави {0} у компанију {1}"
@@ -49480,7 +49551,7 @@ msgstr "Постављање рачуна као рачун компаније
msgid "Setting up company"
msgstr "Постављање компаније"
-#: erpnext/manufacturing/doctype/bom/bom.py:1051
+#: erpnext/manufacturing/doctype/bom/bom.py:1088
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr "Подешавање {0} је неопходно"
@@ -49613,7 +49684,7 @@ msgid "Shift Name"
msgstr "Назив промене"
#. Name of a DocType
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:243
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:249
#: erpnext/stock/doctype/shipment/shipment.json
msgid "Shipment"
msgstr "Пошиљка"
@@ -49664,7 +49735,7 @@ msgstr "Врста пошиљке"
msgid "Shipment details"
msgstr "Детаљи испоруке"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:787
msgid "Shipments"
msgstr "Испоруке"
@@ -50350,7 +50421,7 @@ msgstr "Изворни документ"
msgid "Source Document Name"
msgstr "Назив изворног документа"
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:478
msgid "Source Document No"
msgstr "Број изворног документа"
@@ -50400,7 +50471,7 @@ msgstr "Врста извора"
#. Label of the s_warehouse (Link) field in DocType 'Stock Entry Detail'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/manufacturing/doctype/bom/bom.js:403
+#: erpnext/manufacturing/doctype/bom/bom.js:424
#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
@@ -50428,7 +50499,7 @@ msgstr "Адреса изворног складишта"
msgid "Source Warehouse Address Link"
msgstr "Линк за адресу изворног складишта"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1154
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr "Изворно складиште је обавезно за ставку {0}."
@@ -50524,7 +50595,7 @@ msgstr "Подели издавање"
msgid "Split Qty"
msgstr "Подели количину"
-#: erpnext/assets/doctype/asset/asset.py:1222
+#: erpnext/assets/doctype/asset/asset.py:1238
msgid "Split Quantity must be less than Asset Quantity"
msgstr "Подељена количина мора бити мања од количине имовине"
@@ -50717,7 +50788,7 @@ msgstr "Почетак брисања"
msgid "Start Import"
msgstr "Почетак увоза"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:180
+#: erpnext/manufacturing/doctype/job_card/job_card.js:188
#: erpnext/manufacturing/doctype/workstation/workstation.js:124
msgid "Start Job"
msgstr "Покрени задатак"
@@ -51026,14 +51097,14 @@ msgstr "Својства стања"
#: erpnext/setup/doctype/driver/driver.json
#: erpnext/setup/doctype/employee/employee.json
#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:323
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:358
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:329
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:364
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_trip/delivery_trip.json
#: erpnext/stock/doctype/material_request/material_request.json
#: erpnext/stock/doctype/pick_list/pick_list.json
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:276
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:305
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:283
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:312
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
#: erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
@@ -51112,8 +51183,8 @@ msgstr "Залихе"
#: erpnext/accounts/doctype/account/account.json
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:50
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:73
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1337
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1363
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1339
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1365
#: erpnext/accounts/report/account_balance/account_balance.js:58
msgid "Stock Adjustment"
msgstr "Прилагођавање залиха"
@@ -51270,7 +51341,7 @@ msgstr "Ставка уноса залиха"
msgid "Stock Entry Type"
msgstr "Врста уноса залиха"
-#: erpnext/stock/doctype/pick_list/pick_list.py:1384
+#: erpnext/stock/doctype/pick_list/pick_list.py:1396
msgid "Stock Entry has been already created against this Pick List"
msgstr "Унос залиха је већ креиран за ову листу за одабир"
@@ -51504,14 +51575,14 @@ msgstr "Подешавање поновне обраде залиха"
#: erpnext/stock/doctype/pick_list/pick_list.js:166
#: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12
#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:714
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:666
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1225
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1563
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1576
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1590
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1604
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1618
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1635
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:668
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1227
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1565
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1578
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1592
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1606
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1620
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1637
#: erpnext/stock/doctype/stock_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51520,13 +51591,13 @@ msgstr "Подешавање поновне обраде залиха"
msgid "Stock Reservation"
msgstr "Резервација залиха"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1746
msgid "Stock Reservation Entries Cancelled"
msgstr "Уноси резервације залиха отказани"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2156
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1698
msgid "Stock Reservation Entries Created"
msgstr "Уноси резервације залиха креирани"
@@ -51534,25 +51605,25 @@ msgstr "Уноси резервације залиха креирани"
#: erpnext/public/js/stock_reservation.js:308
#: erpnext/selling/doctype/sales_order/sales_order.js:444
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:352
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:354
#: erpnext/stock/report/reserved_stock/reserved_stock.js:53
#: erpnext/stock/report/reserved_stock/reserved_stock.py:171
msgid "Stock Reservation Entry"
msgstr "Унос резервације залиха"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:528
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:530
msgid "Stock Reservation Entry cannot be updated as it has been delivered."
msgstr "Унос резервације залиха не може бити ажуриран јер су залихе испоручене."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:522
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:524
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:547
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:549
msgid "Stock Reservation Warehouse Mismatch"
msgstr "Неподударање складишта за резервацију залиха"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:675
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:677
msgid "Stock Reservation can only be created against {0}."
msgstr "Резервација залиха може бити креирана само против {0}."
@@ -51587,7 +51658,7 @@ msgstr "Резервисана количина залиха (у јединиц
#. Label of a Link in the Stock Workspace
#: erpnext/setup/doctype/company/company.json
#: erpnext/setup/workspace/settings/settings.json
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:667
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:669
#: erpnext/stock/doctype/stock_settings/stock_settings.json
#: erpnext/stock/workspace/stock/stock.json
msgid "Stock Settings"
@@ -51793,11 +51864,11 @@ msgstr "Залихе и производња"
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr "Залихе не могу бити резервисане у групном складишту {0}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1510
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr "Залихе не могу бити резервисане у групном складишту {0}."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:727
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:729
msgid "Stock cannot be updated against Purchase Receipt {0}"
msgstr "Залихе се не могу ажурирати према пријемници набавке {0}"
@@ -51809,11 +51880,11 @@ msgstr "Залихе не могу бити ажуриране за следећ
msgid "Stock cannot be updated because the invoice contains a drop shipping item. Please disable 'Update Stock' or remove the drop shipping item."
msgstr "Залихе не могу бити ажуриране јер фактура не садржи ставку са дроп схиппинг-ом. Молимо Вас да онемогућите 'Ажурирај залихе' или уклоните ставке са дроп схиппинг-ом."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1121
msgid "Stock has been unreserved for work order {0}."
msgstr "Поништено је резервисање залиха за радни налог {0}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:323
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:325
msgid "Stock not available for Item {0} in Warehouse {1}."
msgstr "Залихе нису доступне за ставку {0} у складишту {1}."
@@ -52125,7 +52196,7 @@ msgstr "Услужна ставка налога за подуговарање"
msgid "Subcontracting Order Supplied Item"
msgstr "Набављене ставке налога за подуговарање"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:943
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:965
msgid "Subcontracting Order {0} created."
msgstr "Налог за подуговарање {0} је креиран."
@@ -52215,7 +52286,7 @@ msgstr "Наслов"
msgid "Submit"
msgstr "Поднеси"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:939
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:961
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:910
msgid "Submit Action Failed"
msgstr "Подношење радње није успело"
@@ -52666,7 +52737,7 @@ msgstr "Набављена количина"
#: erpnext/selling/doctype/customer/customer.js:230
#: erpnext/selling/doctype/party_specific_item/party_specific_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:160
-#: erpnext/selling/doctype/sales_order/sales_order.js:1231
+#: erpnext/selling/doctype/sales_order/sales_order.js:1235
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/doctype/sms_center/sms_center.json
#: erpnext/setup/workspace/home/home.json
@@ -52677,7 +52748,7 @@ msgstr "Набављена количина"
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
#: erpnext/stock/doctype/shipment/shipment.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:462
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:505
#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr "Добављач"
@@ -52802,7 +52873,7 @@ msgstr "Фактура добављача"
msgid "Supplier Invoice Date"
msgstr "Датум издавања фактуре добављача"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1730
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1732
msgid "Supplier Invoice Date cannot be greater than Posting Date"
msgstr "Датум издавања фактуре добављача не може бити већи од датума књижења"
@@ -52812,12 +52883,12 @@ msgstr "Датум издавања фактуре добављача не мо
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:59
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/report/general_ledger/general_ledger.html:104
-#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/general_ledger/general_ledger.py:780
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr "Број фактуре добављача"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1757
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1759
msgid "Supplier Invoice No exists in Purchase Invoice {0}"
msgstr "Број фактуре добављача већ постоји у улазној фактури {0}"
@@ -53045,7 +53116,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:62
+#: erpnext/manufacturing/doctype/job_card/job_card.js:70
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
msgid "Supplier Warehouse"
msgstr "Складиште добављача"
@@ -53378,7 +53449,7 @@ msgstr "Износ пореза одбијеног на извору"
msgid "TDS Computation Summary"
msgstr "Резиме обрачуна пореза одбијеног на извору"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1514
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1516
msgid "TDS Deducted"
msgstr "Одбијен порез по одбитку на извору"
@@ -54233,7 +54304,7 @@ msgstr "Телевизија"
msgid "Template"
msgstr "Шаблон"
-#: erpnext/manufacturing/doctype/bom/bom.js:355
+#: erpnext/manufacturing/doctype/bom/bom.js:376
msgid "Template Item"
msgstr "Ставка шаблона"
@@ -54469,7 +54540,7 @@ msgstr "Шаблон услова и одредби"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:182
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:68
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:221
-#: erpnext/accounts/report/gross_profit/gross_profit.py:399
+#: erpnext/accounts/report/gross_profit/gross_profit.py:411
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js:8
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:21
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:263
@@ -54568,7 +54639,7 @@ msgstr "Приступ захтеву за понуду са портала је
msgid "The BOM which will be replaced"
msgstr "Саставница која ће бити замењена"
-#: erpnext/stock/serial_batch_bundle.py:1378
+#: erpnext/stock/serial_batch_bundle.py:1394
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr "Шаржа {0} садржи негативну количину {1} у складишту {2}. Молимо Вас да исправите количину."
@@ -54683,7 +54754,7 @@ msgstr "Поље од власника не може бити празно"
msgid "The field To Shareholder cannot be blank"
msgstr "Поље ка власнику не може бити празно"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:399
msgid "The field {0} in row {1} is not set"
msgstr "Поље {0} у реду {1} није постављено"
@@ -54752,6 +54823,10 @@ msgstr "Радна картица {0} је {1} и не можете да је з
msgid "The job card {0} is in {1} state and you cannot start it again."
msgstr "Радна картица {0} је {1} и не можете поново да је започнете."
+#: erpnext/public/js/utils/barcode_scanner.js:533
+msgid "The last scanned warehouse has been cleared and won't be set in the subsequently scanned items"
+msgstr "Последње скенирано складиште је очишћено и неће бити подешено за ставке које се буду скенирале накнадно"
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.py:46
msgid "The lowest tier must have a minimum spent amount of 0. Customers need to be part of a tier as soon as they are enrolled in the program."
msgstr "Најнижи ниво мора имати минимални износ потрошње од 0. Купци морају бити део нивоа чим се пријаве за програм."
@@ -54830,7 +54905,7 @@ msgstr "Основни рачун {0} мора бити група"
msgid "The selected BOMs are not for the same item"
msgstr "Изабране саставнице нису за исту ставку"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:493
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:494
msgid "The selected change account {} doesn't belongs to Company {}."
msgstr "Изабрани рачун за промене {} не припада компанији {}."
@@ -54964,7 +55039,7 @@ msgstr "{0} {1} се корсити за израчунавање вреднос
msgid "Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc."
msgstr "Затим се ценовна правила филтрирају на основу купца, групе купаца, територије, добављача, врсте добављача, кампање, продајног партнера итд."
-#: erpnext/assets/doctype/asset/asset.py:579
+#: erpnext/assets/doctype/asset/asset.py:595
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr "Постоје активна одржавања или поправке за ову имовину. Морате их завршити пре него што откажете имовину."
@@ -55067,7 +55142,7 @@ msgstr "Ова ставка је варијанта {0} (Шаблон)."
msgid "This Month's Summary"
msgstr "Резиме овог месеца"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:952
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:974
msgid "This PO has been fully subcontracted."
msgstr "Ова набавна поруџбина је у потпуности подуговорена."
@@ -55091,7 +55166,7 @@ msgstr "Ова радња ће зауставити будуће наплате.
msgid "This action will unlink this account from any external service integrating ERPNext with your bank accounts. It cannot be undone. Are you certain ?"
msgstr "Ова радња ће поништити повезивање рачуна од било које есктерне услуге која повезује ERPNext са Вашим текућим рачуном. Ова радња се не може повратити. Да ли сте сигурни?"
-#: erpnext/assets/doctype/asset/asset.py:359
+#: erpnext/assets/doctype/asset/asset.py:360
msgid "This asset category is marked as non-depreciable. Please disable depreciation calculation or choose a different category."
msgstr "Ова категорија имовине је означена као неподложна амортизацији. Омогућите обрачун амортизације или изаберите другу категорију."
@@ -55103,7 +55178,7 @@ msgstr "Ово обухвата све таблице за оцењивање п
msgid "This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?"
msgstr "Овај документ прелази ограничење за {0} {1} за ставку {4}. Да ли правите још један {3} за исти {2}?"
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:483
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:489
msgid "This field is used to set the 'Customer'."
msgstr "Ово поље се користи за постављање 'Купца'."
@@ -55113,11 +55188,11 @@ msgstr "Ово поље се користи за постављање 'Купц
msgid "This filter will be applied to Journal Entry."
msgstr "Овај филтер ће бити примењен на налог књижења."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:812
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:813
msgid "This invoice has already been paid."
msgstr "Ова фактура је већ плаћена."
-#: erpnext/manufacturing/doctype/bom/bom.js:219
+#: erpnext/manufacturing/doctype/bom/bom.js:240
msgid "This is a Template BOM and will be used to make the work order for {0} of the item {1}"
msgstr "Ово је шаблон саставнице и користиће се за израду радног налога {0} ставке {1}"
@@ -55190,7 +55265,7 @@ msgstr "Ово се заснива на трансакцијама везани
msgid "This is considered dangerous from accounting point of view."
msgstr "Ово се сматра ризичним са рачуноводственог становишта."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:531
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:533
msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice"
msgstr "Ово се ради како би се обрадила рачуноводствена евиденција у случајевима када је пријемница набавке креирана након улазне фактуре"
@@ -55206,7 +55281,7 @@ msgstr "Ово је за ставке сировина које ће се кор
msgid "This item filter has already been applied for the {0}"
msgstr "Овај филтер ставки је већ примењен за {0}"
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:496
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:502
msgid "This option can be checked to edit the 'Posting Date' and 'Posting Time' fields."
msgstr "Ова опција може бити означена како бисте могли да уређујете поља 'Датум књижења' и 'Време књижења'."
@@ -55242,7 +55317,7 @@ msgstr "Овај распоред је креиран када је имовин
msgid "This schedule was created when Asset {0} was scrapped."
msgstr "Овај распоред је креиран када је имовина {0} отписана."
-#: erpnext/assets/doctype/asset/asset.py:1356
+#: erpnext/assets/doctype/asset/asset.py:1372
msgid "This schedule was created when Asset {0} was {1} into new Asset {2}."
msgstr "Овај распоред је креиран када је имовина {0} била {1} у нову имовину {2}."
@@ -55264,7 +55339,7 @@ msgstr "Овај распоред је креиран када је премеш
msgid "This section allows the user to set the Body and Closing text of the Dunning Letter for the Dunning Type based on language, which can be used in Print."
msgstr "Овај одељак омогућава кориснику да постави текст и закључак опомене за врсту опомене на основу језика, који се може користити при штампању."
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:489
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:495
msgid "This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc."
msgstr "Ова табела се користи за постављање детаља о пољима 'Ставка', 'Количина', 'Основна цена', итд."
@@ -55464,7 +55539,7 @@ msgstr "Тајмер је прекорачио задате часове."
#. Name of a DocType
#. Label of a Link in the Projects Workspace
#. Label of a shortcut in the Projects Workspace
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1014
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1023
#: erpnext/projects/doctype/timesheet/timesheet.json
#: erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py:26
#: erpnext/projects/report/timesheet_billing_summary/timesheet_billing_summary.py:59
@@ -55579,7 +55654,7 @@ msgstr "Наслов"
#. Label of the to_uom (Link) field in DocType 'UOM Conversion Factor'
#. Label of the to (Data) field in DocType 'Call Log'
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1046
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1055
#: erpnext/setup/doctype/uom_conversion_factor/uom_conversion_factor.json
#: erpnext/telephony/doctype/call_log/call_log.json
#: erpnext/templates/pages/projects.html:68
@@ -55950,7 +56025,7 @@ msgstr "У складиште"
msgid "To Warehouse (Optional)"
msgstr "У складиште (опционо)"
-#: erpnext/manufacturing/doctype/bom/bom.js:872
+#: erpnext/manufacturing/doctype/bom/bom.js:893
msgid "To add Operations tick the 'With Operations' checkbox."
msgstr "Да бисте додали операције, означите поље 'Са операцијама'."
@@ -56025,11 +56100,11 @@ msgstr "Да бисте ово поништили, омогућите '{0}' у
msgid "To still proceed with editing this Attribute Value, enable {0} in Item Variant Settings."
msgstr "Да бисте наставили са уређивањем ове вредности атрибута, омогућите {0} у подешавањима варијанти ставке."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:621
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:623
msgid "To submit the invoice without purchase order please set {0} as {1} in {2}"
msgstr "Да бисте поднели фактуру без набавне поруџбине, поставите {0} као {1} у {2}"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:642
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:644
msgid "To submit the invoice without purchase receipt please set {0} as {1} in {2}"
msgstr "Да бисте поднели фактуру без пријемница набавке, молимо Вас да поставите {0} као {1} у {2}"
@@ -56039,7 +56114,7 @@ msgid "To use a different finance book, please uncheck 'Include Default FB Asset
msgstr "Да бисте користили другу финансијску евиденцију, поништите означавање опције 'Укључи подразумевану имовину у финансијским евиденцијама'"
#: erpnext/accounts/report/financial_statements.py:603
-#: erpnext/accounts/report/general_ledger/general_ledger.py:304
+#: erpnext/accounts/report/general_ledger/general_ledger.py:310
#: erpnext/accounts/report/trial_balance/trial_balance.py:292
msgid "To use a different finance book, please uncheck 'Include Default FB Entries'"
msgstr "Да бисте користили другу финансијску књигу, поништите означавање опције 'Укључи подразумеване уносе у финансијским евиденцијама'"
@@ -56133,7 +56208,7 @@ msgstr "Торр"
#: erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py:229
#: erpnext/accounts/report/financial_statements.py:699
#: erpnext/accounts/report/general_ledger/general_ledger.html:132
-#: erpnext/accounts/report/general_ledger/general_ledger.py:378
+#: erpnext/accounts/report/general_ledger/general_ledger.py:398
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:699
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:93
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:98
@@ -56942,7 +57017,7 @@ msgstr "Укупни проценат доприноса треба бити 100
msgid "Total hours: {0}"
msgstr "Укупно сати: {0}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:523
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:524
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:536
msgid "Total payments amount can't be greater than {}"
msgstr "Укупан износ за плаћање не може бити већи од {}"
@@ -57602,7 +57677,7 @@ msgstr "UAE VAT Settings"
#: erpnext/quality_management/doctype/quality_review_objective/quality_review_objective.json
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
#: erpnext/selling/doctype/quotation_item/quotation_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1225
+#: erpnext/selling/doctype/sales_order/sales_order.js:1228
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:43
#: erpnext/selling/report/sales_analytics/sales_analytics.py:138
@@ -57676,7 +57751,7 @@ msgstr "Детаљи конверзије јединице мере"
msgid "UOM Conversion Factor"
msgstr "Фактор конверзије јединице мере"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1387
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1404
msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}"
msgstr "Фактор конверзије јединице мере ({0} -> {1}) није пронађен за ставку: {2}"
@@ -58060,11 +58135,11 @@ msgstr "Предстојећи догађаји у календару "
#: erpnext/accounts/doctype/account/account.js:204
#: erpnext/accounts/doctype/cost_center/cost_center.js:107
-#: erpnext/manufacturing/doctype/job_card/job_card.js:338
-#: erpnext/manufacturing/doctype/job_card/job_card.js:407
+#: erpnext/manufacturing/doctype/job_card/job_card.js:346
+#: erpnext/manufacturing/doctype/job_card/job_card.js:415
#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:500
#: erpnext/public/js/utils.js:608 erpnext/public/js/utils.js:912
-#: erpnext/public/js/utils/barcode_scanner.js:183
+#: erpnext/public/js/utils/barcode_scanner.js:209
#: erpnext/public/js/utils/serial_no_batch_selector.js:17
#: erpnext/public/js/utils/serial_no_batch_selector.js:191
#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js:179
@@ -58165,7 +58240,7 @@ msgstr "Ажурирај трошак утрошеног материјала у
#. Option for the 'Update Type' (Select) field in DocType 'BOM Update Log'
#. Label of the update_cost_section (Section Break) field in DocType 'BOM
#. Update Tool'
-#: erpnext/manufacturing/doctype/bom/bom.js:135
+#: erpnext/manufacturing/doctype/bom/bom.js:156
#: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.json
#: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json
msgid "Update Cost"
@@ -58259,7 +58334,7 @@ msgstr "Ажурирај учесталост пројекта"
msgid "Update latest price in all BOMs"
msgstr "Ажурирај најновију цену у свим саставницама"
-#: erpnext/assets/doctype/asset/asset.py:401
+#: erpnext/assets/doctype/asset/asset.py:402
msgid "Update stock must be enabled for the purchase invoice {0}"
msgstr "Морате омогућити ажурирање залиха за улазну фактуру {0}"
@@ -58275,7 +58350,7 @@ msgstr "Ажурирај модификовани временски жиг за
msgid "Update timestamp on new communication"
msgstr "Ажурирај временски жиг за нове комуникације"
-#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:534
+#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:539
msgid "Updated successfully"
msgstr "Ажурирање успешно"
@@ -58383,7 +58458,7 @@ msgstr "Користи поновну обраду на основу ставк
#. Label of the use_multi_level_bom (Check) field in DocType 'Work Order'
#. Label of the use_multi_level_bom (Check) field in DocType 'Stock Entry'
-#: erpnext/manufacturing/doctype/bom/bom.js:337
+#: erpnext/manufacturing/doctype/bom/bom.js:358
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Use Multi-Level BOM"
@@ -58713,7 +58788,7 @@ msgstr "Поља за датум почетка важења и датум за
msgid "Valid till Date cannot be before Transaction Date"
msgstr "Датум завршетка важења не може бити пре датума трансакције"
-#: erpnext/selling/doctype/quotation/quotation.py:154
+#: erpnext/selling/doctype/quotation/quotation.py:156
msgid "Valid till date cannot be before transaction date"
msgstr "Датум завршетка важења не може бити пре датума трансакције"
@@ -58775,7 +58850,7 @@ msgstr "Пуноважност и употреба"
msgid "Validity in Days"
msgstr "Пуноважност у данима"
-#: erpnext/selling/doctype/quotation/quotation.py:361
+#: erpnext/selling/doctype/quotation/quotation.py:363
msgid "Validity period of this quotation has ended."
msgstr "Период пуноважности ове понуде је истекао."
@@ -58824,7 +58899,7 @@ msgstr "Метод вредновања"
#. Label of the valuation_rate (Currency) field in DocType 'Stock
#. Reconciliation Item'
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:323
+#: erpnext/accounts/report/gross_profit/gross_profit.py:329
#: erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
#: erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json
#: erpnext/manufacturing/doctype/bom/bom.json
@@ -59053,7 +59128,7 @@ msgstr "Грешка атрибута варијанте"
msgid "Variant Attributes"
msgstr "Атрибути варијанте"
-#: erpnext/manufacturing/doctype/bom/bom.js:176
+#: erpnext/manufacturing/doctype/bom/bom.js:197
msgid "Variant BOM"
msgstr "Варијанта саставнице"
@@ -59075,8 +59150,8 @@ msgstr "Извештај о детаљима варијанте"
msgid "Variant Field"
msgstr "Поље варијанте"
-#: erpnext/manufacturing/doctype/bom/bom.js:291
-#: erpnext/manufacturing/doctype/bom/bom.js:370
+#: erpnext/manufacturing/doctype/bom/bom.js:312
+#: erpnext/manufacturing/doctype/bom/bom.js:391
msgid "Variant Item"
msgstr "Ставка варијанте"
@@ -59210,7 +59285,7 @@ msgstr "Видео подешавање"
#: erpnext/accounts/doctype/cost_center/cost_center_tree.js:56
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js:205
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:76
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:14
#: erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:24
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:167
@@ -59234,8 +59309,8 @@ msgstr "Видео подешавање"
#: erpnext/stock/doctype/item/item.js:142
#: erpnext/stock/doctype/item/item.js:150
#: erpnext/stock/doctype/item/item.js:158
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:228
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:239
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:232
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:243
#: erpnext/stock/doctype/stock_entry/stock_entry.js:297
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:46
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:62
@@ -59263,7 +59338,7 @@ msgstr "Приказ главне књиге"
msgid "View Leads"
msgstr "Приказ потенцијалних клијената"
-#: erpnext/accounts/doctype/account/account_tree.js:275
+#: erpnext/accounts/doctype/account/account_tree.js:270
#: erpnext/stock/doctype/batch/batch.js:18
msgid "View Ledger"
msgstr "Приказ дневника"
@@ -59401,7 +59476,7 @@ msgstr "Назив документа"
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:209
#: erpnext/accounts/report/general_ledger/general_ledger.js:49
-#: erpnext/accounts/report/general_ledger/general_ledger.py:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:735
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js:41
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:33
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:65
@@ -59440,7 +59515,7 @@ msgstr "Количина у документу"
#. Label of the voucher_subtype (Small Text) field in DocType 'GL Entry'
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:729
msgid "Voucher Subtype"
msgstr "Подврста документа"
@@ -59472,7 +59547,7 @@ msgstr "Подврста документа"
#: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1184
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:200
-#: erpnext/accounts/report/general_ledger/general_ledger.py:707
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
@@ -59493,7 +59568,7 @@ msgstr "Подврста документа"
#: erpnext/stock/report/reserved_stock/reserved_stock.py:145
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:40
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:107
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:429
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:472
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:27
#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:114
#: erpnext/stock/report/stock_ledger/stock_ledger.py:320
@@ -59627,7 +59702,7 @@ msgstr "Лице које је дошло без претходног заказ
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/gross_profit/gross_profit.js:56
-#: erpnext/accounts/report/gross_profit/gross_profit.py:308
+#: erpnext/accounts/report/gross_profit/gross_profit.py:314
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:41
#: erpnext/accounts/report/purchase_register/purchase_register.js:52
#: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py:28
@@ -59677,7 +59752,7 @@ msgstr "Лице које је дошло без претходног заказ
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:350
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:352
#: erpnext/stock/doctype/warehouse/warehouse.json
#: erpnext/stock/page/stock_balance/stock_balance.js:11
#: erpnext/stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:25
@@ -59703,7 +59778,7 @@ msgstr "Лице које је дошло без претходног заказ
#: erpnext/stock/report/reserved_stock/reserved_stock.py:96
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:34
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:138
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:442
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:485
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:21
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:47
#: erpnext/stock/report/stock_ageing/stock_ageing.js:30
@@ -59825,7 +59900,7 @@ msgid "Warehouse not found against the account {0}"
msgstr "Складиште није пронађено за рачун {0}"
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1160
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:426
msgid "Warehouse required for stock Item {0}"
msgstr "Складиште је обавезно за ставку залиха {0}"
@@ -60014,6 +60089,10 @@ msgstr "Статус гаранције / годишњег уговора о о
msgid "Warranty Claim"
msgstr "Рекламација по основу гаранције"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:525
+msgid "Warranty Expiry (Serial)"
+msgstr "Истек гаранције (серија)"
+
#. Label of the warranty_expiry_date (Date) field in DocType 'Serial No'
#. Label of the warranty_expiry_date (Date) field in DocType 'Warranty Claim'
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -60437,7 +60516,7 @@ msgstr "Складиште недовршене производње"
#. Entry'
#. Option for the 'From Voucher Type' (Select) field in DocType 'Stock
#. Reservation Entry'
-#: erpnext/manufacturing/doctype/bom/bom.js:167
+#: erpnext/manufacturing/doctype/bom/bom.js:188
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
@@ -60459,7 +60538,7 @@ msgstr "Складиште недовршене производње"
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:455
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:498
#: erpnext/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr "Радни налог"
@@ -60523,7 +60602,7 @@ msgstr "Радни налог се не може креирати из став
msgid "Work Order has been {0}"
msgstr "Радни налог је {0}"
-#: erpnext/selling/doctype/sales_order/sales_order.js:823
+#: erpnext/selling/doctype/sales_order/sales_order.js:826
msgid "Work Order not created"
msgstr "Радни налог није креиран"
@@ -60536,7 +60615,7 @@ msgstr "Радни налог: {0} радна картица није прона
msgid "Work Orders"
msgstr "Радни налози"
-#: erpnext/selling/doctype/sales_order/sales_order.js:908
+#: erpnext/selling/doctype/sales_order/sales_order.js:911
msgid "Work Orders Created: {0}"
msgstr "Креирани радни налози: {0}"
@@ -60976,7 +61055,7 @@ msgid "You can only have Plans with the same billing cycle in a Subscription"
msgstr "Мжете имати само планове са истим циклусом наплате у претплати"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:412
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:876
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:885
msgid "You can only redeem max {0} points in this order."
msgstr "Можете искористити максимално {0} поена у овој наруждбини."
@@ -61004,7 +61083,7 @@ msgstr "Не можете обрадити број серије {0} јер је
msgid "You can't redeem Loyalty Points having more value than the Total Amount."
msgstr "Не можете искористити поене лојалности у вредности већој од укупног износа."
-#: erpnext/manufacturing/doctype/bom/bom.js:653
+#: erpnext/manufacturing/doctype/bom/bom.js:674
msgid "You cannot change the rate if BOM is mentioned against any Item."
msgstr "Не можете променити цену уколико је саставница наведена за било коју ставку."
@@ -61104,7 +61183,7 @@ msgstr "Још увек нисте керирали {0}"
msgid "You must select a customer before adding an item."
msgstr "Морате да изаберете купца пре него што додате ставку."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:267
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:268
msgid "You need to cancel POS Closing Entry {} to be able to cancel this document."
msgstr "Морате отказати унос затварања малопродаје {} да бисте могли да откажете овај документ."
@@ -61201,7 +61280,7 @@ msgstr "као опис"
msgid "as Title"
msgstr "као наслов"
-#: erpnext/manufacturing/doctype/bom/bom.js:896
+#: erpnext/manufacturing/doctype/bom/bom.js:917
msgid "as a percentage of finished item quantity"
msgstr "као проценат количине финалне ставке"
@@ -61221,7 +61300,7 @@ msgstr "од {}"
msgid "cannot be greater than 100"
msgstr "не може бити веће од 100"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:331
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:333
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1046
msgid "dated {0}"
msgstr "датирано {0}"
@@ -61594,7 +61673,7 @@ msgstr "Рачун {0} не припада компанији {1}"
msgid "{0} account is not of type {1}"
msgstr "{0} рачун није врста {1}"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:496
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:498
msgid "{0} account not found while submitting purchase receipt"
msgstr "{0} налог није пронађен приликом подношења пријемнице набавке"
@@ -61618,7 +61697,7 @@ msgstr "{0} према продајној поруџбини {1}"
msgid "{0} already has a Parent Procedure {1}."
msgstr "{0} већ има матичну процедуру {1}."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:544
msgid "{0} and {1}"
msgstr "{0} и {1}"
@@ -61789,6 +61868,10 @@ msgstr "{0} је отворен. Затворите малопродају ил
msgid "{0} is required"
msgstr "{0} је обавезан"
+#: erpnext/assets/doctype/asset/asset.py:431
+msgid "{0} is still in Draft. Please submit it before saving the Asset."
+msgstr "{0} је и даље у нацрту. Молимо Вас да га поднесете пре него што сачувате имовину."
+
#: erpnext/manufacturing/doctype/work_order/work_order.js:454
msgid "{0} items in progress"
msgstr "{0} ставки у обради"
@@ -61874,6 +61957,10 @@ msgstr "{0} варијанти је креирано."
msgid "{0} will be given as discount."
msgstr "{0} ће бити дато као попуст."
+#: erpnext/public/js/utils/barcode_scanner.js:523
+msgid "{0} will be set as the {1} in subsequently scanned items"
+msgstr "{0} ће бити подешено као {1} при накнадном скенирању ставки"
+
#: erpnext/manufacturing/doctype/job_card/job_card.py:883
msgid "{0} {1}"
msgstr "{0} {1}"
@@ -61886,7 +61973,7 @@ msgstr "{0} {1} ручно"
msgid "{0} {1} Partially Reconciled"
msgstr "{0} {1} делимично усклађено"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:516
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:518
msgid "{0} {1} cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr "{0} {1} не може бити ажурирано. Уколико је потребно направити измене, препоручује се да откажете постојећи унос и креирате нови."
diff --git a/erpnext/locale/sr_CS.po b/erpnext/locale/sr_CS.po
index f0024ae8cbb..d7953235a1a 100644
--- a/erpnext/locale/sr_CS.po
+++ b/erpnext/locale/sr_CS.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: frappe\n"
"Report-Msgid-Bugs-To: hello@frappe.io\n"
-"POT-Creation-Date: 2025-08-10 09:37+0000\n"
-"PO-Revision-Date: 2025-08-11 17:06\n"
+"POT-Creation-Date: 2025-08-17 09:36+0000\n"
+"PO-Revision-Date: 2025-08-17 18:15\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Serbian (Latin)\n"
"MIME-Version: 1.0\n"
@@ -143,7 +143,7 @@ msgstr "% Završeno"
msgid "% Delivered"
msgstr "% Isporučeno"
-#: erpnext/manufacturing/doctype/bom/bom.js:892
+#: erpnext/manufacturing/doctype/bom/bom.js:913
#, python-format
msgid "% Finished Item Quantity"
msgstr "% Količina gotovih stavki"
@@ -1092,6 +1092,10 @@ msgstr "AB-"
msgid "ACC-PINV-.YYYY.-"
msgstr "ACC-PINV-.YYYY.-"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:531
+msgid "AMC Expiry (Serial)"
+msgstr "Istek godišnjeg ugovora o održavanju (serija)"
+
#. Label of the amc_expiry_date (Date) field in DocType 'Serial No'
#. Label of the amc_expiry_date (Date) field in DocType 'Warranty Claim'
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -1319,7 +1323,7 @@ msgstr "U skladu sa sastavnicom {0}, stavka '{1}' nedostaje u unosu zaliha."
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:30
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:190
#: erpnext/accounts/report/general_ledger/general_ledger.js:38
-#: erpnext/accounts/report/general_ledger/general_ledger.py:652
+#: erpnext/accounts/report/general_ledger/general_ledger.py:672
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js:30
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:30
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
@@ -1530,7 +1534,7 @@ msgstr "Račun je obavezan za unos uplate"
msgid "Account is not set for the dashboard chart {0}"
msgstr "Račun nije postavljen za dijagram na kontrolnoj tabli {0}"
-#: erpnext/assets/doctype/asset/asset.py:755
+#: erpnext/assets/doctype/asset/asset.py:771
msgid "Account not Found"
msgstr "Račun nije pronađen"
@@ -1912,8 +1916,8 @@ msgstr "Filter računovodstvenih dimenzija"
msgid "Accounting Entries"
msgstr "Računovodstveni unosi"
-#: erpnext/assets/doctype/asset/asset.py:789
-#: erpnext/assets/doctype/asset/asset.py:804
+#: erpnext/assets/doctype/asset/asset.py:805
+#: erpnext/assets/doctype/asset/asset.py:820
#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:559
msgid "Accounting Entry for Asset"
msgstr "Računovodstveni unos za imovinu"
@@ -1927,29 +1931,29 @@ msgstr "Računovodstveni unos za dokument troškova nabavke u unosu zaliha {0}"
msgid "Accounting Entry for Landed Cost Voucher for SCR {0}"
msgstr "Računovodstveni unos za dokument troškova nabavke koji se odnosi na usklađivanje zaliha {0}"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:814
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:816
msgid "Accounting Entry for Service"
msgstr "Računovodstveni unos za uslugu"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:999
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1020
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1038
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1059
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1080
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1104
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1211
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1447
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1469
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1001
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1022
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1040
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1061
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1082
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1106
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1213
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1449
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1471
#: erpnext/controllers/stock_controller.py:579
#: erpnext/controllers/stock_controller.py:596
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:909
#: erpnext/stock/doctype/stock_entry/stock_entry.py:1627
#: erpnext/stock/doctype/stock_entry/stock_entry.py:1641
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:613
msgid "Accounting Entry for Stock"
msgstr "Računovodstveni unos za zalihe"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:716
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:718
msgid "Accounting Entry for {0}"
msgstr "Računovodstveni unos za {0}"
@@ -2492,9 +2496,9 @@ msgstr "Radnja prilikom nove fakture"
#: erpnext/buying/doctype/supplier/supplier.js:128
#: erpnext/buying/doctype/supplier/supplier.js:137
#: erpnext/buying/doctype/supplier_scorecard_scoring_standing/supplier_scorecard_scoring_standing.json
-#: erpnext/manufacturing/doctype/bom/bom.js:139
-#: erpnext/manufacturing/doctype/bom/bom.js:150
-#: erpnext/manufacturing/doctype/bom/bom.js:161
+#: erpnext/manufacturing/doctype/bom/bom.js:160
+#: erpnext/manufacturing/doctype/bom/bom.js:171
+#: erpnext/manufacturing/doctype/bom/bom.js:182
#: erpnext/projects/doctype/project/project.js:87
#: erpnext/projects/doctype/project/project.js:95
#: erpnext/projects/doctype/project/project.js:151
@@ -2783,7 +2787,7 @@ msgstr "Stvarna vrsta poreza ne može biti uključena u cenu stavke u redu {0}"
#: erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json
#: erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
#: erpnext/crm/doctype/lead/lead.js:85
-#: erpnext/manufacturing/doctype/bom/bom.js:922
+#: erpnext/manufacturing/doctype/bom/bom.js:943
#: erpnext/manufacturing/doctype/plant_floor/stock_summary_template.html:55
#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:235
#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:264
@@ -2800,7 +2804,7 @@ msgstr "Dodaj"
msgid "Add / Edit Prices"
msgstr "Dodaj / Izmeni cene"
-#: erpnext/accounts/doctype/account/account_tree.js:252
+#: erpnext/accounts/doctype/account/account_tree.js:248
msgid "Add Child"
msgstr "Dodaj zavisni element"
@@ -2896,7 +2900,7 @@ msgid "Add Quote"
msgstr "Dodaj ponudu"
#. Label of the add_raw_materials (Button) field in DocType 'BOM Operation'
-#: erpnext/manufacturing/doctype/bom/bom.js:920
+#: erpnext/manufacturing/doctype/bom/bom.js:941
#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
msgid "Add Raw Materials"
msgstr "Dodaj sirovine"
@@ -3473,11 +3477,11 @@ msgstr "Adresa se koristi za određivanje poreske kategorije u transakcijama"
msgid "Adjust Asset Value"
msgstr "Podesi vrednost imovine"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1078
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1087
msgid "Adjustment Against"
msgstr "Prilagođavanje prema"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:644
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:646
msgid "Adjustment based on Purchase Invoice rate"
msgstr "Prilagođavanje na osnovu cene iz ulazne fakture"
@@ -3667,7 +3671,7 @@ msgstr "Protiv"
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
#: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:39
#: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:91
-#: erpnext/accounts/report/general_ledger/general_ledger.py:721
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Account"
msgstr "Protiv računa"
@@ -3686,7 +3690,7 @@ msgstr "Protiv okvirnog naloga"
msgid "Against Customer Order {0}"
msgstr "Protiv narudžbine kupca {0}"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1191
+#: erpnext/selling/doctype/sales_order/sales_order.js:1194
msgid "Against Default Supplier"
msgstr "Protiv podrazumevanog dobavljača"
@@ -3778,13 +3782,13 @@ msgstr "Protiv stavke na prodajnoj porudžbini"
msgid "Against Stock Entry"
msgstr "Protiv unosa zaliha"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:329
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:331
msgid "Against Supplier Invoice {0}"
msgstr "Protiv fakture dobavljača {0}"
#. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry'
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:741
+#: erpnext/accounts/report/general_ledger/general_ledger.py:774
msgid "Against Voucher"
msgstr "Protiv dokumenta"
@@ -3808,7 +3812,7 @@ msgstr "Protiv broja dokumenta"
#: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/general_ledger/general_ledger.py:772
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr "Protiv vrste dokumenta"
@@ -4099,11 +4103,11 @@ msgstr "Sve komunikacije uključujući i one iznad biće premeštene kao novi pr
msgid "All items are already requested"
msgstr "Sve stavke su već zahtevane"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1335
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1342
msgid "All items have already been Invoiced/Returned"
msgstr "Sve stavke su već fakturisane/vraćene"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1196
msgid "All items have already been received"
msgstr "Sve stavke su već primljene"
@@ -4129,7 +4133,7 @@ msgstr "Sve stavke su već vraćene."
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 "Sve potrebne stavke (sirovine) biće preuzete iz sastavnice i popunjene u ovoj tabeli. Ovde možete takođe promeniti izvorno skladište za bilo koju stavku. Tokom proizvodnje, možete pratiti prenesene sirovine iz ove tabele."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:847
msgid "All these items have already been Invoiced/Returned"
msgstr "Sve ove stavke su već fakturisane/vraćene"
@@ -4194,7 +4198,7 @@ msgstr "Raspoređeno"
#: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json
#: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
#: erpnext/accounts/doctype/unreconcile_payment_entries/unreconcile_payment_entries.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:378
+#: erpnext/accounts/report/gross_profit/gross_profit.py:384
#: erpnext/public/js/utils/unreconcile.js:87
msgid "Allocated Amount"
msgstr "Raspoređeni iznos"
@@ -4676,7 +4680,7 @@ msgstr "Već je postavljen podrazumevani profil maloprodaje {0} za korisnika {1}
msgid "Also you can't switch back to FIFO after setting the valuation method to Moving Average for this item."
msgstr "Takođe, ne možete se vratiti na FIFO nakon što ste podesili metod vrednovanja na prosečnu vrednost za ovu stavku."
-#: erpnext/manufacturing/doctype/bom/bom.js:200
+#: erpnext/manufacturing/doctype/bom/bom.js:221
#: erpnext/manufacturing/doctype/work_order/work_order.js:151
#: erpnext/manufacturing/doctype/work_order/work_order.js:166
#: erpnext/public/js/utils.js:518
@@ -5772,11 +5776,11 @@ msgstr "Pošto postoji negativno stanje zaliha, ne možete omogućiti {0}."
msgid "As there are reserved stock, you cannot disable {0}."
msgstr "Pošto postoje rezervisane zalihe, ne možete onemogućiti {0}."
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1031
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1046
msgid "As there are sufficient Sub Assembly Items, Work Order is not required for Warehouse {0}."
msgstr "Pošto postoji dovoljno stavki podsklopova, radni nalog nije potreban za skladište {0}."
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1743
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1760
msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}."
msgstr "Pošto postoji dovoljno sirovina, zahtev za nabavku nije potreban za skladište {0}."
@@ -5826,7 +5830,7 @@ msgstr "Sastavne komponente"
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/workspace/assets/assets.json
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:221
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:225
#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Asset"
msgstr "Imovina"
@@ -5944,7 +5948,7 @@ msgstr "Raspored amortizacije {0} za imovinu {1} već postoji."
msgid "Asset Depreciation Schedule {0} for Asset {1} and Finance Book {2} already exists."
msgstr "Raspored amortizacije {0} za imovinu {1} i finansijsku evidenciju {2} već postoji."
-#: erpnext/assets/doctype/asset/asset.py:176
+#: erpnext/assets/doctype/asset/asset.py:177
msgid "Asset Depreciation Schedules created/updated:
{0}
Please check, edit if needed, and submit the Asset."
msgstr "Raspored amortizacije imovine je kreiran/ažuriran
{0}
Molimo Vas da proverite i izmenite ukoliko je neophodno i da podnesete imovinu."
@@ -6017,7 +6021,7 @@ msgstr "Tim za održavanje imovine"
#. Label of a Link in the Assets Workspace
#: erpnext/assets/doctype/asset_movement/asset_movement.json
#: erpnext/assets/workspace/assets/assets.json
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:232
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:236
msgid "Asset Movement"
msgstr "Kretanje imovine"
@@ -6026,7 +6030,7 @@ msgstr "Kretanje imovine"
msgid "Asset Movement Item"
msgstr "Stavka kretanja imovine"
-#: erpnext/assets/doctype/asset/asset.py:1035
+#: erpnext/assets/doctype/asset/asset.py:1051
msgid "Asset Movement record {0} created"
msgstr "Evidencija kretanja imovine {0} je kreirana"
@@ -6155,11 +6159,11 @@ msgstr "Podešavanje korekcije vrednosti imovine ne može se evidentirati pre da
msgid "Asset Value Analytics"
msgstr "Analitika vrednosti imovine"
-#: erpnext/assets/doctype/asset/asset.py:208
+#: erpnext/assets/doctype/asset/asset.py:209
msgid "Asset cancelled"
msgstr "Imovina otkazana"
-#: erpnext/assets/doctype/asset/asset.py:584
+#: erpnext/assets/doctype/asset/asset.py:600
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr "Imovina ne može biti otkazana, jer je već {0}"
@@ -6171,15 +6175,15 @@ msgstr "Imovina ne može biti otpisana pre poslednjeg unosa amortizacije."
msgid "Asset capitalized after Asset Capitalization {0} was submitted"
msgstr "Imovina je kapitalizovana nakon što je kapitalizacija imovine {0} podneta"
-#: erpnext/assets/doctype/asset/asset.py:217
+#: erpnext/assets/doctype/asset/asset.py:218
msgid "Asset created"
msgstr "Imovina je kreirana"
-#: erpnext/assets/doctype/asset/asset.py:1275
+#: erpnext/assets/doctype/asset/asset.py:1291
msgid "Asset created after being split from Asset {0}"
msgstr "Imovina je kreirana nakon što je odvojena od imovine {0}"
-#: erpnext/assets/doctype/asset/asset.py:220
+#: erpnext/assets/doctype/asset/asset.py:221
msgid "Asset deleted"
msgstr "Imovina obrisana"
@@ -6220,7 +6224,7 @@ msgstr "Imovina je otpisana putem naloga knjiženja {0}"
msgid "Asset sold"
msgstr "Imovina prodata"
-#: erpnext/assets/doctype/asset/asset.py:195
+#: erpnext/assets/doctype/asset/asset.py:196
msgid "Asset submitted"
msgstr "Imovina podneta"
@@ -6228,7 +6232,7 @@ msgstr "Imovina podneta"
msgid "Asset transferred to Location {0}"
msgstr "Imovina prebačena na lokaciju {0}"
-#: erpnext/assets/doctype/asset/asset.py:1284
+#: erpnext/assets/doctype/asset/asset.py:1300
msgid "Asset updated after being split into Asset {0}"
msgstr "Imovina ažurirana nakon što je podeljeno na imovinu {0}"
@@ -6319,7 +6323,7 @@ msgstr "Imovina nije kreirana za {item_code}. Moraćete da kreirate imovinu ruč
msgid "Assets {assets_link} created for {item_code}"
msgstr "Imovina {assets_link} je kreirana za {item_code}"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:193
+#: erpnext/manufacturing/doctype/job_card/job_card.js:201
msgid "Assign Job to Employee"
msgstr "Dodeli posao zaposlenom licu"
@@ -6369,11 +6373,11 @@ msgstr "U redu #{0}: Odabrana količina {1} za stavku {2} je veća od dostupnog
msgid "At least one account with exchange gain or loss is required"
msgstr "Mora biti izabran barem jedan račun prihoda ili rashoda od kursnih razlika"
-#: erpnext/assets/doctype/asset/asset.py:1141
+#: erpnext/assets/doctype/asset/asset.py:1157
msgid "At least one asset has to be selected."
msgstr "Mora biti izabrana barem jedna stavka imovine."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:930
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:965
msgid "At least one invoice has to be selected."
msgstr "Mora biti izabrana barem jedna faktura."
@@ -6381,7 +6385,7 @@ msgstr "Mora biti izabrana barem jedna faktura."
msgid "At least one item should be entered with negative quantity in return document"
msgstr "Najmanje jedna stavka treba biti uneta sa negativnom količinom u povratnom dokumentu"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:484
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:485
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:540
msgid "At least one mode of payment is required for POS invoice."
msgstr "Mora biti odabran barem jedan način plaćanja za fiskalni račun."
@@ -6931,7 +6935,7 @@ msgstr "Dostupne zalihe"
msgid "Available Stock for Packing Items"
msgstr "Dostupne zalihe za pakovanje stavki"
-#: erpnext/assets/doctype/asset/asset.py:313
+#: erpnext/assets/doctype/asset/asset.py:314
msgid "Available for use date is required"
msgstr "Potreban je datum dostupnosti za upotrebu"
@@ -6948,7 +6952,7 @@ msgstr "Dostupno {0}"
msgid "Available-for-use Date"
msgstr "Datum dostupnosti za upotrebu"
-#: erpnext/assets/doctype/asset/asset.py:418
+#: erpnext/assets/doctype/asset/asset.py:419
msgid "Available-for-use Date should be after purchase date"
msgstr "Datum dostupnosti za upotrebu treba da bude posle datuma nabavke"
@@ -7003,7 +7007,7 @@ msgstr "Prosečna cena po cenovniku za nabavku"
msgid "Avg. Selling Price List Rate"
msgstr "Prosečna cena po cenovniku za prodaju"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:316
+#: erpnext/accounts/report/gross_profit/gross_profit.py:322
msgid "Avg. Selling Rate"
msgstr "Prosečna prodajna cena"
@@ -7058,7 +7062,7 @@ msgstr "Količina u zapisu o stanju stavki"
#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js:5
#: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:109
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1005
+#: erpnext/selling/doctype/sales_order/sales_order.js:1008
#: erpnext/stock/doctype/material_request/material_request.js:334
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/stock/doctype/stock_entry/stock_entry.js:633
@@ -7072,7 +7076,7 @@ msgstr "Sastavnica"
msgid "BOM 1"
msgstr "Sastavnica 1"
-#: erpnext/manufacturing/doctype/bom/bom.py:1519
+#: erpnext/manufacturing/doctype/bom/bom.py:1556
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr "Sastavnica 1 {0} i sastavnica 2 {1} ne bi trebale da budu iste"
@@ -7291,7 +7295,7 @@ msgstr "Stavka sastavnice na veb-sajtu"
msgid "BOM Website Operation"
msgstr "Operacija sastavnice na veb-sajtu"
-#: erpnext/stock/doctype/stock_entry/stock_entry.js:1208
+#: erpnext/stock/doctype/stock_entry/stock_entry.js:1214
msgid "BOM and Manufacturing Quantity are required"
msgstr "Sastavnica i količina za proizvodnju su obavezni"
@@ -7314,19 +7318,19 @@ msgstr "Rekurzija sastavnice: {0} ne može proisteći iz {1}"
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr "Rekurzija sastavnice: {1} ne može biti matična ili zavisna za {0}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1332
+#: erpnext/manufacturing/doctype/bom/bom.py:1369
msgid "BOM {0} does not belong to Item {1}"
msgstr "Sastavnica {0} ne pripada stavci {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1314
+#: erpnext/manufacturing/doctype/bom/bom.py:1351
msgid "BOM {0} must be active"
msgstr "Sastavnica {0} mora biti aktivna"
-#: erpnext/manufacturing/doctype/bom/bom.py:1317
+#: erpnext/manufacturing/doctype/bom/bom.py:1354
msgid "BOM {0} must be submitted"
msgstr "Sastavnica {0} mora biti podneta"
-#: erpnext/manufacturing/doctype/bom/bom.py:734
+#: erpnext/manufacturing/doctype/bom/bom.py:765
msgid "BOM {0} not found for the item {1}"
msgstr "Sastavnica {0} nije pronađena za stavku {1}"
@@ -7397,7 +7401,7 @@ msgstr "Stanje"
msgid "Balance (Dr - Cr)"
msgstr "Stanje (D - P)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:673
+#: erpnext/accounts/report/general_ledger/general_ledger.py:693
msgid "Balance ({0})"
msgstr "Stanje ({0})"
@@ -7789,7 +7793,7 @@ msgstr "Bar"
#: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
-#: erpnext/public/js/utils/barcode_scanner.js:282
+#: erpnext/public/js/utils/barcode_scanner.js:308
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#: erpnext/stock/doctype/item_barcode/item_barcode.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -8010,6 +8014,7 @@ msgid "Batch Details"
msgstr "Detalji šarže"
#: erpnext/stock/doctype/batch/batch.py:197
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:455
msgid "Batch Expiry Date"
msgstr "Datum isteka šarže"
@@ -8062,7 +8067,7 @@ msgstr "Status isteka stavke šarže"
#: 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:2446
-#: erpnext/public/js/utils/barcode_scanner.js:260
+#: erpnext/public/js/utils/barcode_scanner.js:286
#: erpnext/public/js/utils/serial_no_batch_selector.js:438
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#: erpnext/stock/doctype/item_price/item_price.json
@@ -8083,7 +8088,7 @@ msgstr "Status isteka stavke šarže"
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:81
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:160
#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:19
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:416
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:448
#: erpnext/stock/report/stock_ledger/stock_ledger.js:78
#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
#: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
@@ -8098,7 +8103,7 @@ msgstr "Broj šarže je obavezan"
msgid "Batch No {0} does not exists"
msgstr "Broj šarže {0} ne postoji"
-#: erpnext/stock/utils.py:632
+#: erpnext/stock/utils.py:638
msgid "Batch No {0} is linked with Item {1} which has serial no. Please scan serial no instead."
msgstr "Broj šarže {0} je povezan sa stavkom {1} koji ima broj serije. Molimo Vas da skenirate broj serije."
@@ -8166,7 +8171,7 @@ msgstr "Broj serije i šarže"
msgid "Batch not created for item {} since it does not have a batch series."
msgstr "Šarža nije kreirana za stavku {} jer nema seriju šarže."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:348
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:350
msgid "Batch {0} and Warehouse"
msgstr "Šarža {0} i skladište"
@@ -8243,7 +8248,7 @@ msgstr "Račun za odbijenu količinu u ulaznoj fakturi"
#. Label of a Card Break in the Manufacturing Workspace
#. Label of a Link in the Manufacturing Workspace
-#: erpnext/manufacturing/doctype/bom/bom.py:1188
+#: erpnext/manufacturing/doctype/bom/bom.py:1225
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8557,7 +8562,7 @@ msgid "Blanket Order Rate"
msgstr "Cena okvirne narudžine"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:268
msgid "Block Invoice"
msgstr "Blokirati fakturu"
@@ -8755,7 +8760,7 @@ msgstr "Šifra filijale"
#: erpnext/accounts/doctype/pricing_rule_brand/pricing_rule_brand.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:300
+#: erpnext/accounts/report/gross_profit/gross_profit.py:306
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:53
#: erpnext/accounts/report/sales_register/sales_register.js:64
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -8828,7 +8833,7 @@ msgstr "Emitovanje"
msgid "Brokerage"
msgstr "Provizija"
-#: erpnext/manufacturing/doctype/bom/bom.js:143
+#: erpnext/manufacturing/doctype/bom/bom.js:164
msgid "Browse BOM"
msgstr "Pregledaj sastavnicu"
@@ -9050,7 +9055,7 @@ msgstr "Nabavka"
msgid "Buying & Selling Settings"
msgstr "Podešavanje nabavke i prodaje"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:337
+#: erpnext/accounts/report/gross_profit/gross_profit.py:343
msgid "Buying Amount"
msgstr "Iznos nabavke"
@@ -9721,11 +9726,11 @@ msgstr "Ne može se konvertovati u grupu jer je izabrana vrsta računa."
msgid "Cannot covert to Group because Account Type is selected."
msgstr "Ne može se skloniti u grupu jer je izabrana vrsta računa."
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:988
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:990
msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts."
msgstr "Ne mogu se kreirati unosi za rezervaciju zaliha za prijemnicu nabavke sa budućim datumom."
-#: erpnext/selling/doctype/sales_order/sales_order.py:1758
+#: erpnext/selling/doctype/sales_order/sales_order.py:1774
#: erpnext/stock/doctype/pick_list/pick_list.py:199
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 "Ne može se kreirati lista za odabir za prodajnu porudžbinu {0} jer ima rezervisane zalihe. Poništite rezervisanje zaliha da biste kreirali listu."
@@ -9738,15 +9743,11 @@ msgstr "Ne mogu se kreirati knjigovodstveni unosi za onemogućene račune: {0}"
msgid "Cannot create return for consolidated invoice {0}."
msgstr "Nije moguće kreirati povrat za konsolidovanu fakturu {0}."
-#: erpnext/accounts/doctype/account/account_tree.js:241
-msgid "Cannot create root account."
-msgstr "Nije moguće kreirati osnovni račun."
-
-#: erpnext/manufacturing/doctype/bom/bom.py:1044
+#: erpnext/manufacturing/doctype/bom/bom.py:1081
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr "Ne može se deaktivirati ili otkazati sastavnica jer je povezana sa drugim sastavnicama"
-#: erpnext/crm/doctype/opportunity/opportunity.py:277
+#: erpnext/crm/doctype/opportunity/opportunity.py:282
msgid "Cannot declare as lost, because Quotation has been made."
msgstr "Ne može se proglasiti kao izgubljeno jer je izdata ponuda."
@@ -9776,7 +9777,11 @@ msgstr "Ne može se staviti više dokumenata u red za jednu kompaniju. {0} je ve
msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No."
msgstr "Ne može se obezbediti isporuka po broju serije jer je stavka {0} dodata sa i bez obezbeđenja isporuke po broju serije."
-#: erpnext/public/js/utils/barcode_scanner.js:54
+#: erpnext/public/js/utils/barcode_scanner.js:62
+msgid "Cannot find Item or Warehouse with this Barcode"
+msgstr "Nije moguće pronaći stavku ili skladište sa ovim bar-kodom"
+
+#: erpnext/public/js/utils/barcode_scanner.js:63
msgid "Cannot find Item with this Barcode"
msgstr "Ne može se pronaći stavka sa ovim bar-kodom"
@@ -9827,7 +9832,7 @@ msgstr "Nije moguće preuzeti token za povezivanje. Proverite evidenciju grešak
msgid "Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row"
msgstr "Ne može se izabrati vrsta naplate kao 'Na iznos prethodnog reda' ili 'Na ukupan iznos prethodnog reda' za prvi red"
-#: erpnext/selling/doctype/quotation/quotation.py:283
+#: erpnext/selling/doctype/quotation/quotation.py:285
msgid "Cannot set as Lost as Sales Order is made."
msgstr "Ne može se postaviti kao izgubljeno jer je napravljena prodajna porudžbina."
@@ -10014,7 +10019,7 @@ msgstr "Novčani tokovi iz poslovne aktivnosti"
msgid "Cash In Hand"
msgstr "Gotovina u blagajni"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:321
msgid "Cash or Bank Account is mandatory for making payment entry"
msgstr "Blagajna ili tekući račun je obavezan za unos uplate"
@@ -10640,8 +10645,8 @@ msgstr "Klijent"
#: erpnext/selling/doctype/sales_order/sales_order.js:591
#: erpnext/selling/doctype/sales_order/sales_order.js:623
#: erpnext/selling/doctype/sales_order/sales_order_list.js:66
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:319
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:276
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:325
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:283
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:170
#: erpnext/support/doctype/issue/issue.js:23
msgid "Close"
@@ -10746,7 +10751,7 @@ msgstr "Zatvaranje (Potražuje)"
msgid "Closing (Dr)"
msgstr "Zatvaranje (Duguje)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:379
+#: erpnext/accounts/report/general_ledger/general_ledger.py:399
msgid "Closing (Opening + Total)"
msgstr "Zatvaranje (Početno + Ukupno)"
@@ -11606,7 +11611,7 @@ msgstr "Kompanije je obavezna za generisanje fakture. Postavite podrazumevano pr
msgid "Company name not same"
msgstr "Naziv kompanije nije isti"
-#: erpnext/assets/doctype/asset/asset.py:261
+#: erpnext/assets/doctype/asset/asset.py:262
msgid "Company of asset {0} and purchase document {1} doesn't matches."
msgstr "Imovina {0} za kompaniju i ulazni dokument {1} se ne poklapaju."
@@ -11649,7 +11654,7 @@ msgstr "Kompanija {0} je dodata više puta"
msgid "Company {} does not exist yet. Taxes setup aborted."
msgstr "Kompanija {} još uvek ne postoji. Postavke poreza su prekinute."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:528
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:529
msgid "Company {} does not match with POS Profile Company {}"
msgstr "Kompanija {} se ne podudara sa profilom maloprodaje kompanije {}"
@@ -11686,7 +11691,7 @@ msgstr "Konkurenti"
msgid "Complete"
msgstr "Završeno"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:230
+#: erpnext/manufacturing/doctype/job_card/job_card.js:238
#: erpnext/manufacturing/doctype/workstation/workstation.js:151
msgid "Complete Job"
msgstr "Završi posao"
@@ -11819,8 +11824,8 @@ msgstr "Završena količina"
msgid "Completed Qty cannot be greater than 'Qty to Manufacture'"
msgstr "Završena količina ne može biti veća od 'Količina za proizvodnju'"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:278
-#: erpnext/manufacturing/doctype/job_card/job_card.js:373
+#: erpnext/manufacturing/doctype/job_card/job_card.js:286
+#: erpnext/manufacturing/doctype/job_card/job_card.js:381
#: erpnext/manufacturing/doctype/workstation/workstation.js:296
msgid "Completed Quantity"
msgstr "Završena količina"
@@ -12712,13 +12717,13 @@ msgstr "Korektivno"
msgid "Corrective Action"
msgstr "Korektivna radnja"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:430
+#: erpnext/manufacturing/doctype/job_card/job_card.js:438
msgid "Corrective Job Card"
msgstr "Korektivna radna kartica"
#. Label of the corrective_operation_section (Tab Break) field in DocType 'Job
#. Card'
-#: erpnext/manufacturing/doctype/job_card/job_card.js:437
+#: erpnext/manufacturing/doctype/job_card/job_card.js:445
#: erpnext/manufacturing/doctype/job_card/job_card.json
msgid "Corrective Operation"
msgstr "Korektivna operacija"
@@ -12862,9 +12867,9 @@ msgstr "Trošak"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:197
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98
#: erpnext/accounts/report/general_ledger/general_ledger.js:153
-#: erpnext/accounts/report/general_ledger/general_ledger.py:734
+#: erpnext/accounts/report/general_ledger/general_ledger.py:767
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
-#: erpnext/accounts/report/gross_profit/gross_profit.py:364
+#: erpnext/accounts/report/gross_profit/gross_profit.py:370
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
#: erpnext/accounts/report/purchase_register/purchase_register.js:46
#: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py:29
@@ -12949,8 +12954,8 @@ msgstr "Troškovni centar za stavku u redu je ažuriran na {0}"
msgid "Cost Center is a part of Cost Center Allocation, hence cannot be converted to a group"
msgstr "Troškovni centar je deo raspodele troškovnog centra, stoga ne može biti konvertovan u grupu"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1412
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:873
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1414
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:875
msgid "Cost Center is required in row {0} in Taxes table for type {1}"
msgstr "Troškovni centar je obavezan u redu {0} u tabeli poreza za vrstu {1}"
@@ -12970,11 +12975,11 @@ msgstr "Troškovni centar sa postojećim transakcijama ne može biti prepisan u
msgid "Cost Center {0} cannot be used for allocation as it is used as main cost center in other allocation record."
msgstr "Troškovni centar {0} ne može biti korišćen za raspodelu jer je korišćen kao glavni troškovni centar u drugom zapisu raspodele."
-#: erpnext/assets/doctype/asset/asset.py:289
+#: erpnext/assets/doctype/asset/asset.py:290
msgid "Cost Center {} doesn't belong to Company {}"
msgstr "Troškovni centar {} ne pripada kompaniji {}"
-#: erpnext/assets/doctype/asset/asset.py:296
+#: erpnext/assets/doctype/asset/asset.py:297
msgid "Cost Center {} is a group cost center and group cost centers cannot be used in transactions"
msgstr "Troškovni centar {} je grupni troškovni centar. Grupni troškovni centar ne može se koristiti u transakcijama"
@@ -13090,11 +13095,11 @@ msgstr "Polja za obračun troškova i fakturisanje su ažurirana"
msgid "Could Not Delete Demo Data"
msgstr "Nije moguće obrisati demo podatke"
-#: erpnext/selling/doctype/quotation/quotation.py:584
+#: erpnext/selling/doctype/quotation/quotation.py:606
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr "Nije moguće automatski kreirati kupca zbog sledećih nedostajućih obaveznih polja:"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:674
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr "Nije moguće automatski kreirati dokument o smanjenju, poništite označavanje opcije 'Izdaj dokument o smanjenju' i ponovo pošaljite"
@@ -13223,9 +13228,9 @@ msgstr "Potražuje"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:127
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:135
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:146
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:222
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:659
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:683
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:228
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:665
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:689
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13265,14 +13270,14 @@ msgstr "Potražuje"
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:34
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:48
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:64
-#: erpnext/manufacturing/doctype/bom/bom.js:171
-#: erpnext/manufacturing/doctype/bom/bom.js:180
-#: erpnext/manufacturing/doctype/bom/bom.js:190
-#: erpnext/manufacturing/doctype/bom/bom.js:194
-#: erpnext/manufacturing/doctype/bom/bom.js:438
+#: erpnext/manufacturing/doctype/bom/bom.js:192
+#: erpnext/manufacturing/doctype/bom/bom.js:201
+#: erpnext/manufacturing/doctype/bom/bom.js:211
+#: erpnext/manufacturing/doctype/bom/bom.js:215
+#: erpnext/manufacturing/doctype/bom/bom.js:459
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.js:99
-#: erpnext/manufacturing/doctype/job_card/job_card.js:137
-#: erpnext/manufacturing/doctype/job_card/job_card.js:151
+#: erpnext/manufacturing/doctype/job_card/job_card.js:145
+#: erpnext/manufacturing/doctype/job_card/job_card.js:159
#: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:268
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:145
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:159
@@ -13284,7 +13289,7 @@ msgstr "Potražuje"
#: erpnext/projects/doctype/task/task_tree.js:81
#: erpnext/public/js/communication.js:19 erpnext/public/js/communication.js:31
#: erpnext/public/js/communication.js:41
-#: erpnext/public/js/controllers/transaction.js:361
+#: erpnext/public/js/controllers/transaction.js:362
#: erpnext/public/js/controllers/transaction.js:2494
#: erpnext/selling/doctype/customer/customer.js:181
#: erpnext/selling/doctype/quotation/quotation.js:125
@@ -13303,18 +13308,18 @@ msgstr "Potražuje"
#: erpnext/selling/doctype/sales_order/sales_order.js:759
#: erpnext/selling/doctype/sales_order/sales_order.js:766
#: erpnext/selling/doctype/sales_order/sales_order.js:770
-#: erpnext/selling/doctype/sales_order/sales_order.js:917
-#: erpnext/selling/doctype/sales_order/sales_order.js:1056
+#: erpnext/selling/doctype/sales_order/sales_order.js:920
+#: erpnext/selling/doctype/sales_order/sales_order.js:1059
#: erpnext/stock/doctype/delivery_note/delivery_note.js:96
#: erpnext/stock/doctype/delivery_note/delivery_note.js:98
#: erpnext/stock/doctype/delivery_note/delivery_note.js:121
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:247
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:261
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:271
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:281
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:300
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:305
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:347
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:253
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:277
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:287
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:306
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:311
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:353
#: erpnext/stock/doctype/item/item.js:167
#: erpnext/stock/doctype/item/item.js:174
#: erpnext/stock/doctype/item/item.js:182
@@ -13338,15 +13343,15 @@ msgstr "Potražuje"
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:70
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:82
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:108
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:279
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:284
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:286
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:291
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:297
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:300
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:298
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:304
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:307
#: erpnext/stock/doctype/stock_entry/stock_entry.js:170
#: erpnext/stock/doctype/stock_entry/stock_entry.js:172
#: erpnext/stock/doctype/stock_entry/stock_entry.js:247
-#: erpnext/stock/doctype/stock_entry/stock_entry.js:1283
+#: erpnext/stock/doctype/stock_entry/stock_entry.js:1289
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:231
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:264
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:277
@@ -13471,7 +13476,7 @@ msgstr "Kreiraj unos početnog stanja maloprodaje"
msgid "Create Payment Entry"
msgstr "Kreiraj unos uplate"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:806
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:807
msgid "Create Payment Entry for Consolidated POS Invoices."
msgstr "Kreiraj unos uplate za konsolidovane fiskalne račune."
@@ -13487,7 +13492,7 @@ msgstr "Kreiraj format za štampu"
msgid "Create Prospect"
msgstr "Kreiraj potencijalnog prospekta"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1238
+#: erpnext/selling/doctype/sales_order/sales_order.js:1242
#: erpnext/utilities/activation.py:106
msgid "Create Purchase Order"
msgstr "Kreiraj nabavnu porudžbinu"
@@ -13619,7 +13624,7 @@ msgstr "Kreirano {0} tablica za ocenjivanje za {1} između:"
msgid "Creating Accounts..."
msgstr "Kreiranje računa..."
-#: erpnext/selling/doctype/sales_order/sales_order.js:1133
+#: erpnext/selling/doctype/sales_order/sales_order.js:1136
msgid "Creating Delivery Note ..."
msgstr "Kreiranje otpremnice..."
@@ -13639,11 +13644,11 @@ msgstr "Kreiranje dokumenta liste pakovanja ..."
msgid "Creating Purchase Invoices ..."
msgstr "Kreiranje ulaznih faktura …"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1258
+#: erpnext/selling/doctype/sales_order/sales_order.js:1262
msgid "Creating Purchase Order ..."
msgstr "Kreiranje nabavne porudžbine ..."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:746
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13714,11 +13719,11 @@ msgstr "Kreiranje {0} delimično uspešno.\n"
msgid "Credit"
msgstr "Potražuje"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:691
+#: erpnext/accounts/report/general_ledger/general_ledger.py:711
msgid "Credit (Transaction)"
msgstr "Potražuje (Transakcija)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:666
+#: erpnext/accounts/report/general_ledger/general_ledger.py:686
msgid "Credit ({0})"
msgstr "Potražuje ({0})"
@@ -13861,14 +13866,14 @@ msgstr "Dokument o smanjenju izdat"
msgid "Credit Note will update it's own outstanding amount, even if 'Return Against' is specified."
msgstr "Dokument o smanjenju će ažurirati sopstveni iznos koji nije izmiren, čak i ukoliko je polje 'Povrat po osnovu' specifično navedeno."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:671
msgid "Credit Note {0} has been created automatically"
msgstr "Dokument o smanjenju {0} je automatski kreiran"
#. Label of the credit_to (Link) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:369
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:377
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:371
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:379
#: erpnext/controllers/accounts_controller.py:2282
msgid "Credit To"
msgstr "Potražuje"
@@ -14067,7 +14072,7 @@ msgstr "Šolja"
#: erpnext/accounts/report/financial_statements.html:29
#: erpnext/accounts/report/financial_statements.py:678
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
-#: erpnext/accounts/report/gross_profit/gross_profit.py:427
+#: erpnext/accounts/report/gross_profit/gross_profit.py:443
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
@@ -14168,7 +14173,7 @@ msgstr "Valuta ne može biti promenjena nakon što su uneseni podaci koristeći
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2319
+#: erpnext/accounts/utils.py:2323
msgid "Currency for {0} must be {1}"
msgstr "Valuta za {0} mora biti {1}"
@@ -14434,13 +14439,13 @@ msgstr "Prilagođeno?"
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:286
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:289
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/accounts/doctype/sales_invoice_reference/sales_invoice_reference.json
#: erpnext/accounts/doctype/tax_rule/tax_rule.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:38
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:29
-#: erpnext/accounts/report/gross_profit/gross_profit.py:385
+#: erpnext/accounts/report/gross_profit/gross_profit.py:391
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:37
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:22
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:225
@@ -14503,8 +14508,8 @@ msgstr "Prilagođeno?"
#: erpnext/setup/doctype/customer_group/customer_group.json
#: erpnext/setup/doctype/territory/territory.json
#: erpnext/setup/workspace/home/home.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:215
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:482
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:218
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:488
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
#: erpnext/stock/doctype/item/item.json
@@ -14518,7 +14523,7 @@ msgstr "Prilagođeno?"
#: erpnext/stock/report/delayed_item_report/delayed_item_report.py:121
#: erpnext/stock/report/delayed_order_report/delayed_order_report.js:36
#: erpnext/stock/report/delayed_order_report/delayed_order_report.py:46
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:469
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:512
#: erpnext/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14696,7 +14701,7 @@ msgstr "Povratne informacije kupca"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:185
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:56
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:228
-#: erpnext/accounts/report/gross_profit/gross_profit.py:392
+#: erpnext/accounts/report/gross_profit/gross_profit.py:398
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:212
#: erpnext/accounts/report/sales_register/sales_register.js:27
#: erpnext/accounts/report/sales_register/sales_register.py:202
@@ -14804,6 +14809,7 @@ msgstr "Broj mobilnog telefona kupca"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:156
#: 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
+#: erpnext/accounts/report/gross_profit/gross_profit.py:405
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:232
#: erpnext/accounts/report/sales_register/sales_register.py:193
#: erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -14951,7 +14957,7 @@ msgstr "Kupac je neophodan za 'Popust po kupcu'"
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1087
#: erpnext/selling/doctype/sales_order/sales_order.py:373
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:418
msgid "Customer {0} does not belong to project {1}"
msgstr "Kupac {0} ne pripada projektu {1}"
@@ -15440,11 +15446,11 @@ msgstr "Poštovani menadžeru sistema,"
msgid "Debit"
msgstr "Duguje"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:684
+#: erpnext/accounts/report/general_ledger/general_ledger.py:704
msgid "Debit (Transaction)"
msgstr "Duguje (Transakcija)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:659
+#: erpnext/accounts/report/general_ledger/general_ledger.py:679
msgid "Debit ({0})"
msgstr "Duguje ({0})"
@@ -16386,7 +16392,7 @@ msgstr "Isporuka"
#. Label of the delivery_date (Date) field in DocType 'Sales Order'
#. Label of the delivery_date (Date) field in DocType 'Sales Order Item'
#: erpnext/public/js/utils.js:813
-#: erpnext/selling/doctype/sales_order/sales_order.js:1076
+#: erpnext/selling/doctype/sales_order/sales_order.js:1079
#: erpnext/selling/doctype/sales_order/sales_order.json
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:321
@@ -16421,7 +16427,7 @@ msgstr "Menadžer isporuke"
#. Label of a Link in the Stock Workspace
#. Label of a shortcut in the Stock Workspace
#: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:306
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:312
#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:36
#: 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
@@ -16528,7 +16534,7 @@ msgstr "Dostava ka"
#. Label of the delivery_trip (Link) field in DocType 'Delivery Note'
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:277
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:283
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_trip/delivery_trip.json
#: erpnext/stock/workspace/stock/stock.json
@@ -16718,7 +16724,7 @@ msgstr "Unos amortizacije"
msgid "Depreciation Entry Posting Status"
msgstr "Status knjiženja unosa amortizacije"
-#: erpnext/assets/doctype/asset/asset.py:1109
+#: erpnext/assets/doctype/asset/asset.py:1125
msgid "Depreciation Entry against asset {0}"
msgstr "Unos amortizacije za imovinu {0}"
@@ -16765,11 +16771,11 @@ msgstr "Datum knjiženja amortizacije"
msgid "Depreciation Posting Date cannot be before Available-for-use Date"
msgstr "Datum knjiženja amortizacije ne može biti pre datuma kada je sredstvo dostupno za upotrebu"
-#: erpnext/assets/doctype/asset/asset.py:318
+#: erpnext/assets/doctype/asset/asset.py:319
msgid "Depreciation Row {0}: Depreciation Posting Date cannot be before Available-for-use Date"
msgstr "Red amortizacije {0}: Datum knjiženja amortizacije ne može biti pre datuma kada je sredstvo dostupno za upotrebu"
-#: erpnext/assets/doctype/asset/asset.py:569
+#: erpnext/assets/doctype/asset/asset.py:585
msgid "Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1}"
msgstr "Red amortizacije {0}: Očekivana vrednost nakon korisnog veka mora biti veća ili jednaka {1}"
@@ -16796,7 +16802,7 @@ msgstr "Raspored amortizacije"
msgid "Depreciation Schedule View"
msgstr "Pregled rasporeda amortizacije"
-#: erpnext/assets/doctype/asset/asset.py:412
+#: erpnext/assets/doctype/asset/asset.py:413
msgid "Depreciation cannot be calculated for fully depreciated assets"
msgstr "Amortizacija se ne može izračunati za potpuno amortizovanu imovinu"
@@ -16974,7 +16980,7 @@ msgstr "Amortizacija eliminisana putem poništavanja"
#: erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
#: erpnext/accounts/doctype/share_type/share_type.json
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:72
-#: erpnext/accounts/report/gross_profit/gross_profit.py:302
+#: erpnext/accounts/report/gross_profit/gross_profit.py:308
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:175
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:196
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:72
@@ -17267,7 +17273,7 @@ msgstr "Količina razlike"
msgid "Difference Value"
msgstr "Vrednost razlike"
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:491
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:497
msgid "Different 'Source Warehouse' and 'Target Warehouse' can be set for each row."
msgstr "Za svaki red se mogu podesiti različito 'Izvorno skladište' i 'Ciljano skladište'."
@@ -18037,7 +18043,7 @@ msgstr "Da li želite da obavestite sve kupce putem imejla?"
msgid "Do you want to submit the material request"
msgstr "Da li želite da podnesete zahtev za nabavku"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:76
+#: erpnext/manufacturing/doctype/job_card/job_card.js:84
msgid "Do you want to submit the stock entry?"
msgstr "Da li želite da podnesete unos zaliha?"
@@ -18544,7 +18550,7 @@ msgstr "Duplikat grupe kupaca"
msgid "Duplicate Entry. Please check Authorization Rule {0}"
msgstr "Dupli unos. Proverite pravilo autorizacije {0}"
-#: erpnext/assets/doctype/asset/asset.py:342
+#: erpnext/assets/doctype/asset/asset.py:343
msgid "Duplicate Finance Book"
msgstr "Duplikat finansijske evidencije"
@@ -18737,7 +18743,7 @@ msgstr "Izmeni napomenu"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:495
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:501
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -19175,7 +19181,7 @@ msgstr "Prazno"
msgid "Ems(Pica)"
msgstr "Ems (Pica)"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1642
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr "Omogućite dozvolu za delimičnu rezervaciju u postavkama zaliha kako biste rezervisali delimične zalihe."
@@ -19412,8 +19418,8 @@ msgstr "Datum ne može biti pre datuma početka."
#. 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:311
-#: erpnext/manufacturing/doctype/job_card/job_card.js:380
+#: erpnext/manufacturing/doctype/job_card/job_card.js:319
+#: erpnext/manufacturing/doctype/job_card/job_card.js:388
#: 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
@@ -19504,8 +19510,8 @@ msgstr "Unesite brojeve serija"
msgid "Enter Supplier"
msgstr "Unesite dobavljača"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:337
-#: erpnext/manufacturing/doctype/job_card/job_card.js:406
+#: erpnext/manufacturing/doctype/job_card/job_card.js:345
+#: erpnext/manufacturing/doctype/job_card/job_card.js:414
#: erpnext/manufacturing/doctype/workstation/workstation.js:312
msgid "Enter Value"
msgstr "Unesite vrednost"
@@ -19546,7 +19552,7 @@ msgstr "Unesite broj telefona kupca"
msgid "Enter date to scrap asset"
msgstr "Unesite datum za otpis imovine"
-#: erpnext/assets/doctype/asset/asset.py:410
+#: erpnext/assets/doctype/asset/asset.py:411
msgid "Enter depreciation details"
msgstr "Unesite detalje amortizacije"
@@ -19580,7 +19586,7 @@ msgstr "Unesite naziv banke ili kreditne institucije pre podnošenja."
msgid "Enter the opening stock units."
msgstr "Unesite početne zalihe."
-#: erpnext/manufacturing/doctype/bom/bom.js:865
+#: erpnext/manufacturing/doctype/bom/bom.js:886
msgid "Enter the quantity of the Item that will be manufactured from this Bill of Materials."
msgstr "Unesite količinu stavki koja će biti proizvedena iz ove sastavnice."
@@ -19939,7 +19945,7 @@ msgstr "Devizni kurs mora biti isti kao {0} {1} ({2})"
msgid "Excise Entry"
msgstr "Unos akcize"
-#: erpnext/stock/doctype/stock_entry/stock_entry.js:1276
+#: erpnext/stock/doctype/stock_entry/stock_entry.js:1282
msgid "Excise Invoice"
msgstr "Akcizna faktura"
@@ -20111,7 +20117,7 @@ msgstr "Očekivana vrednost nakon korisnog veka"
#: erpnext/accounts/doctype/cashier_closing/cashier_closing.json
#: erpnext/accounts/doctype/ledger_merge/ledger_merge.json
#: erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:596
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:598
#: erpnext/accounts/report/account_balance/account_balance.js:28
#: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:89
#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:178
@@ -20179,13 +20185,13 @@ msgstr "Zahtev za trošak"
msgid "Expense Head"
msgstr "Grupa troška"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:490
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:514
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:534
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:492
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:516
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:536
msgid "Expense Head Changed"
msgstr "Grupa troška promenjena"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:592
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:594
msgid "Expense account is mandatory for item {0}"
msgstr "Račun rashoda je obavezan za stavku {0}"
@@ -20326,6 +20332,11 @@ msgstr "Ekstra velika"
msgid "Extra Small"
msgstr "Ekstra mala"
+#. Label of the finished_good (Link) field in DocType 'BOM Operation'
+#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
+msgid "FG / Semi FG Item"
+msgstr "Gotov proizvod / Poluproizvod"
+
#. Option for the 'Valuation Method' (Select) field in DocType 'Item'
#. Option for the 'Default Valuation Method' (Select) field in DocType 'Stock
#. Settings'
@@ -20534,7 +20545,7 @@ msgstr "Preuzmi na osnovu"
msgid "Fetch Customers"
msgstr "Preuzmi kupce"
-#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js:76
+#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js:77
msgid "Fetch Items from Warehouse"
msgstr "Preuzmi stavke iz početnog skladišta"
@@ -20550,7 +20561,7 @@ msgstr "Preuzmi neizmirene uplate"
msgid "Fetch Subscription Updates"
msgstr "Preuzmi ažuriranje pretplate"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1017
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1026
msgid "Fetch Timesheet"
msgstr "Preuzmi evidenciju vremena"
@@ -20942,11 +20953,6 @@ msgstr "Gotov proizvod {0} mora biti proizvod koji je proizveden putem podugovar
msgid "Finished Goods"
msgstr "Gotovi proizvodi"
-#. Label of the finished_good (Link) field in DocType 'BOM Operation'
-#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
-msgid "Finished Goods / Semi Finished Goods Item"
-msgstr "Gotovi proizvodi / Poluproizvodi"
-
#. Label of the fg_based_section_section (Section Break) field in DocType 'BOM'
#: erpnext/manufacturing/doctype/bom/bom.json
msgid "Finished Goods Based Operating Cost"
@@ -20957,11 +20963,6 @@ msgstr "Operativni trošak zasnovan na gotovim proizvodima"
msgid "Finished Goods Item"
msgstr "Stavke gotovih proizvoda"
-#. Label of the finished_good_qty (Float) field in DocType 'BOM Operation'
-#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
-msgid "Finished Goods Qty"
-msgstr "Količina gotovih proizvoda"
-
#. Label of the fg_reference_id (Data) field in DocType 'BOM Creator Item'
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
msgid "Finished Goods Reference"
@@ -21125,7 +21126,7 @@ msgstr "Osnovna sredstva"
#. Capitalization Asset Item'
#. Label of the fixed_asset_account (Link) field in DocType 'Asset Category
#. Account'
-#: erpnext/assets/doctype/asset/asset.py:751
+#: erpnext/assets/doctype/asset/asset.py:767
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
#: erpnext/assets/doctype/asset_category_account/asset_category_account.json
msgid "Fixed Asset Account"
@@ -21291,7 +21292,7 @@ msgid "For Job Card"
msgstr "Za radnu karticu"
#. Label of the for_operation (Link) field in DocType 'Job Card'
-#: erpnext/manufacturing/doctype/job_card/job_card.js:450
+#: erpnext/manufacturing/doctype/job_card/job_card.js:458
#: erpnext/manufacturing/doctype/job_card/job_card.json
msgid "For Operation"
msgstr "Za operaciju"
@@ -21340,7 +21341,7 @@ msgstr "Za dobavljača"
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:466
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:997
+#: erpnext/selling/doctype/sales_order/sales_order.js:1000
#: erpnext/stock/doctype/material_request/material_request.js:344
#: erpnext/templates/form_grid/material_request_grid.html:36
msgid "For Warehouse"
@@ -21410,7 +21411,7 @@ msgstr "Za referencu"
msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included"
msgstr "Za red {0} u {1}. Da biste uključili {2} u cenu stavke, redovi {3} takođe moraju biti uključeni"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1635
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1652
msgid "For row {0}: Enter Planned Qty"
msgstr "Za red {0}: Unesite planiranu količinu"
@@ -21585,7 +21586,7 @@ msgstr "Petak"
#. Label of the from_uom (Link) field in DocType 'UOM Conversion Factor'
#. Label of the from (Data) field in DocType 'Call Log'
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1020
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1029
#: erpnext/setup/doctype/uom_conversion_factor/uom_conversion_factor.json
#: erpnext/telephony/doctype/call_log/call_log.json
#: erpnext/templates/pages/projects.html:67
@@ -22189,7 +22190,7 @@ msgstr "Stanje glavne knjige"
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:644
+#: erpnext/accounts/report/general_ledger/general_ledger.py:664
msgid "GL Entry"
msgstr "Unos u glavnu knjigu"
@@ -22455,12 +22456,12 @@ msgid "Get Items"
msgstr "Prikaži stavke"
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:170
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:192
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:270
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:299
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:330
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1073
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:173
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:198
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:273
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:305
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:339
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1082
#: erpnext/buying/doctype/purchase_order/purchase_order.js:612
#: erpnext/buying/doctype/purchase_order/purchase_order.js:632
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:366
@@ -22476,13 +22477,13 @@ msgstr "Prikaži stavke"
#: erpnext/public/js/controllers/buying.js:296
#: erpnext/selling/doctype/quotation/quotation.js:167
#: erpnext/selling/doctype/sales_order/sales_order.js:174
-#: erpnext/selling/doctype/sales_order/sales_order.js:798
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:187
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:236
+#: erpnext/selling/doctype/sales_order/sales_order.js:801
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:190
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:242
#: erpnext/stock/doctype/material_request/material_request.js:126
#: erpnext/stock/doctype/material_request/material_request.js:221
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:156
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:270
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:160
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:277
#: erpnext/stock/doctype/stock_entry/stock_entry.js:319
#: erpnext/stock/doctype/stock_entry/stock_entry.js:366
#: erpnext/stock/doctype/stock_entry/stock_entry.js:395
@@ -22610,7 +22611,7 @@ msgstr "Prikaži dobavljače"
msgid "Get Suppliers By"
msgstr "Prikaži dobavljače prema"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1069
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1078
msgid "Get Timesheets"
msgstr "Prikaži evidenciju vremena"
@@ -22928,7 +22929,7 @@ msgstr "Bruto marža %"
#. Label of the gross_profit (Currency) field in DocType 'Quotation Item'
#. Label of the gross_profit (Currency) field in DocType 'Sales Order Item'
#: erpnext/accounts/report/gross_profit/gross_profit.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:344
+#: erpnext/accounts/report/gross_profit/gross_profit.py:350
#: erpnext/accounts/workspace/financial_reports/financial_reports.json
#: erpnext/selling/doctype/quotation_item/quotation_item.json
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -22939,7 +22940,7 @@ msgstr "Bruto profit"
msgid "Gross Profit / Loss"
msgstr "Bruto dobitak / gubitak"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:351
+#: erpnext/accounts/report/gross_profit/gross_profit.py:357
msgid "Gross Profit Percent"
msgstr "Procenat bruto profita"
@@ -22951,11 +22952,11 @@ msgstr "Procenat bruto profita"
msgid "Gross Purchase Amount"
msgstr "Ukupan iznos nabavke"
-#: erpnext/assets/doctype/asset/asset.py:380
+#: erpnext/assets/doctype/asset/asset.py:381
msgid "Gross Purchase Amount is mandatory"
msgstr "Ukupan iznos nabavke je obavezan"
-#: erpnext/assets/doctype/asset/asset.py:425
+#: erpnext/assets/doctype/asset/asset.py:441
msgid "Gross Purchase Amount should be equal to purchase amount of one single Asset."
msgstr "Ukupan iznos nabavke treba da bude jednak iznosu nabavke pojedinačne stavke imovine."
@@ -24001,11 +24002,11 @@ msgstr "Ukoliko vodite zalihe ove stavke u svom inventaru, ERPNext će napraviti
msgid "If you need to reconcile particular transactions against each other, then please select accordingly. If not, all the transactions will be allocated in FIFO order."
msgstr "Ukoliko treba da uskladite određene transakcije međusobno, izaberite odgovarajuću opciju. U suprotnom, sve transakcije će biti raspoređene prema FIFO redosledu."
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1036
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1051
msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox."
msgstr "Ukoliko i dalje želite da nastavite, onemogućite opciju 'Preskoči dostupne stavke podsklopa'."
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1748
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1765
msgid "If you still want to proceed, please enable {0}."
msgstr "Ukoliko i dalje želite da nastavite, omogućite {0}."
@@ -24079,11 +24080,11 @@ msgstr "Ignoriši prazne zalihe"
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr "Ignoriši revalorizaciju deviznog kursa i dnevnike prihoda/rashoda"
-#: erpnext/selling/doctype/sales_order/sales_order.js:980
+#: erpnext/selling/doctype/sales_order/sales_order.js:983
msgid "Ignore Existing Ordered Qty"
msgstr "Ignoriši postojeće naručene količine"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1740
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1757
msgid "Ignore Existing Projected Quantity"
msgstr "Ignoriši postojeću očekivanu količinu"
@@ -24728,7 +24729,7 @@ msgstr "Uključi istekle šarže"
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:976
+#: erpnext/selling/doctype/sales_order/sales_order.js:979
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -24927,7 +24928,7 @@ msgstr "Netačno skladište za ponovno naručivanje"
msgid "Incorrect Component Quantity"
msgstr "Netačna količina komponenti"
-#: erpnext/assets/doctype/asset/asset.py:321
+#: erpnext/assets/doctype/asset/asset.py:322
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py:56
msgid "Incorrect Date"
msgstr "Netačan datum"
@@ -25173,7 +25174,7 @@ msgstr "Datum instalacije"
#. 'Installation Note'
#. Label of a Link in the Stock Workspace
#: erpnext/selling/doctype/installation_note/installation_note.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:257
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:263
#: erpnext/stock/workspace/stock/stock.json
msgid "Installation Note"
msgstr "Napomena o instalaciji"
@@ -25183,7 +25184,7 @@ msgstr "Napomena o instalaciji"
msgid "Installation Note Item"
msgstr "Stavka u napomeni o instalaciji"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:625
msgid "Installation Note {0} has already been submitted"
msgstr "Napomena o instalaciji {0} je već podneta"
@@ -25241,7 +25242,7 @@ msgstr "Nedovoljne dozvole"
#: erpnext/stock/doctype/pick_list/pick_list.py:132
#: erpnext/stock/doctype/pick_list/pick_list.py:1003
#: erpnext/stock/doctype/stock_entry/stock_entry.py:788
-#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1103 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr "Nedovoljno zaliha"
@@ -25335,6 +25336,10 @@ msgstr "Referenca međukompanijskog naloga knjiženja"
msgid "Inter Company Order Reference"
msgstr "Referenca narudžbine između povezanih kompanija"
+#: erpnext/selling/doctype/sales_order/sales_order.js:742
+msgid "Inter Company Purchase Order"
+msgstr "Međukompanijska nabavna porudžbina"
+
#. Label of the inter_company_reference (Link) field in DocType 'Delivery Note'
#. Label of the inter_company_reference (Link) field in DocType 'Purchase
#. Receipt'
@@ -25343,6 +25348,10 @@ msgstr "Referenca narudžbine između povezanih kompanija"
msgid "Inter Company Reference"
msgstr "Referenca između povezanih kompanija"
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:485
+msgid "Inter Company Sales Order"
+msgstr "Međukompanijska prodajna porudžbina"
+
#. Label of the inter_transfer_reference_section (Section Break) field in
#. DocType 'Sales Order Item'
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -25384,10 +25393,18 @@ msgstr "Interni kupac"
msgid "Internal Customer for company {0} already exists"
msgstr "Interni kupac za kompaniju {0} već postoji"
+#: erpnext/selling/doctype/sales_order/sales_order.js:741
+msgid "Internal Purchase Order"
+msgstr "Interna nabavna porudžbina"
+
#: erpnext/controllers/accounts_controller.py:731
msgid "Internal Sale or Delivery Reference missing."
msgstr "Nedostaje referenca za internu prodaju ili isporuku."
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:484
+msgid "Internal Sales Order"
+msgstr "Interna prodajna porudžbina"
+
#: erpnext/controllers/accounts_controller.py:733
msgid "Internal Sales Reference Missing"
msgstr "Nedostaje referenca za internu prodaju"
@@ -25456,8 +25473,8 @@ msgstr "Uvod"
msgid "Invalid"
msgstr "Nevažeće"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:370
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:378
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:372
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:380
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:961
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:971
#: erpnext/assets/doctype/asset_category/asset_category.py:69
@@ -25500,8 +25517,8 @@ msgstr "Nevažeća zavisna procedura"
msgid "Invalid Company for Inter Company Transaction."
msgstr "Nevažeća kompanija za međukompanijsku transakciju."
-#: erpnext/assets/doctype/asset/asset.py:292
-#: erpnext/assets/doctype/asset/asset.py:299
+#: erpnext/assets/doctype/asset/asset.py:293
+#: erpnext/assets/doctype/asset/asset.py:300
#: erpnext/controllers/accounts_controller.py:3037
msgid "Invalid Cost Center"
msgstr "Nevažeći troškovni centar"
@@ -25531,7 +25548,7 @@ msgstr "Nevažeća vrsta dokumenta"
msgid "Invalid Formula"
msgstr "Nevažeća formula"
-#: erpnext/assets/doctype/asset/asset.py:430
+#: erpnext/assets/doctype/asset/asset.py:446
msgid "Invalid Gross Purchase Amount"
msgstr "Nevažeći ukupan iznos nabavke"
@@ -25539,7 +25556,7 @@ msgstr "Nevažeći ukupan iznos nabavke"
msgid "Invalid Group By"
msgstr "Nevažeće grupisanje po"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:453
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:454
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:914
msgid "Invalid Item"
msgstr "Nevažeća stavka"
@@ -25582,7 +25599,7 @@ msgstr "Nevažeća primarna uloga"
msgid "Invalid Priority"
msgstr "Nevažeći prioritet"
-#: erpnext/manufacturing/doctype/bom/bom.py:1093
+#: erpnext/manufacturing/doctype/bom/bom.py:1130
msgid "Invalid Process Loss Configuration"
msgstr "Nevažeća konfiguracija gubitaka u procesu"
@@ -25610,8 +25627,8 @@ msgstr "Nevažeći povrat"
msgid "Invalid Sales Invoices"
msgstr "Nevažeće izlazne fakture"
-#: erpnext/assets/doctype/asset/asset.py:515
-#: erpnext/assets/doctype/asset/asset.py:534
+#: erpnext/assets/doctype/asset/asset.py:531
+#: erpnext/assets/doctype/asset/asset.py:550
msgid "Invalid Schedule"
msgstr "Nevažeći raspored"
@@ -25644,7 +25661,7 @@ msgstr "Nevažeći iznos u računovodstvenim unosima za {} {} za račun {}: {}"
msgid "Invalid condition expression"
msgstr "Nevažeći izraz uslova"
-#: erpnext/selling/doctype/quotation/quotation.py:270
+#: erpnext/selling/doctype/quotation/quotation.py:272
msgid "Invalid lost reason {0}, please create a new lost reason"
msgstr "Nevažeći razlog gubitka {0}, molimo kreirajte nov razlog gubitka"
@@ -25790,7 +25807,7 @@ msgstr "Limit za fakture"
msgid "Invoice Number"
msgstr "Broj fakture"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:812
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:813
msgid "Invoice Paid"
msgstr "Faktura je plaćena"
@@ -26384,6 +26401,14 @@ msgstr "Standardno"
msgid "Is Stock Item"
msgstr "Stavka zaliha"
+#. Label of the is_sub_assembly_item (Check) field in DocType 'BOM Explosion
+#. Item'
+#. Label of the is_sub_assembly_item (Check) field in DocType 'BOM Item'
+#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
+#: erpnext/manufacturing/doctype/bom_item/bom_item.json
+msgid "Is Sub Assembly Item"
+msgstr "Stavka podsklopa"
+
#. Label of the is_subcontracted (Check) field in DocType 'Purchase Invoice'
#. Label of the is_subcontracted (Check) field in DocType 'Purchase Order'
#. Label of the is_subcontracted (Check) field in DocType 'Supplier Quotation'
@@ -26610,7 +26635,7 @@ msgstr "Nije moguće ravnomerno raspodeliti troškove kada je ukupni iznos nula,
#: erpnext/buying/workspace/buying/buying.json
#: erpnext/controllers/taxes_and_totals.py:1123
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.json
-#: erpnext/manufacturing/doctype/bom/bom.js:944
+#: erpnext/manufacturing/doctype/bom/bom.js:979
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109
#: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:25
@@ -26631,7 +26656,7 @@ msgstr "Nije moguće ravnomerno raspodeliti troškove kada je ukupni iznos nula,
#: erpnext/public/js/stock_analytics.js:92
#: erpnext/selling/doctype/party_specific_item/party_specific_item.json
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1203
+#: erpnext/selling/doctype/sales_order/sales_order.js:1206
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:46
#: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.js:14
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.js:36
@@ -26834,10 +26859,10 @@ msgstr "Korpa stavke"
#: erpnext/accounts/doctype/pricing_rule_item_code/pricing_rule_item_code.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1026
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1035
#: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:68
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:37
-#: erpnext/accounts/report/gross_profit/gross_profit.py:281
+#: erpnext/accounts/report/gross_profit/gross_profit.py:287
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:150
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:171
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:37
@@ -26894,8 +26919,8 @@ msgstr "Korpa stavke"
#: erpnext/selling/doctype/quotation_item/quotation_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:345
#: erpnext/selling/doctype/sales_order/sales_order.js:453
-#: erpnext/selling/doctype/sales_order/sales_order.js:839
-#: erpnext/selling/doctype/sales_order/sales_order.js:990
+#: erpnext/selling/doctype/sales_order/sales_order.js:842
+#: erpnext/selling/doctype/sales_order/sales_order.js:993
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py:29
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:27
@@ -26938,7 +26963,7 @@ msgstr "Korpa stavke"
#: erpnext/stock/report/item_price_stock/item_price_stock.py:18
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:125
#: 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:396
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:419
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:7
#: erpnext/stock/report/stock_ageing/stock_ageing.py:130
#: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:104
@@ -26965,7 +26990,7 @@ msgstr "Šifra stavke > Grupa stavki > Brend"
msgid "Item Code cannot be changed for Serial No."
msgstr "Šifra stavke ne može biti promenjena za broj serije."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:445
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:447
msgid "Item Code required at Row No {0}"
msgstr "Šifra stavke neophodna je u redu broj {0}"
@@ -27070,7 +27095,7 @@ msgstr "Detalji stavke"
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/doctype/tax_rule/tax_rule.json
#: erpnext/accounts/report/gross_profit/gross_profit.js:44
-#: erpnext/accounts/report/gross_profit/gross_profit.py:294
+#: erpnext/accounts/report/gross_profit/gross_profit.py:300
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js:21
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:28
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:28
@@ -27282,7 +27307,7 @@ msgstr "Proizvođač stavke"
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:74
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:71
-#: erpnext/accounts/report/gross_profit/gross_profit.py:288
+#: erpnext/accounts/report/gross_profit/gross_profit.py:294
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:33
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:156
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:177
@@ -27331,7 +27356,7 @@ msgstr "Proizvođač stavke"
#: erpnext/public/js/controllers/transaction.js:2414
#: erpnext/public/js/utils.js:756
#: erpnext/selling/doctype/quotation_item/quotation_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:845
+#: erpnext/selling/doctype/sales_order/sales_order.js:848
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py:35
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:33
@@ -27365,7 +27390,7 @@ msgstr "Proizvođač stavke"
#: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143
#: 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:131
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:403
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:426
#: erpnext/stock/report/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -27414,7 +27439,7 @@ msgstr "Podešavanje cene stavke"
msgid "Item Price Stock"
msgstr "Cene stavke na skladištu"
-#: erpnext/stock/get_item_details.py:1063
+#: erpnext/stock/get_item_details.py:1058
msgid "Item Price added for {0} in Price List {1}"
msgstr "Cena stavke dodata za {0} u cenovniku {1}"
@@ -27422,7 +27447,7 @@ msgstr "Cena stavke dodata za {0} u cenovniku {1}"
msgid "Item Price appears multiple times based on Price List, Supplier/Customer, Currency, Item, Batch, UOM, Qty, and Dates."
msgstr "Cena stavke se pojavljuje više puta na osnovu cenovnika, dobavljača / kupca, valute, stavke, šarže, merne jedinice, količine i datuma."
-#: erpnext/stock/get_item_details.py:1042
+#: erpnext/stock/get_item_details.py:1037
msgid "Item Price updated for {0} in Price List {1}"
msgstr "Cena stavke ažurirana za {0} u cenovniku {1}"
@@ -27570,8 +27595,8 @@ msgstr "Stavka za proizvodnju"
msgid "Item UOM"
msgstr "Merna jedinica stavke"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:409
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:416
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:410
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:417
msgid "Item Unavailable"
msgstr "Stavka nije dostupna"
@@ -27687,7 +27712,7 @@ msgid "Item must be added using 'Get Items from Purchase Receipts' button"
msgstr "Stavka mora biti dodata korišćenjem dugmeta 'Preuzmi stavke iz prijemnice nabavke'"
#: erpnext/buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:42
-#: erpnext/selling/doctype/sales_order/sales_order.js:1210
+#: erpnext/selling/doctype/sales_order/sales_order.js:1213
msgid "Item name"
msgstr "Naziv stavke"
@@ -27734,7 +27759,7 @@ msgstr "Stavka {0} ne može biti dodata kao podsklop same sebe"
msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}."
msgstr "Stavka {0} ne može biti naručena u količini većoj od {1} prema okvirnom nalogu {2}."
-#: erpnext/assets/doctype/asset/asset.py:274
+#: erpnext/assets/doctype/asset/asset.py:275
#: erpnext/stock/doctype/item/item.py:634
msgid "Item {0} does not exist"
msgstr "Stavka {0} ne postoji"
@@ -27755,7 +27780,7 @@ msgstr "Stavka {0} je unesena više puta."
msgid "Item {0} has already been returned"
msgstr "Stavka {0} je već vraćena"
-#: erpnext/assets/doctype/asset/asset.py:276
+#: erpnext/assets/doctype/asset/asset.py:277
msgid "Item {0} has been disabled"
msgstr "Stavka {0} je onemogućena"
@@ -27771,7 +27796,7 @@ msgstr "Stavka {0} je dostigla kraj svog životnog veka na dan {1}"
msgid "Item {0} ignored since it is not a stock item"
msgstr "Stavka {0} je zanemarena jer nije stavka na zalihama"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:565
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:567
msgid "Item {0} is already reserved/delivered against Sales Order {1}."
msgstr "Stavka {0} je već rezervisana / isporučena prema prodajnoj porudžbini {1}."
@@ -27799,7 +27824,7 @@ msgstr "Stavka {0} nije stavka za podugovaranje"
msgid "Item {0} is not active or end of life has been reached"
msgstr "Stavka {0} nije aktivna ili je dostigla kraj životnog veka"
-#: erpnext/assets/doctype/asset/asset.py:278
+#: erpnext/assets/doctype/asset/asset.py:279
msgid "Item {0} must be a Fixed Asset Item"
msgstr "Stavka {0} mora biti osnovno sredstvo"
@@ -27811,7 +27836,7 @@ msgstr "Stavka {0} mora biti stavka van zaliha"
msgid "Item {0} must be a Sub-contracted Item"
msgstr "Stavka {0} mora biti stavka za podugovaranje"
-#: erpnext/assets/doctype/asset/asset.py:280
+#: erpnext/assets/doctype/asset/asset.py:281
msgid "Item {0} must be a non-stock item"
msgstr "Stavka {0} mora biti stavka van zaliha"
@@ -27868,7 +27893,7 @@ msgstr "Istorija prodaje po stavkama"
msgid "Item-wise Sales Register"
msgstr "Registar prodaje po stavkama"
-#: erpnext/stock/get_item_details.py:703
+#: erpnext/stock/get_item_details.py:698
msgid "Item/Item Code required to get Item Tax Template."
msgstr "Stavka/Šifra stavke je neophodna za preuzimanje šablona stavke poreza."
@@ -27926,11 +27951,11 @@ msgstr "Stavka: {0} ne postoji u sistemu"
#: erpnext/selling/doctype/installation_note/installation_note.json
#: erpnext/selling/doctype/product_bundle/product_bundle.json
#: erpnext/selling/doctype/quotation/quotation.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:831
+#: erpnext/selling/doctype/sales_order/sales_order.js:834
#: erpnext/selling/doctype/sales_order/sales_order.json
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:19
#: erpnext/setup/doctype/item_group/item_group.js:87
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:487
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:493
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/material_request/material_request.json
#: erpnext/stock/doctype/packing_slip/packing_slip.json
@@ -27960,8 +27985,8 @@ msgstr "Katalog stavki"
msgid "Items Filter"
msgstr "Filter stavki"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1601
-#: erpnext/selling/doctype/sales_order/sales_order.js:1246
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1618
+#: erpnext/selling/doctype/sales_order/sales_order.js:1250
msgid "Items Required"
msgstr "Potrebne stavke"
@@ -27981,7 +28006,7 @@ msgstr "Stavke i cene"
msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}."
msgstr "Stavke ne mogu biti ažurirane jer je kreiran nalog za podugovaranje prema nabavnoj porudžbini {0}."
-#: erpnext/selling/doctype/sales_order/sales_order.js:1026
+#: erpnext/selling/doctype/sales_order/sales_order.js:1029
msgid "Items for Raw Material Request"
msgstr "Stavke za zahtev za nabavku sirovina"
@@ -27995,7 +28020,7 @@ msgstr "Cena stavki je ažurirana na nulu jer je opcija dozvoli nultu stopu vred
msgid "Items to Be Repost"
msgstr "Stavke za ponovno knjiženje"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1600
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1617
msgid "Items to Manufacture are required to pull the Raw Materials associated with it."
msgstr "Stavke za proizvodnju su potrebne za preuzimanje povezanih sirovina."
@@ -28492,7 +28517,7 @@ msgstr "Faktura dobavljača za troškove nabavke"
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:685
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:104
#: erpnext/stock/workspace/stock/stock.json
@@ -28604,6 +28629,35 @@ msgstr "Datum poslednje narudžbine"
msgid "Last Purchase Rate"
msgstr "Poslednja nabavna cena"
+#. Label of the last_scanned_warehouse (Data) field in DocType 'POS Invoice'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Purchase
+#. Invoice'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Sales Invoice'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Purchase Order'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Quotation'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Sales Order'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Delivery Note'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Material
+#. Request'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Purchase
+#. Receipt'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Stock Entry'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Stock
+#. Reconciliation'
+#: 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/buying/doctype/purchase_order/purchase_order.json
+#: erpnext/selling/doctype/quotation/quotation.json
+#: erpnext/selling/doctype/sales_order/sales_order.json
+#: erpnext/stock/doctype/delivery_note/delivery_note.json
+#: erpnext/stock/doctype/material_request/material_request.json
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+#: erpnext/stock/doctype/stock_entry/stock_entry.json
+#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
+msgid "Last Scanned Warehouse"
+msgstr "Poslednje skenirano skladište"
+
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:328
msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}."
msgstr "Poslednja transakcija zaliha za stavku {0} u skladištu {1} je bila {2}."
@@ -29407,7 +29461,7 @@ msgstr "Poeni lojalnosti: {0}"
#: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.json
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1121
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1130
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/selling/doctype/customer/customer.json
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:952
@@ -29730,7 +29784,7 @@ msgstr "Obavezni/Izborni predmeti"
#. Label of the make (Data) field in DocType 'Vehicle'
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:109
-#: erpnext/manufacturing/doctype/job_card/job_card.js:471
+#: erpnext/manufacturing/doctype/job_card/job_card.js:479
#: erpnext/setup/doctype/vehicle/vehicle.json
msgid "Make"
msgstr "Napraviti"
@@ -29764,7 +29818,7 @@ msgstr "Napravi ulaznu fakturu"
msgid "Make Quotation"
msgstr "Napravi ponudu"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:356
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:363
msgid "Make Return Entry"
msgstr "Napravi unos povrata"
@@ -29779,12 +29833,12 @@ msgstr "Napravi izlaznu fakturu"
msgid "Make Serial No / Batch from Work Order"
msgstr "Napravi broj serije / šaržu iz radnog naloga"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:74
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:282
+#: erpnext/manufacturing/doctype/job_card/job_card.js:82
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:289
msgid "Make Stock Entry"
msgstr "Napravi unos zaliha"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:345
+#: erpnext/manufacturing/doctype/job_card/job_card.js:353
msgid "Make Subcontracting PO"
msgstr "Napravi nabavnu porudžbinu podugovaranja"
@@ -29854,18 +29908,18 @@ msgstr "Generalni direktor"
#: erpnext/accounts/doctype/pos_field/pos_field.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:147
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:76
-#: erpnext/manufacturing/doctype/bom/bom.js:85
-#: erpnext/manufacturing/doctype/bom/bom.js:603
+#: erpnext/manufacturing/doctype/bom/bom.js:87
+#: erpnext/manufacturing/doctype/bom/bom.js:624
#: erpnext/manufacturing/doctype/bom/bom.py:261
#: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py:71
#: erpnext/public/js/controllers/accounts.js:249
#: erpnext/public/js/controllers/transaction.js:2812
#: erpnext/public/js/utils/party.js:321
#: erpnext/stock/doctype/delivery_note/delivery_note.js:164
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:203
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:206
#: erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:138
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:250
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:254
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:101
msgid "Mandatory"
msgstr "Obavezno"
@@ -29896,15 +29950,15 @@ msgstr "Obavezno za bilans stanja"
msgid "Mandatory For Profit and Loss Account"
msgstr "Obavezno za račun bilansa uspeha"
-#: erpnext/selling/doctype/quotation/quotation.py:588
+#: erpnext/selling/doctype/quotation/quotation.py:610
msgid "Mandatory Missing"
msgstr "Nedostaje obavezno"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:628
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:630
msgid "Mandatory Purchase Order"
msgstr "Obavezna nabavna porudžbina"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:649
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:651
msgid "Mandatory Purchase Receipt"
msgstr "Obavezna prijemnica nabavke"
@@ -30169,7 +30223,7 @@ msgstr "Vrsta proizvodnje"
msgid "Manufacturing User"
msgstr "Korisnik proizvodnje"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:179
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:183
msgid "Mapping Purchase Receipt ..."
msgstr "Mapiranje prijemnice nabavke ..."
@@ -30405,7 +30459,7 @@ msgstr "Prijemnica materijala"
#: 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:133
+#: erpnext/manufacturing/doctype/job_card/job_card.js:141
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:155
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
#: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
@@ -30501,7 +30555,7 @@ msgstr "Planirana stavka zahteva za nabavku"
msgid "Material Request Type"
msgstr "Vrsta zahteva za nabavku"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1704
+#: erpnext/selling/doctype/sales_order/sales_order.py:1720
msgid "Material Request not created, as quantity for Raw Materials already available."
msgstr "Zahtev za nabavku nije kreiran, jer je količina sirovina već dostupna."
@@ -30519,7 +30573,7 @@ msgstr "Zahtev za nabavku korišćen za ovaj unos zaliha"
msgid "Material Request {0} is cancelled or stopped"
msgstr "Zahtev za nabavku {0} je otkazan ili zaustavljen"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1042
+#: erpnext/selling/doctype/sales_order/sales_order.js:1045
msgid "Material Request {0} submitted."
msgstr "Zahtev za nabavku {0} je podnet."
@@ -30556,7 +30610,7 @@ msgstr "Materijal vraćen iz nedovršene proizvodnje"
#. 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:147
+#: erpnext/manufacturing/doctype/job_card/job_card.js:155
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:90
#: erpnext/stock/doctype/item/item.json
@@ -30727,7 +30781,7 @@ msgstr "Maksimalna vrednost"
msgid "Maximum discount for Item {0} is {1}%"
msgstr "Maksimalni popust za stavku {0} je {1}%"
-#: erpnext/public/js/utils/barcode_scanner.js:99
+#: erpnext/public/js/utils/barcode_scanner.js:125
msgid "Maximum quantity scanned for item {0}."
msgstr "Maksimalna količina skenirana za stavku {0}."
@@ -31198,7 +31252,7 @@ msgstr "Nedostaje"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:87
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:184
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:588
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:590
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2249
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
#: erpnext/assets/doctype/asset_category/asset_category.py:116
@@ -31210,7 +31264,7 @@ msgid "Missing Asset"
msgstr "Neodstajuća imovina"
#: erpnext/accounts/doctype/gl_entry/gl_entry.py:178
-#: erpnext/assets/doctype/asset/asset.py:308
+#: erpnext/assets/doctype/asset/asset.py:309
msgid "Missing Cost Center"
msgstr "Nedostajući troškovni centar"
@@ -31218,11 +31272,11 @@ msgstr "Nedostajući troškovni centar"
msgid "Missing Default in Company"
msgstr "Nedostaje podrazumevana postavka u kompaniji"
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:44
msgid "Missing Filters"
msgstr "Nedostaju filteri"
-#: erpnext/assets/doctype/asset/asset.py:350
+#: erpnext/assets/doctype/asset/asset.py:351
msgid "Missing Finance Book"
msgstr "Nedostajuća finansijska evidencija"
@@ -31254,7 +31308,7 @@ msgstr "Nedostaju obavezne vrednosti"
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr "Nedostaje imejl šablon za slanje. Molimo Vas da ga postavite u podešavanjima isporuke."
-#: erpnext/manufacturing/doctype/bom/bom.py:1052
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr "Nedostajuća vrednost"
@@ -31492,7 +31546,7 @@ msgstr "Mesec(i) nakon završetka meseca fakturisanja"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:62
#: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:75
-#: erpnext/accounts/report/gross_profit/gross_profit.py:406
+#: erpnext/accounts/report/gross_profit/gross_profit.py:418
#: erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json
#: erpnext/buying/report/purchase_analytics/purchase_analytics.js:61
#: erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
@@ -31920,7 +31974,7 @@ msgstr "Prirodni gas"
msgid "Needs Analysis"
msgstr "Analiza potrebna"
-#: erpnext/stock/serial_batch_bundle.py:1381
+#: erpnext/stock/serial_batch_bundle.py:1397
msgid "Negative Batch Quantity"
msgstr "Negativna količina šarže"
@@ -32361,7 +32415,7 @@ msgstr "Novi broj serije ne može imati skladište. Skladište mora biti postavl
msgid "New Task"
msgstr "Novi zadatak"
-#: erpnext/manufacturing/doctype/bom/bom.js:156
+#: erpnext/manufacturing/doctype/bom/bom.js:177
msgid "New Version"
msgstr "Nova verzija"
@@ -32388,7 +32442,7 @@ msgstr "Nova fiskalna godina je kreirana :- "
msgid "New invoices will be generated as per schedule even if current invoices are unpaid or past due date"
msgstr "Nove fakture će biti generisane prema rasporedu, čak iako trenutne fakture nisu plaćene ili je prošao datum dospeća"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:258
msgid "New release date should be in the future"
msgstr "Novi datum objavljivanja mora biti u budućnosti"
@@ -32470,8 +32524,8 @@ msgstr "Sledeći imejl će biti poslat na:"
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:625
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:646
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:627
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:648
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/buying/doctype/buying_settings/buying_settings.json
#: erpnext/projects/doctype/project/project.json
@@ -32530,11 +32584,11 @@ msgstr "Nema stavke sa brojem serije {0}"
msgid "No Items selected for transfer."
msgstr "Nema stavki izabranih za transfer."
-#: erpnext/selling/doctype/sales_order/sales_order.js:824
+#: erpnext/selling/doctype/sales_order/sales_order.js:827
msgid "No Items with Bill of Materials to Manufacture"
msgstr "Nema stavki sa sastavnicom za proizvodnju"
-#: erpnext/selling/doctype/sales_order/sales_order.js:962
+#: erpnext/selling/doctype/sales_order/sales_order.js:965
msgid "No Items with Bill of Materials."
msgstr "Nema stavki sa sastavnicom."
@@ -32550,7 +32604,7 @@ msgstr "Nema beleški"
msgid "No Outstanding Invoices found for this party"
msgstr "Nisu pronađene neizmirene fakture za ovu stranku"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:623
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:624
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr "Ne postoji profil maloprodaje. Molimo Vas da kreirate novi profil maloprodaje"
@@ -32570,7 +32624,7 @@ msgstr "Nijedna nabavna porudžbina nije kreirana"
msgid "No Records for these settings."
msgstr "Bez zapisa za ove postavke."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:334
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:336
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1049
msgid "No Remarks"
msgstr "Bez napomena"
@@ -32599,7 +32653,7 @@ msgstr "Nema dobavljača za međukompanijske transakcije koji predstavlja kompan
msgid "No Tax Withholding data found for the current posting date."
msgstr "Nema podataka o porezu po odbitku za trenutni datum knjiženja."
-#: erpnext/accounts/report/gross_profit/gross_profit.py:857
+#: erpnext/accounts/report/gross_profit/gross_profit.py:874
msgid "No Terms"
msgstr "Bez uslova"
@@ -32615,7 +32669,7 @@ msgstr "Nema neusklađenih uplata za ovu stranku"
msgid "No Work Orders were created"
msgstr "Nisu kreirani radni nalozi"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:803
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:805
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:742
msgid "No accounting entries for the following warehouses"
msgstr "Nema računovodstvenih unosa za sledeća skladišta"
@@ -32862,7 +32916,7 @@ msgstr "Kategorija nepodložna amortizaciji"
msgid "Non Profit"
msgstr "Neprofitno"
-#: erpnext/manufacturing/doctype/bom/bom.py:1420
+#: erpnext/manufacturing/doctype/bom/bom.py:1457
msgid "Non stock items"
msgstr "Stavke van zaliha"
@@ -32881,19 +32935,19 @@ msgid "None of the items have any change in quantity or value."
msgstr "Nijedna od stavki nije imala promene u količini ili vrednosti."
#. Name of a UOM
-#: erpnext/setup/setup_wizard/data/uom_data.json erpnext/stock/utils.py:681
-#: erpnext/stock/utils.py:683
+#: erpnext/setup/setup_wizard/data/uom_data.json erpnext/stock/utils.py:703
+#: erpnext/stock/utils.py:705
msgid "Nos"
msgstr "Komad"
#: erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py:66
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:270
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:271
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:556
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:568
#: erpnext/assets/doctype/asset/asset.js:618
#: erpnext/assets/doctype/asset/asset.js:633
#: erpnext/controllers/buying_controller.py:269
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:72
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:73
#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:80
msgid "Not Allowed"
msgstr "Nije dozvoljeno"
@@ -32928,7 +32982,7 @@ msgstr "Nije isporučeno"
msgid "Not Initiated"
msgstr "Nije započeto"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:812
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:823
#: erpnext/templates/pages/material_request_info.py:21
#: erpnext/templates/pages/order.py:37 erpnext/templates/pages/rfq.py:46
msgid "Not Permitted"
@@ -33002,7 +33056,7 @@ msgstr "Nije pronađeno na skladištu"
#: erpnext/manufacturing/doctype/work_order/work_order.py:2041
#: erpnext/manufacturing/doctype/work_order/work_order.py:2110
#: erpnext/selling/doctype/sales_order/sales_order.py:826
-#: erpnext/selling/doctype/sales_order/sales_order.py:1685
+#: erpnext/selling/doctype/sales_order/sales_order.py:1701
msgid "Not permitted"
msgstr "Nije dozvoljeno"
@@ -33012,12 +33066,12 @@ msgstr "Nije dozvoljeno"
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:288
#: erpnext/crm/doctype/crm_note/crm_note.json
#: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py:100
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1040
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1750
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1055
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1767
#: erpnext/projects/doctype/timesheet/timesheet.json
#: erpnext/public/js/controllers/buying.js:477
#: erpnext/selling/doctype/customer/customer.py:129
-#: erpnext/selling/doctype/sales_order/sales_order.js:1180
+#: erpnext/selling/doctype/sales_order/sales_order.js:1183
#: erpnext/stock/doctype/item/item.js:526
#: erpnext/stock/doctype/item/item.py:571
#: erpnext/stock/doctype/item_price/item_price.json
@@ -33694,7 +33748,7 @@ msgstr "Otvoreni radni nalozi"
msgid "Open a new ticket"
msgstr "Otvori novi tiket"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:377
+#: erpnext/accounts/report/general_ledger/general_ledger.py:397
#: erpnext/public/js/stock_analytics.js:97
msgid "Opening"
msgstr "Početni saldo"
@@ -33791,7 +33845,7 @@ msgstr "Stavka alata za kreiranje početne fakture"
msgid "Opening Invoice Item"
msgstr "Stavka početne fakture"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1628
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1836
msgid "Opening Invoice has rounding adjustment of {0}.
'{1}' account is required to post these values. Please set it in Company: {2}.
Or, '{3}' can be enabled to not post any rounding adjustment."
msgstr "Početna faktura ima prilagođavanje za zaokruživanje od {0}.
Za knjiženje ovih vrednosti potreban je račun '{1}'. Molimo Vas da ga postavite u kompaniji: {2}.
Ili možete omogućiti '{3}' da ne postavite nikakvo prilagođavanje za zaokruživanje."
@@ -33866,7 +33920,7 @@ msgstr "Operativni trošak (valuta kompanije)"
msgid "Operating Cost Per BOM Quantity"
msgstr "Operativni trošak prema količini u sastavnici"
-#: erpnext/manufacturing/doctype/bom/bom.py:1436
+#: erpnext/manufacturing/doctype/bom/bom.py:1473
msgid "Operating Cost as per Work Order / BOM"
msgstr "Operativni trošak prema radnom nalogu / sastavnici"
@@ -33896,7 +33950,7 @@ msgstr "Operativni troškovi"
#. Label of the operation (Link) field in DocType 'Work Order Item'
#. Label of the operation (Link) field in DocType 'Work Order Operation'
#. Label of a Link in the Manufacturing Workspace
-#: erpnext/manufacturing/doctype/bom/bom.js:409
+#: erpnext/manufacturing/doctype/bom/bom.js:430
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
@@ -33988,7 +34042,7 @@ msgstr "Za koliko gotovih proizvoda je operacija završena?"
msgid "Operation time does not depend on quantity to produce"
msgstr "Vreme operacije ne zavisi od količine za proizvodnju"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:513
+#: erpnext/manufacturing/doctype/job_card/job_card.js:521
msgid "Operation {0} added multiple times in the work order {1}"
msgstr "Operacija {0} je dodata više puta u radnom nalogu {1}"
@@ -34022,7 +34076,7 @@ msgstr "Operacije"
msgid "Operations Routing"
msgstr "Raspored operacija"
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1098
msgid "Operations cannot be left blank"
msgstr "Polje za operacije ne može ostati prazno"
@@ -34596,7 +34650,7 @@ msgstr "Izlazno"
msgid "Over Billing Allowance (%)"
msgstr "Dozvola za fakturisanje preko limita (%)"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1260
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1262
msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%"
msgstr "Dozvola za fakturisanje preko limita je premašena za stavku ulazne fakture {0} ({1}) za {2}%"
@@ -35090,7 +35144,7 @@ msgstr "Lista pakovanja"
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:293
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:299
#: erpnext/stock/doctype/packing_slip/packing_slip.json
#: erpnext/stock/workspace/stock/stock.json
msgid "Packing Slip"
@@ -35101,7 +35155,7 @@ msgstr "Dokument liste pakovanja"
msgid "Packing Slip Item"
msgstr "Stavka na dokumentu liste pakovanja"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:641
msgid "Packing Slip(s) cancelled"
msgstr "Dokument(a) liste pakovanja je otkazan"
@@ -35232,7 +35286,7 @@ msgstr "Plaćeno sa vrste računa"
msgid "Paid To Account Type"
msgstr "Plaćeno na vrstu računa"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:324
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:326
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1095
msgid "Paid amount + Write Off Amount can not be greater than Grand Total"
msgstr "Plaćeni iznos i iznos otpisivanja ne mogu biti veći od ukupnog iznosa"
@@ -35387,11 +35441,11 @@ msgstr "Matična stavka"
msgid "Parent Item Group"
msgstr "Matična grupa stavki"
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:80
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:81
msgid "Parent Item {0} must not be a Fixed Asset"
msgstr "Matična stavka {0} ne sme biti osnovno sredstvo"
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:78
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:79
msgid "Parent Item {0} must not be a Stock Item"
msgstr "Matična stavka {0} ne sme biti stavka zaliha"
@@ -35411,7 +35465,7 @@ msgstr "Matična procedura"
msgid "Parent Row No"
msgstr "Matični redni broj"
-#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:496
+#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:499
msgid "Parent Row No not found for {0}"
msgstr "Nije pronađen broj matičnog reda za {0}"
@@ -35462,7 +35516,7 @@ msgstr "Delimično prenesen materijal"
msgid "Partial Payment in POS Transactions are not allowed."
msgstr "Delimično plaćanje u maloprodajnim transakcijama nije dozvoljeno."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1645
msgid "Partial Stock Reservation"
msgstr "Delimična rezervacija zaliha"
@@ -35656,7 +35710,7 @@ msgstr "Milioniti deo"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:147
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:228
#: erpnext/accounts/report/general_ledger/general_ledger.js:74
-#: erpnext/accounts/report/general_ledger/general_ledger.py:723
+#: erpnext/accounts/report/general_ledger/general_ledger.py:743
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:161
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46
@@ -35761,6 +35815,7 @@ msgstr "Nepodudaranje stranke"
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:110
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: erpnext/crm/doctype/contract/contract.json
#: erpnext/selling/doctype/party_specific_item/party_specific_item.json
#: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22
@@ -35819,7 +35874,7 @@ msgstr "Specifična stavka stranke"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:141
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:219
#: erpnext/accounts/report/general_ledger/general_ledger.js:65
-#: erpnext/accounts/report/general_ledger/general_ledger.py:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:742
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:157
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35
@@ -35914,7 +35969,7 @@ msgstr "Putanja"
msgid "Pause"
msgstr "Pauza"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:216
+#: erpnext/manufacturing/doctype/job_card/job_card.js:224
msgid "Pause Job"
msgstr "Pauziraj posao"
@@ -36410,7 +36465,7 @@ msgstr "Status naplate"
#: 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:1200
-#: erpnext/accounts/report/gross_profit/gross_profit.py:412
+#: erpnext/accounts/report/gross_profit/gross_profit.py:424
#: erpnext/accounts/workspace/accounting/accounting.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:30
msgid "Payment Term"
@@ -36523,7 +36578,7 @@ msgstr "Greška prilikom poništavanja plaćanja"
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr "Plaćanje protiv {0} {1} ne može biti veći od neizmirenog iznosa {2}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:748
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:749
msgid "Payment amount cannot be less than or equal to 0"
msgstr "Iznos plaćanja ne može biti manji ili jednak 0"
@@ -36540,7 +36595,7 @@ msgstr "Plaćanje od {0} uspešno primljeno."
msgid "Payment of {0} received successfully. Waiting for other requests to complete..."
msgstr "Plaćanje od {0} uspešno primljeno. Sačekajte da se ostali zahtevi završe..."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:378
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:379
msgid "Payment related to {0} is not completed"
msgstr "Plaćanje povezano sa {0} nije završeno"
@@ -36683,7 +36738,7 @@ msgstr "Iznos na čekanju"
#: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
#: erpnext/manufacturing/doctype/work_order/work_order.js:312
#: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:183
-#: erpnext/selling/doctype/sales_order/sales_order.js:1217
+#: erpnext/selling/doctype/sales_order/sales_order.js:1220
#: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:45
msgid "Pending Qty"
msgstr "Količina na čekanju"
@@ -37062,7 +37117,7 @@ msgstr "Broj telefona"
#. Reservation Entry'
#. Label of a Link in the Stock Workspace
#: erpnext/selling/doctype/sales_order/sales_order.js:637
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:199
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:202
#: erpnext/stock/doctype/material_request/material_request.js:140
#: erpnext/stock/doctype/pick_list/pick_list.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -37381,12 +37436,12 @@ msgid "Please Select a Company."
msgstr "Molimo Vas da izaberete kompaniju."
#: erpnext/stock/doctype/delivery_note/delivery_note.js:165
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:204
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:207
msgid "Please Select a Customer"
msgstr "Molimo Vas da izaberete kupca"
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:139
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:251
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:255
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:102
msgid "Please Select a Supplier"
msgstr "Molimo Vas da izaberete dobavljača"
@@ -37472,7 +37527,7 @@ msgstr "Molimo Vas da proverite opciju za više valuta da biste omogućili raču
msgid "Please check Process Deferred Accounting {0} and submit manually after resolving errors."
msgstr "Molimo Vas da proverite obradu vremenskog razgraničenja {0} i unesite ručno nakon ispravljanja grešaka."
-#: erpnext/manufacturing/doctype/bom/bom.js:84
+#: erpnext/manufacturing/doctype/bom/bom.js:86
msgid "Please check either with operations or FG Based Operating Cost."
msgstr "Molimo Vas da proverite operativne troškove ili sa operacijama ili sa troškovima rada gotovih proizvoda."
@@ -37517,7 +37572,7 @@ msgstr "Molimo Vas da kontakirate svog administratora da biste proširili kredit
msgid "Please convert the parent account in corresponding child company to a group account."
msgstr "Molimo Vas da pretvorite matični račun u odgovarajućoj zavisnoj kompaniji u grupni račun."
-#: erpnext/selling/doctype/quotation/quotation.py:586
+#: erpnext/selling/doctype/quotation/quotation.py:608
msgid "Please create Customer from Lead {0}."
msgstr "Molimo Vas da kreirate kupca iz potencijalnog klijenta {0}."
@@ -37533,7 +37588,7 @@ msgstr "Molimo Vas da kreirate novu računovodstvenu dimenziju ukoliko je potreb
msgid "Please create purchase from internal sale or delivery document itself"
msgstr "Molimo Vas da kreirate nabavku iz interne prodaje ili iz samog dokumenta o isporuci"
-#: erpnext/assets/doctype/asset/asset.py:390
+#: erpnext/assets/doctype/asset/asset.py:391
msgid "Please create purchase receipt or purchase invoice for the item {0}"
msgstr "Molimo Vas da kreirate prijemnicu nabavke ili ulaznu fakturu za stavku {0}"
@@ -37545,7 +37600,7 @@ msgstr "Molimo Vas da obrišete proizvodnu kombinaciju {0}, pre nego što spojit
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr "Molimo Vas da privremeno onemogućite radni tok za nalog knjiženja {0}"
-#: erpnext/assets/doctype/asset/asset.py:429
+#: erpnext/assets/doctype/asset/asset.py:445
msgid "Please do not book expense of multiple assets against one single Asset."
msgstr "Molimo Vas da ne knjižite trošak više različitih stavki imovine na jednu stavku imovine."
@@ -37575,7 +37630,7 @@ msgstr "Molimo Vas da omogućite samo ukoliko razumete posledice omogućavanja o
msgid "Please enable pop-ups"
msgstr "Molimo Vas da omogućite iskačuće prozore (pop-ups)"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:665
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:667
msgid "Please enable {0} in the {1}."
msgstr "Molimo Vas da omogućite {0} u {1}."
@@ -37583,11 +37638,11 @@ msgstr "Molimo Vas da omogućite {0} u {1}."
msgid "Please enable {} in {} to allow same item in multiple rows"
msgstr "Molimo Vas da omogućite {} u {} da biste omogućili istu stavku u više redova"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:367
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:369
msgid "Please ensure that the {0} account is a Balance Sheet account. You can change the parent account to a Balance Sheet account or select a different account."
msgstr "Molimo Vas da povedete računa da je račun {0} račun u bilansu stanja. Možete promeniti matični račun u račun bilansa stanja ili izabrati drugi račun."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:375
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:377
msgid "Please ensure that the {0} account {1} is a Payable account. You can change the account type to Payable or select a different account."
msgstr "Molimo Vas da povedete računa da je račun {0} {1} račun obaveza. Ovo možete promeniti vrstu računa u obaveze ili izabrati drugi račun."
@@ -37603,7 +37658,7 @@ msgstr "Molimo Vas da vodite računa da {} račun {} predstavlja račun potraži
msgid "Please enter Difference Account or set default Stock Adjustment Account for company {0}"
msgstr "Molimo Vas da unesete račun razlike ili da postavite podrazumevani račun za prilagođvanje zaliha za kompaniju {0}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:508
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:509
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1188
msgid "Please enter Account for Change Amount"
msgstr "Molimo Vas da unesete račun za razliku u iznosu"
@@ -37685,7 +37740,7 @@ msgstr "Molimo Vas da unesete informacije o pošiljci"
msgid "Please enter Warehouse and Date"
msgstr "Molimo Vas da unesete skladište i datum"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:653
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:655
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1184
msgid "Please enter Write Off Account"
msgstr "Molimo Vas da unesete račun za otpis"
@@ -37714,7 +37769,7 @@ msgstr "Molimo Vas da prvo unesete broj mobilnog telefona."
msgid "Please enter parent cost center"
msgstr "Molimo Vas da unesete matični troškovni centar"
-#: erpnext/public/js/utils/barcode_scanner.js:165
+#: erpnext/public/js/utils/barcode_scanner.js:191
msgid "Please enter quantity for item {0}"
msgstr "Molimo Vas da dodate količinu za stavku {0}"
@@ -37730,7 +37785,7 @@ msgstr "Molimo Vas da unesete serijske brojeve"
msgid "Please enter the company name to confirm"
msgstr "Molimo Vas da unesete naziv kompanije da biste potvrdili"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:751
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:752
msgid "Please enter the phone number first"
msgstr "Molimo Vas da prvo unesete broj telefona"
@@ -37833,7 +37888,7 @@ msgstr "Molimo Vas da izaberete Vrstu šablona da preuzmete šablon"
msgid "Please select Apply Discount On"
msgstr "Molimo Vas da izaberete na šta će se primeniti popust"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1650
+#: erpnext/selling/doctype/sales_order/sales_order.py:1666
msgid "Please select BOM against item {0}"
msgstr "Molimo Vas da izaberete sastavnicu za stavku {0}"
@@ -37919,11 +37974,11 @@ msgstr "Molimo Vas da izaberete datum knjiženja pre nego što izaberete stranku
msgid "Please select Posting Date first"
msgstr "Molimo Vas da prvo izaberete datum knjiženja"
-#: erpnext/manufacturing/doctype/bom/bom.py:1106
+#: erpnext/manufacturing/doctype/bom/bom.py:1143
msgid "Please select Price List"
msgstr "Molimo Vas da izaberete cenovnik"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1652
+#: erpnext/selling/doctype/sales_order/sales_order.py:1668
msgid "Please select Qty against item {0}"
msgstr "Molimo Vas da izaberete količinu za stavku {0}"
@@ -37931,7 +37986,7 @@ msgstr "Molimo Vas da izaberete količinu za stavku {0}"
msgid "Please select Sample Retention Warehouse in Stock Settings first"
msgstr "Molimo Vas da prvo izaberete skladište za zadržane uzorke u podešavanjima zaliha"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:415
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:417
msgid "Please select Serial/Batch Nos to reserve or change Reservation Based On to Qty."
msgstr "Molimo Vas da izaberete brojeve serije / šarže da biste rezervisali ili promenili rezervaciju na osnovu količine."
@@ -37951,17 +38006,17 @@ msgstr "Molimo Vas da izaberete nalog za podugovaranje umesto nabavne porudžbin
msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
msgstr "Molimo Vas da izaberete račun nerealizovanog dobitka/gubitka ili da dodate podrazumevani račun nerealizovanog dobitka/gubitka za kompaniju {0}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1338
+#: erpnext/manufacturing/doctype/bom/bom.py:1375
msgid "Please select a BOM"
msgstr "Molimo Vas da izaberete sastavnicu"
#: erpnext/accounts/party.py:430
-#: erpnext/stock/doctype/pick_list/pick_list.py:1551
+#: erpnext/stock/doctype/pick_list/pick_list.py:1563
msgid "Please select a Company"
msgstr "Molimo Vas da izaberete kompaniju"
#: erpnext/accounts/doctype/payment_entry/payment_entry.js:267
-#: erpnext/manufacturing/doctype/bom/bom.js:603
+#: erpnext/manufacturing/doctype/bom/bom.js:624
#: erpnext/manufacturing/doctype/bom/bom.py:261
#: erpnext/public/js/controllers/accounts.js:249
#: erpnext/public/js/controllers/transaction.js:2812
@@ -38041,11 +38096,11 @@ msgstr "Molimo Vas da izaberete vrednost za {0} ponudu za {1}"
msgid "Please select an item code before setting the warehouse."
msgstr "Molimo Vas da izaberete šifru stavke pre nego što postavite skladište."
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:26
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:43
msgid "Please select at least one filter: Item Code, Batch, or Serial No."
msgstr "Molimo Vas da izaberete barem jedan filter: Šifra stavke, šarža ili broj serije."
-#: erpnext/selling/doctype/sales_order/sales_order.js:886
+#: erpnext/selling/doctype/sales_order/sales_order.js:889
msgid "Please select atleast one item to continue"
msgstr "Molimo Vas da izaberete barem jednu stavku da biste nastavili"
@@ -38130,7 +38185,7 @@ msgstr "Molimo Vas da izaberete {0}"
msgid "Please select {0} first"
msgstr "Molimo Vas da prvo izaberete {0}"
-#: erpnext/public/js/controllers/transaction.js:99
+#: erpnext/public/js/controllers/transaction.js:100
msgid "Please set 'Apply Additional Discount On'"
msgstr "Molimo Vas da postavite 'Primeni dodatni popust na'"
@@ -38172,10 +38227,14 @@ msgstr "Molimo Vas da postavite računovodstvenu dimenziju {} u {}"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:58
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:68
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:78
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:756
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:765
msgid "Please set Company"
msgstr "Molimo Vas da postavite kompaniju"
+#: erpnext/regional/united_arab_emirates/utils.py:26
+msgid "Please set Customer Address to determine if the transaction is an export."
+msgstr "Molimo Vas da podesite adresu kupca kako bi se utvrdilo da li je transakcija izvoz."
+
#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr "Molimo Vas da postavite račun vezana za amortizaciju u kategoriji imovine {0} ili u kompaniji {1}"
@@ -38198,7 +38257,7 @@ msgstr "Molimo Vas da postavite fiskalnu šifru za javnu upravu '%s'"
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr "Molimo Vas da postavite račun osnovnih sredstava u kategoriji imovine {0}"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:585
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:587
msgid "Please set Fixed Asset Account in {} against {}."
msgstr "Molimo Vas da postavite račun osnovnih sredstava u {} protiv {}."
@@ -38224,7 +38283,7 @@ msgstr "Molimo Vas da postavite račun nerealizovanih prihoda/rashoda kursnih ra
msgid "Please set VAT Accounts in {0}"
msgstr "Molimo Vas da postavite račun za PDV u {0}"
-#: erpnext/regional/united_arab_emirates/utils.py:61
+#: erpnext/regional/united_arab_emirates/utils.py:83
msgid "Please set Vat Accounts for Company: \"{0}\" in UAE VAT Settings"
msgstr "Molimo Vas da postavite račun za PDV za kompaniju: \"{0}\" u postavkama PDV-a UAE"
@@ -38232,11 +38291,11 @@ msgstr "Molimo Vas da postavite račun za PDV za kompaniju: \"{0}\" u postavkama
msgid "Please set a Company"
msgstr "Molimo Vas da postavite kompaniju"
-#: erpnext/assets/doctype/asset/asset.py:305
+#: erpnext/assets/doctype/asset/asset.py:306
msgid "Please set a Cost Center for the Asset or set an Asset Depreciation Cost Center for the Company {}"
msgstr "Molimo Vas da postavite troškovni centar za imovinu ili troškovni centar amortizacije imovine za kompaniju {}"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1406
+#: erpnext/selling/doctype/sales_order/sales_order.py:1422
msgid "Please set a Supplier against the Items to be considered in the Purchase Order."
msgstr "Molimo Vas da postavite dobavljača za stavke koje treba uzeti u obzir u nabavnoj porudžbini."
@@ -38248,7 +38307,7 @@ msgstr "Molimo Vas da postavite podrazumevanu listu praznika za kompaniju {0}"
msgid "Please set a default Holiday List for Employee {0} or Company {1}"
msgstr "Molimo Vas da postavite podrazumevanu listu praznika za zaposleno lice {0} ili kompaniju {1}"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1095
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1097
msgid "Please set account in Warehouse {0}"
msgstr "Molimo Vas da postavite račun u skladištu {0}"
@@ -38289,7 +38348,7 @@ msgstr "Molimo Vas da postavite kao podrazumevano blagajnu ili tekući račun u
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr "Molimo Vas da postavite kao podrazumevano blagajnu ili tekući račun u načinima plaćanja {}"
-#: erpnext/accounts/utils.py:2314
+#: erpnext/accounts/utils.py:2318
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr "Molimo Vas da postavite podrazumevani račun prihoda/rashoda kursnih razlika u kompaniji {}"
@@ -38322,7 +38381,7 @@ msgstr "Molimo Vas da postavite filtere"
msgid "Please set one of the following:"
msgstr "Molimo Vas da postavite jedno od sledećeg:"
-#: erpnext/assets/doctype/asset/asset.py:506
+#: erpnext/assets/doctype/asset/asset.py:522
msgid "Please set opening number of booked depreciations"
msgstr "Molimo Vas da unesete početni broj knjiženih amortizacija"
@@ -38406,8 +38465,8 @@ msgid "Please specify Company"
msgstr "Molimo Vas da precizirate kompaniju"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:447
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:503
msgid "Please specify Company to proceed"
msgstr "Molimo Vas da precizirate kompaniju da biste nastavili"
@@ -38614,8 +38673,8 @@ msgstr "Poštanski troškovi"
#: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:61
#: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:66
#: erpnext/accounts/report/cheques_and_deposits_incorrectly_cleared/cheques_and_deposits_incorrectly_cleared.py:151
-#: erpnext/accounts/report/general_ledger/general_ledger.py:650
-#: erpnext/accounts/report/gross_profit/gross_profit.py:269
+#: erpnext/accounts/report/general_ledger/general_ledger.py:670
+#: erpnext/accounts/report/gross_profit/gross_profit.py:275
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:183
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:204
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
@@ -38647,7 +38706,7 @@ msgstr "Poštanski troškovi"
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:127
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:104
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:86
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:449
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:492
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:24
#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:112
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:144
@@ -38662,7 +38721,7 @@ msgstr "Datum knjiženja"
msgid "Posting Date Inheritance for Exchange Gain / Loss"
msgstr "Nasleđivanje datuma knjiženja za prihod/rashod kursnih razlika"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:254
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:256
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:130
msgid "Posting Date cannot be future date"
msgstr "Datum knjiženja ne može biti u budućnosti"
@@ -38702,7 +38761,7 @@ msgstr "Datum i vreme knjiženja"
#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:275
+#: erpnext/accounts/report/gross_profit/gross_profit.py:281
#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -39001,7 +39060,7 @@ msgstr "Zemlja cenovnika"
msgid "Price List Currency"
msgstr "Valuta cenovnika"
-#: erpnext/stock/get_item_details.py:1236
+#: erpnext/stock/get_item_details.py:1231
msgid "Price List Currency not selected"
msgstr "Valuta cenovnika nije izabrana"
@@ -39670,7 +39729,7 @@ msgstr "Opis procesa"
msgid "Process Loss"
msgstr "Gubitak u procesu"
-#: erpnext/manufacturing/doctype/bom/bom.py:1089
+#: erpnext/manufacturing/doctype/bom/bom.py:1126
msgid "Process Loss Percentage cannot be greater than 100"
msgstr "Procenat gubitka u procesu ne može biti veći od 100"
@@ -39689,7 +39748,7 @@ msgstr "Procenat gubitka u procesu ne može biti veći od 100"
msgid "Process Loss Qty"
msgstr "Količina gubitka u procesu"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:293
+#: erpnext/manufacturing/doctype/job_card/job_card.js:301
msgid "Process Loss Quantity"
msgstr "Količina gubitka u procesu"
@@ -40154,15 +40213,15 @@ msgstr "Napredak (%)"
#: erpnext/accounts/doctype/psoa_project/psoa_project.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1052
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1061
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:109
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:74
#: erpnext/accounts/report/general_ledger/general_ledger.js:164
-#: erpnext/accounts/report/general_ledger/general_ledger.py:727
+#: erpnext/accounts/report/general_ledger/general_ledger.py:760
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
-#: erpnext/accounts/report/gross_profit/gross_profit.py:357
+#: erpnext/accounts/report/gross_profit/gross_profit.py:363
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:274
#: erpnext/accounts/report/purchase_register/purchase_register.py:207
@@ -40695,7 +40754,7 @@ msgstr "Detalji nabavke"
#: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
#: erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:134
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:289
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:296
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js:30
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
@@ -40729,16 +40788,16 @@ msgstr "Stavka ulazne fakture"
msgid "Purchase Invoice Trends"
msgstr "Trendovi ulaznih faktura"
-#: erpnext/assets/doctype/asset/asset.py:267
+#: erpnext/assets/doctype/asset/asset.py:268
msgid "Purchase Invoice cannot be made against an existing asset {0}"
msgstr "Ulazna faktura ne može biti napravljena za postojeću imovinu {0}"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:431
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:445
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:433
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:447
msgid "Purchase Invoice {0} is already submitted"
msgstr "Ulazna faktura {0} je već podneta"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:2011
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:2013
msgid "Purchase Invoices"
msgstr "Ulazne fakture"
@@ -40815,7 +40874,7 @@ msgstr "Glavni mendžer za nabavku"
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#: erpnext/stock/doctype/material_request/material_request.js:179
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:246
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:250
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -40891,11 +40950,11 @@ msgstr "Stavke nabavne porudžbine nisu primljene na vreme"
msgid "Purchase Order Pricing Rule"
msgstr "Pravilo određivanja cene za nabavnu porudžbinu"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:624
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:626
msgid "Purchase Order Required"
msgstr "Nabavna porudžbina je obavezna"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:619
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:621
msgid "Purchase Order Required for item {}"
msgstr "Nabavna porudžbina je obavezna za stavku {}"
@@ -40907,19 +40966,19 @@ msgstr "Nabavna porudžbina je obavezna za stavku {}"
msgid "Purchase Order Trends"
msgstr "Trendovi nabavnih porudžbina"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1179
+#: erpnext/selling/doctype/sales_order/sales_order.js:1182
msgid "Purchase Order already created for all Sales Order items"
msgstr "Nabavna porudžbina je već kreirana za sve stavke iz prodajne porudžbine"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:320
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:322
msgid "Purchase Order number required for Item {0}"
msgstr "Nabavna porudžbina je obavezna za stavku {0}"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:662
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:664
msgid "Purchase Order {0} is not submitted"
msgstr "Nabavna porudžbina {0} nije podneta"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:907
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:929
msgid "Purchase Orders"
msgstr "Nabavne porudžbine"
@@ -40967,9 +41026,9 @@ msgstr "Cenovnik nabavke"
#. Reservation Entry'
#. Label of a Link in the Stock Workspace
#. Label of a shortcut in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:174
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:655
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:665
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:177
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:661
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:671
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:49
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:246
@@ -41032,11 +41091,11 @@ msgstr "Stavke prijemnice nabavke"
msgid "Purchase Receipt No"
msgstr "Broj prijemnice nabavke"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:645
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:647
msgid "Purchase Receipt Required"
msgstr "Prijemnica nabavke je obavezna"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:640
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:642
msgid "Purchase Receipt Required for item {}"
msgstr "Prijemnica nabavke je obavezna za stavku {}"
@@ -41049,7 +41108,7 @@ msgstr "Prijemnica nabavke je obavezna za stavku {}"
msgid "Purchase Receipt Trends"
msgstr "Trendovi prijemnica nabavke"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:384
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:391
msgid "Purchase Receipt doesn't have any Item for which Retain Sample is enabled."
msgstr "Prijemnica nabavke nema nijednu stavku za koju je omogućeno zadržavanje uzorka."
@@ -41057,7 +41116,7 @@ msgstr "Prijemnica nabavke nema nijednu stavku za koju je omogućeno zadržavanj
msgid "Purchase Receipt {0} created."
msgstr "Prijemnica nabavke {0} je kreirana."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:669
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:671
msgid "Purchase Receipt {0} is not submitted"
msgstr "Prijemnica nabavke {0} nije podneta"
@@ -41068,7 +41127,7 @@ msgstr "Prijemnica nabavke {0} nije podneta"
msgid "Purchase Register"
msgstr "Registar nabavke"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:279
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:286
msgid "Purchase Return"
msgstr "Povraćaj nabavke"
@@ -41264,14 +41323,14 @@ msgstr "Pravilo skladištenja već postoji za stavku {0} u skladištu {1}."
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91
-#: erpnext/accounts/report/gross_profit/gross_profit.py:314
+#: erpnext/accounts/report/gross_profit/gross_profit.py:320
#: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json
#: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240
#: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:224
#: erpnext/controllers/trends.py:242 erpnext/controllers/trends.py:254
#: erpnext/controllers/trends.py:259
#: erpnext/crm/doctype/opportunity_item/opportunity_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:964
+#: erpnext/manufacturing/doctype/bom/bom.js:999
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
#: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
@@ -41291,8 +41350,8 @@ msgstr "Pravilo skladištenja već postoji za stavku {0} u skladištu {1}."
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:367
#: erpnext/selling/doctype/sales_order/sales_order.js:471
-#: erpnext/selling/doctype/sales_order/sales_order.js:863
-#: erpnext/selling/doctype/sales_order/sales_order.js:1015
+#: erpnext/selling/doctype/sales_order/sales_order.js:866
+#: erpnext/selling/doctype/sales_order/sales_order.js:1018
#: 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_voucher/landed_cost_voucher.json
@@ -41376,7 +41435,7 @@ msgstr "Količina po jedinici"
#. Label of the for_quantity (Float) field in DocType 'Job Card'
#. Label of the qty (Float) field in DocType 'Work Order'
-#: erpnext/manufacturing/doctype/bom/bom.js:309
+#: erpnext/manufacturing/doctype/bom/bom.js:330
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/manufacturing/report/process_loss_report/process_loss_report.py:82
@@ -41491,7 +41550,7 @@ msgstr "Količina za isporuku"
msgid "Qty to Fetch"
msgstr "Količina za preuzimanje"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:265
+#: erpnext/manufacturing/doctype/job_card/job_card.js:273
#: erpnext/manufacturing/doctype/job_card/job_card.py:765
msgid "Qty to Manufacture"
msgstr "Količina za proizvodnju"
@@ -41504,6 +41563,8 @@ msgstr "Količina za proizvodnju"
msgid "Qty to Order"
msgstr "Količina za naručivanje"
+#. Label of the finished_good_qty (Float) field in DocType 'BOM Operation'
+#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
#: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:129
msgid "Qty to Produce"
msgstr "Količina za proizvodnju"
@@ -41630,7 +41691,7 @@ msgstr "Specifičan cilj kvaliteta"
#: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:186
+#: erpnext/manufacturing/doctype/bom/bom.js:207
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/quality_management/workspace/quality/quality.json
@@ -41705,7 +41766,7 @@ msgstr "Šablon inspekcije kvaliteta"
msgid "Quality Inspection Template Name"
msgstr "Naziv šablona inspekcije kvaliteta"
-#: erpnext/public/js/controllers/transaction.js:359
+#: erpnext/public/js/controllers/transaction.js:360
#: erpnext/stock/doctype/stock_entry/stock_entry.js:165
msgid "Quality Inspection(s)"
msgstr "Inspekcije kvaliteta"
@@ -41823,7 +41884,7 @@ msgstr "Cilj pregleda kvaliteta"
#: erpnext/buying/report/purchase_analytics/purchase_analytics.js:28
#: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:213
#: erpnext/manufacturing/doctype/blanket_order_item/blanket_order_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:396
+#: erpnext/manufacturing/doctype/bom/bom.js:417
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.js:68
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.json
@@ -41850,7 +41911,7 @@ msgstr "Cilj pregleda kvaliteta"
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py:36
#: erpnext/stock/report/delayed_item_report/delayed_item_report.py:154
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:423
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:466
#: erpnext/stock/report/stock_analytics/stock_analytics.js:27
#: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
#: erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json
@@ -41972,8 +42033,8 @@ msgid "Quantity required for Item {0} in row {1}"
msgstr "Potrebna količina za stavku {0} u redu {1}"
#: erpnext/manufacturing/doctype/bom/bom.py:604
-#: erpnext/manufacturing/doctype/job_card/job_card.js:321
-#: erpnext/manufacturing/doctype/job_card/job_card.js:390
+#: erpnext/manufacturing/doctype/job_card/job_card.js:329
+#: erpnext/manufacturing/doctype/job_card/job_card.js:398
#: erpnext/manufacturing/doctype/workstation/workstation.js:303
msgid "Quantity should be greater than 0"
msgstr "Količina treba biti veća od 0"
@@ -42002,7 +42063,7 @@ msgstr "Količina za proizvodnju"
msgid "Quantity to Produce should be greater than zero."
msgstr "Količina za proizvodnju treba biti veća od nule."
-#: erpnext/public/js/utils/barcode_scanner.js:236
+#: erpnext/public/js/utils/barcode_scanner.js:262
msgid "Quantity to Scan"
msgstr "Količina za skeniranje"
@@ -42133,7 +42194,7 @@ msgstr "Ponuda/Potencijalni klijent %"
#. Label of the prevdoc_docname (Link) field in DocType 'Sales Order Item'
#. Label of a Link in the Selling Workspace
#. Option for the 'Transaction' (Select) field in DocType 'Authorization Rule'
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:277
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:280
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:36
#: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html:20
#: erpnext/crm/doctype/contract/contract.json
@@ -42200,7 +42261,7 @@ msgstr "Ponuda {0} je otkazana"
msgid "Quotation {0} not of type {1}"
msgstr "Ponuda {0} nije vrste {1}"
-#: erpnext/selling/doctype/quotation/quotation.py:343
+#: erpnext/selling/doctype/quotation/quotation.py:345
#: erpnext/selling/page/sales_funnel/sales_funnel.py:57
msgid "Quotations"
msgstr "Ponude"
@@ -42652,8 +42713,8 @@ msgstr "Skladište sirovina"
#. Label of the materials_section (Section Break) field in DocType 'BOM'
#. Label of the section_break_8 (Section Break) field in DocType 'Job Card'
#. Label of the mr_items (Table) field in DocType 'Production Plan'
-#: erpnext/manufacturing/doctype/bom/bom.js:349
-#: erpnext/manufacturing/doctype/bom/bom.js:938
+#: erpnext/manufacturing/doctype/bom/bom.js:370
+#: erpnext/manufacturing/doctype/bom/bom.js:972
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
@@ -42816,7 +42877,7 @@ msgid "Reason"
msgstr "Razlog"
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:282
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr "Razlog za stavljanje na čekanje"
@@ -42827,7 +42888,7 @@ msgid "Reason for Failure"
msgstr "Razlog neuspeha"
#: erpnext/buying/doctype/purchase_order/purchase_order.js:748
-#: erpnext/selling/doctype/sales_order/sales_order.js:1338
+#: erpnext/selling/doctype/sales_order/sales_order.js:1341
msgid "Reason for Hold"
msgstr "Razlog za zadržavanje"
@@ -42836,7 +42897,7 @@ msgstr "Razlog za zadržavanje"
msgid "Reason for Leaving"
msgstr "Razlog za odsustvo"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1353
+#: erpnext/selling/doctype/sales_order/sales_order.js:1356
msgid "Reason for hold:"
msgstr "Razlog za zadržavanje:"
@@ -43206,7 +43267,7 @@ msgstr "Zabeležiti URL"
msgid "Records"
msgstr "Zabeleške"
-#: erpnext/regional/united_arab_emirates/utils.py:171
+#: erpnext/regional/united_arab_emirates/utils.py:193
msgid "Recoverable Standard Rated expenses should not be set when Reverse Charge Applicable is Y"
msgstr "Povratni standardni troškovi ne smeju biti postavljeni kada je obaveza obrnuto oporezivanja primenjiva"
@@ -43648,11 +43709,11 @@ msgstr "Referenca: {0}, šifra stavke: {1} i kupac: {2}"
msgid "References"
msgstr "Reference"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:385
msgid "References to Sales Invoices are Incomplete"
msgstr "Reference za izlazne fakture su nepotpune"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:380
msgid "References to Sales Orders are Incomplete"
msgstr "Reference za prodajne porudžbine su nepotpune"
@@ -43797,14 +43858,14 @@ msgstr "Veza"
#. Label of the release_date (Date) field in DocType 'Purchase Invoice'
#. Label of the release_date (Date) field in DocType 'Supplier'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:268
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:312
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:274
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:318
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
msgstr "Datum izdavanja"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:315
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:317
msgid "Release date must be in the future"
msgstr "Datum izdavanja mora biti u budućnosti"
@@ -43879,7 +43940,7 @@ msgstr "Napomena"
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1254
#: erpnext/accounts/report/general_ledger/general_ledger.html:84
#: erpnext/accounts/report/general_ledger/general_ledger.html:110
-#: erpnext/accounts/report/general_ledger/general_ledger.py:752
+#: erpnext/accounts/report/general_ledger/general_ledger.py:785
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112
#: erpnext/accounts/report/purchase_register/purchase_register.py:296
#: erpnext/accounts/report/sales_register/sales_register.py:335
@@ -43976,8 +44037,8 @@ msgstr "Zakupljeno"
#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:58
#: erpnext/crm/doctype/opportunity/opportunity.js:130
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:354
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:305
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:360
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:312
#: erpnext/support/doctype/issue/issue.js:39
msgid "Reopen"
msgstr "Ponovo otvori"
@@ -44610,7 +44671,7 @@ msgstr "Rezervisana količina za podugovor"
msgid "Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items."
msgstr "Rezervisana količina za podugovor: Količina sirovina potrebna za izradu podugovorenih stavki."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:606
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:608
msgid "Reserved Qty should be greater than Delivered Qty."
msgstr "Rezervisana količina treba da budeć veća od isporučene količine."
@@ -44911,7 +44972,7 @@ msgstr "Polje za naslov rezultata"
msgid "Resume"
msgstr "Biografija"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:200
+#: erpnext/manufacturing/doctype/job_card/job_card.js:208
msgid "Resume Job"
msgstr "Nastaviti posao"
@@ -44941,7 +45002,7 @@ msgstr "Zadržani uzorak"
msgid "Retained Earnings"
msgstr "Neraspoređena dobit"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:295
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:302
msgid "Retention Stock Entry"
msgstr "Unos zaliha koje se zadržavaju"
@@ -45035,13 +45096,13 @@ msgstr "Povraćaj komponenti"
msgid "Return Issued"
msgstr "Izdati povraćaji"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:355
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:362
msgid "Return Qty"
msgstr "Količina za povraćaj"
#. Label of the return_qty_from_rejected_warehouse (Check) field in DocType
#. 'Purchase Receipt Item'
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:331
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:338
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
msgid "Return Qty from Rejected Warehouse"
msgstr "Količina za povraćaj iz skladišta odbijenih zaliha"
@@ -45507,12 +45568,12 @@ msgstr "Red # {0}: Vraćena stavka {1} ne postoji u {2} {3}"
msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr "Red #1: ID sekvence mora biti 1 za operaciju {0}."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:518
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1919
msgid "Row #{0} (Payment Table): Amount must be negative"
msgstr "Red #{0} (Evidencija plaćanja): Iznos mora biti negativan"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:515
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:516
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr "Red #{0} (Evidencija plaćanja): Iznos mora biti pozitivan"
@@ -45571,7 +45632,7 @@ msgstr "Red #{0}: Imovina {1} je već prodata"
msgid "Row #{0}: BOM is not specified for subcontracting item {0}"
msgstr "Red #{0}: Nije navedena sastavnica za podugovorenu stavku {0}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:405
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:407
msgid "Row #{0}: Batch No {1} is already selected."
msgstr "Red #{0}: Broj šarže {1} je već izabran."
@@ -45607,7 +45668,7 @@ msgstr "Red #{0}: Nije moguće postaviti cenu ukoliko je fakturisani iznos veći
msgid "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}"
msgstr "Red #{0}: Ne može se preneti više od potrebne količine {1} za stavku {2} prema radnoj kartici {3}"
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:86
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:87
msgid "Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save"
msgstr "Red #{0}: Zavisna stavka ne bi trebala da bude paket proizvoda. Molimo Vas da uklonite stavku {1} i sačuvate"
@@ -45647,7 +45708,7 @@ msgstr "Red #{0}: Datumi se preklapaju sa drugim redom"
msgid "Row #{0}: Default BOM not found for FG Item {1}"
msgstr "Red #{0}: Podrazumevana sastavnica nije pronađena za gotov proizvod {1}"
-#: erpnext/assets/doctype/asset/asset.py:533
+#: erpnext/assets/doctype/asset/asset.py:549
msgid "Row #{0}: Depreciation Start Date is required"
msgstr "Red #{0}: Datum početka amortizacije je obavezan"
@@ -45699,7 +45760,7 @@ msgstr "Red #{0}: Datum početka ne može biti pre datuma završetka"
msgid "Row #{0}: From Time and To Time fields are required"
msgstr "Red #{0}: Polja za vreme početka i vreme završetka su obavezna"
-#: erpnext/public/js/utils/barcode_scanner.js:394
+#: erpnext/public/js/utils/barcode_scanner.js:428
msgid "Row #{0}: Item added"
msgstr "Red #{0}: Stavka je dodata"
@@ -45707,7 +45768,7 @@ msgstr "Red #{0}: Stavka je dodata"
msgid "Row #{0}: Item {1} does not exist"
msgstr "Red #{0}: Stavka {1} ne postoji"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1549
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr "Red #{0}: Stavka {1} je odabrana, molimo Vas da rezervišite zalihe sa liste za odabir."
@@ -45731,11 +45792,11 @@ msgstr "Red #{0}: Stavka {1} nije skladišna stavka"
msgid "Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher"
msgstr "Red #{0}: Nalog knjiženja {1} ne sadrži račun {2} ili je već povezan sa drugim dokumentom"
-#: erpnext/assets/doctype/asset/asset.py:527
+#: erpnext/assets/doctype/asset/asset.py:543
msgid "Row #{0}: Next Depreciation Date cannot be before Available-for-use Date"
msgstr "Red #{0}: Sledeći datum amortizacije ne može biti pre datuma dostupnosti za upotrebu"
-#: erpnext/assets/doctype/asset/asset.py:522
+#: erpnext/assets/doctype/asset/asset.py:538
msgid "Row #{0}: Next Depreciation Date cannot be before Purchase Date"
msgstr "Red #{0}: Sledeći datum amortizacije ne može biti pre datuma nabavke"
@@ -45743,11 +45804,11 @@ msgstr "Red #{0}: Sledeći datum amortizacije ne može biti pre datuma nabavke"
msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
msgstr "Red #{0}: Nije dozvoljeno promeniti dobavljača jer nabavna porudžbina već postoji"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1632
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr "Red #{0}: Samo {1} je dostupno za rezervaciju za stavku {2}"
-#: erpnext/assets/doctype/asset/asset.py:499
+#: erpnext/assets/doctype/asset/asset.py:515
msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}"
msgstr "Red #{0}: Početna akumulirana amortizacija mora biti manja od ili jednaka {1}"
@@ -45755,15 +45816,15 @@ msgstr "Red #{0}: Početna akumulirana amortizacija mora biti manja od ili jedna
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 "Red #{0}: Operacija {1} nije završena za {2} količine gotovih proizvoda u radnom nalogu {3}. Molimo Vas da ažurirate status operacije putem radne kartice {4}."
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1009
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1010
msgid "Row #{0}: Please select Item Code in Assembly Items"
msgstr "Red #{0}: Molimo Vas da izaberete šifru stavke u sastavljenim stavkama"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1012
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1013
msgid "Row #{0}: Please select the BOM No in Assembly Items"
msgstr "Red #{0}: Molimo Vas da izaberete broj sastavnice u sastavljenim stavkama"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1006
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1007
msgid "Row #{0}: Please select the Sub Assembly Warehouse"
msgstr "Red #{0}: Molimo Vas da izaberete skladište podsklopova"
@@ -45775,7 +45836,7 @@ msgstr "Red #{0}: Molimo Vas da postavite količinu za naručivanje"
msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master"
msgstr "Red #{0}: Molimo Vas da ažurirate račun razgraničenih prihoda/rashoda u redu stavke ili podrazumevani račun u master podacima kompanije"
-#: erpnext/public/js/utils/barcode_scanner.js:392
+#: erpnext/public/js/utils/barcode_scanner.js:426
msgid "Row #{0}: Qty increased by {1}"
msgstr "Red #{0}: Količina je povećana za {1}"
@@ -45784,7 +45845,7 @@ msgstr "Red #{0}: Količina je povećana za {1}"
msgid "Row #{0}: Qty must be a positive number"
msgstr "Red #{0}: Količina mora biti pozitivan broj"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:393
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:395
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 "Red #{0}: Količina treba da bude manja ili jednaka dostupnoj količini za rezervaciju (stvarna količina - rezervisana količina) {1} za stavku {2} protiv šarže {3} u skladištu {4}."
@@ -45800,12 +45861,16 @@ msgstr "Red #{0}: Inspekcija kvaliteta {1} nije podneta za stavku: {2}"
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr "Red #{0}: Inspekcija kvaliteta {1} je odbijena za stavku {2}"
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:96
+msgid "Row #{0}: Quantity cannot be a non-positive number. Please increase the quantity or remove the Item {1}"
+msgstr "Red #{0}: Količina mora biti pozitivan broj. Molimo Vas da povećate količinu ili uklonite stavku {1}"
+
#: erpnext/controllers/accounts_controller.py:1375
#: erpnext/controllers/accounts_controller.py:3663
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr "Red #{0}: Količina za stavku {1} ne može biti nula."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1617
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr "Red #{0}: Količina za rezervaciju za stavku {1} mora biti veća od 0."
@@ -45858,11 +45923,11 @@ msgstr "Red #{0}: ID sekvence mora biti {1} ili {2} za operaciju {3}."
msgid "Row #{0}: Serial No {1} does not belong to Batch {2}"
msgstr "Red #{0}: Broj serije {1} ne pripada šarži {2}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:342
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:344
msgid "Row #{0}: Serial No {1} for Item {2} is not available in {3} {4} or might be reserved in another {5}."
msgstr "Red #{0}: Broj serije {1} za stavku {2} nije dostupan u {3} {4} ili može biti rezervisan u drugom {5}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:358
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:360
msgid "Row #{0}: Serial No {1} is already selected."
msgstr "Red #{0}: Broj serije {1} je već izabran."
@@ -45882,6 +45947,10 @@ msgstr "Red #{0}: Datum početka i datum završetka usluge je obavezan za vremen
msgid "Row #{0}: Set Supplier for item {1}"
msgstr "Red #{0}: Postavite dobavljača za stavku {1}"
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1017
+msgid "Row #{0}: Since 'Track Semi Finished Goods' is enabled, the BOM {1} cannot be used for Sub Assembly Items"
+msgstr "Red #{0}: S obzirom da je 'Praćenje poluproizvoda' omogućeno, sastavnica {1} ne može biti korišćenja za podsklopove"
+
#: erpnext/manufacturing/doctype/workstation/workstation.py:92
msgid "Row #{0}: Start Time and End Time are required"
msgstr "Red #{0}: Početno i završno vreme je obavezno"
@@ -45898,32 +45967,32 @@ msgstr "Red #{0}: Status je obavezan"
msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}"
msgstr "Red #{0}: Status mora biti {1} za diskontovanje fakture {2}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:367
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:369
msgid "Row #{0}: Stock cannot be reserved for Item {1} against a disabled Batch {2}."
msgstr "Red #{0}: Skladište ne može biti rezervisano za stavku {1} protiv onemogućene šarže {2}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1562
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr "Red #{0}: Skladište ne može biti rezervisano za stavke van zaliha {1}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1575
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr "Red #{0}: Zalihe ne mogu biti rezervisane u grupnom skladištu {1}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1589
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr "Red #{0}: Zalihe su već rezervisane za stavku {1}."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:539
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr "Red #{0}: Zalihe su već rezervisane za stavku {1} u skladištu {2}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:377
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:379
msgid "Row #{0}: Stock not available to reserve for Item {1} against Batch {2} in Warehouse {3}."
msgstr "Red #{0}: Zalihe nisu dostupne za rezervaciju za stavku {1} protiv šarže {2} u skladištu {3}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1224
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1603
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr "Red #{0}: Zalihe nisu dostupne za rezervaciju za stavku {1} u skladištu {2}."
@@ -45939,7 +46008,7 @@ msgstr "Red #{0}: Skladište {1} nije zavisno skladište grupnog skladišta {2}"
msgid "Row #{0}: Timings conflicts with row {1}"
msgstr "Red #{0}: Vremenski sukob sa redom {1}"
-#: erpnext/assets/doctype/asset/asset.py:512
+#: erpnext/assets/doctype/asset/asset.py:528
msgid "Row #{0}: Total Number of Depreciations cannot be less than or equal to Opening Number of Booked Depreciations"
msgstr "Red #{0}: Ukupan broj amortizacija ne može biti manji ili jednak broju početnih knjiženih amortizacija"
@@ -46011,11 +46080,11 @@ msgstr "Red #{idx}: {schedule_date} ne može biti pre {transaction_date}."
msgid "Row #{}: Currency of {} - {} doesn't matches company currency."
msgstr "Red #{}: Valuta za {} - {} se ne poklapa sa valutom kompanije."
-#: erpnext/assets/doctype/asset/asset.py:349
+#: erpnext/assets/doctype/asset/asset.py:350
msgid "Row #{}: Finance Book should not be empty since you're using multiple."
msgstr "Red #{}: Finansijska evidencija ne sme biti prazna, s obzirom da su u upotrebi više njih."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:406
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:407
msgid "Row #{}: Item Code: {} is not available under warehouse {}."
msgstr "Red #{}: Šifra stavke: {} nije dostupno u skladištu {}."
@@ -46035,23 +46104,23 @@ msgstr "Red #{}: Fiskalni račun {} još uvek nije podnet"
msgid "Row #{}: Please assign task to a member."
msgstr "Red #{}: Molimo Vas da dodelite zadatak članu tima."
-#: erpnext/assets/doctype/asset/asset.py:341
+#: erpnext/assets/doctype/asset/asset.py:342
msgid "Row #{}: Please use a different Finance Book."
msgstr "Red #{}: Molimo Vas da koristite drugu finansijsku evidenciju."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:477
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:478
msgid "Row #{}: Serial No {} cannot be returned since it was not transacted in original invoice {}"
msgstr "Red #{}: Broj serije {} ne može biti vraćen jer nije bilo transakcija u originalnoj fakturi {}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:413
-msgid "Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}. Available quantity {}."
-msgstr "Red #{}: Količina zaliha nije dovoljna za šifru stavke: {} u skladištu {}. Dostupna količina {}."
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:414
+msgid "Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}."
+msgstr "Red #{}: Nema dovoljno zaliha za šifru stavke: {} unutar skladišta {}."
#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:104
msgid "Row #{}: The original Invoice {} of return invoice {} is not consolidated."
msgstr "Red #{}: originalna faktura {} za reklamacionu fakturu {} nije konsolidovana."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:450
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:451
msgid "Row #{}: You cannot add positive quantities in a return invoice. Please remove item {} to complete the return."
msgstr "Red #{}: Ne možete dodati pozitivne količine u reklamacionu fakturu. Molimo Vas da uklonite stavku {} da biste završili povrat."
@@ -46072,7 +46141,7 @@ msgstr "Red #{}: {} {} ne postoji."
msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}."
msgstr "Red #{}: {} {} ne pripada kompaniji {}. Molimo Vas da izaberete važeći {}."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:434
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:436
msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}"
msgstr "Red broj {0}: Skladište je obavezno. Molimo Vas da postavite podrazumevano skladište za stavku {1} i kompaniju {2}"
@@ -46181,19 +46250,19 @@ msgstr "Red {0}: Stavka iz otpremnice ili referenca upakovane stavke je obavezna
msgid "Row {0}: Exchange Rate is mandatory"
msgstr "Red {0}: Devizni kurs je obavezan"
-#: erpnext/assets/doctype/asset/asset.py:474
+#: erpnext/assets/doctype/asset/asset.py:490
msgid "Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount"
msgstr "Red {0}: Očekivana vrednost nakon korisnog veka mora biti manja od ukupnog iznosa nabavke"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:525
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:527
msgid "Row {0}: Expense Head changed to {1} as no Purchase Receipt is created against Item {2}."
msgstr "Red {0}: Grupa troška je promenjena na {1} jer nije kreirana prijemnica nabavke za stavku {2}."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:482
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:484
msgid "Row {0}: Expense Head changed to {1} because account {2} is not linked to warehouse {3} or it is not the default inventory account"
msgstr "Red {0}: Grupa troška je promenjena na {1} jer račun {2} nije povezan sa skladištem {3} ili nije podrazumevani račun inventara"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:507
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:509
msgid "Row {0}: Expense Head changed to {1} because expense is booked against this account in Purchase Receipt {2}"
msgstr "Red {0}: Grupa troška je promenjena na {1} jer je trošak knjižen na ovaj račun u prijemnici nabavke {2}"
@@ -46246,7 +46315,7 @@ msgstr "Red {0}: Stavka {1} mora biti podugovorena stavka."
msgid "Row {0}: Item {1}'s quantity cannot be higher than the available quantity."
msgstr "Red {0}: Količina stavke {1} ne može biti veća od raspoložive količine."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:596
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr "Red {0}: Upakovana količina mora biti jednaka količini {1}."
@@ -46362,7 +46431,7 @@ msgstr "Red {0}: Za postavljanje periodičnosti {1}, razlika između datuma poč
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr "Red {0}: Faktor konverzije jedinica mere je obavezan"
-#: erpnext/manufacturing/doctype/bom/bom.py:1072
+#: erpnext/manufacturing/doctype/bom/bom.py:1109
#: erpnext/manufacturing/doctype/work_order/work_order.py:277
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr "Red {0}: Radna stanica ili vrsta radne stanice je obavezna za operaciju {1}"
@@ -46589,6 +46658,8 @@ msgstr "Metod obračuna zarade"
#: erpnext/accounts/doctype/shipping_rule/shipping_rule_dashboard.py:10
#: erpnext/accounts/doctype/tax_category/tax_category_dashboard.py:9
#: erpnext/accounts/doctype/tax_rule/tax_rule.json
+#: erpnext/crm/doctype/opportunity/opportunity.js:288
+#: erpnext/crm/doctype/opportunity/opportunity.py:158
#: erpnext/projects/doctype/project/project_dashboard.py:15
#: erpnext/regional/report/vat_audit_report/vat_audit_report.py:185
#: erpnext/selling/doctype/quotation/quotation.json
@@ -46681,8 +46752,8 @@ msgstr "Prodajna ulazna jedinična cena"
#: erpnext/accounts/doctype/sales_invoice_reference/sales_invoice_reference.json
#: erpnext/accounts/print_format/sales_auditing_voucher/sales_auditing_voucher.html:5
#: erpnext/accounts/report/gross_profit/gross_profit.js:30
-#: erpnext/accounts/report/gross_profit/gross_profit.py:256
-#: erpnext/accounts/report/gross_profit/gross_profit.py:263
+#: erpnext/accounts/report/gross_profit/gross_profit.py:262
+#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: erpnext/accounts/workspace/accounting/accounting.json
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/crm/doctype/contract/contract.json
@@ -46694,7 +46765,7 @@ msgstr "Prodajna ulazna jedinična cena"
#: erpnext/selling/workspace/selling/selling.json
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/setup/workspace/home/home.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:343
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:349
#: erpnext/stock/doctype/delivery_note/delivery_note_list.js:65
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
msgid "Sales Invoice"
@@ -46772,11 +46843,11 @@ msgstr "Izlazna faktura nije podneta"
msgid "Sales Invoice isn't created by user {}"
msgstr "Izlazna faktura nije kreirana od strane korisnika {}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:422
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:423
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr "Režim izlaznog fakturisanja je aktiviran u maloprodaji. Molimo Vas da napravite izlaznu fakturu umesto toga."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:616
msgid "Sales Invoice {0} has already been submitted"
msgstr "Izlazna faktura {0} je već podneta"
@@ -46920,7 +46991,7 @@ msgstr "Prodajne prilike po izvoru"
#: erpnext/selling/workspace/selling/selling.json
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.js:160
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:223
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:226
#: erpnext/stock/doctype/material_request/material_request.js:219
#: erpnext/stock/doctype/material_request_item/material_request_item.json
#: erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -46972,7 +47043,7 @@ msgstr "Datum prodajne porudžbine"
#: erpnext/manufacturing/doctype/production_plan_item_reference/production_plan_item_reference.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/selling/doctype/sales_order/sales_order.js:313
-#: erpnext/selling/doctype/sales_order/sales_order.js:870
+#: erpnext/selling/doctype/sales_order/sales_order.js:873
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/stock/doctype/material_request_item/material_request_item.json
#: erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -47005,7 +47076,7 @@ msgstr "Status prodajne porudžbine"
msgid "Sales Order Trends"
msgstr "Trendovi prodajne porudžbine"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:268
msgid "Sales Order required for Item {0}"
msgstr "Prodajna porudžbina je potrebna za stavku {0}"
@@ -47175,7 +47246,7 @@ msgstr "Rezime uplata od prodaje"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:191
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:80
#: erpnext/accounts/report/gross_profit/gross_profit.js:50
-#: erpnext/accounts/report/gross_profit/gross_profit.py:371
+#: erpnext/accounts/report/gross_profit/gross_profit.py:377
#: erpnext/crm/workspace/crm/crm.json
#: erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
#: erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
@@ -47256,8 +47327,8 @@ msgstr "Registar prodaje"
msgid "Sales Representative"
msgstr "Prodajni predstavnik"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:857
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:267
+#: erpnext/accounts/report/gross_profit/gross_profit.py:874
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:273
msgid "Sales Return"
msgstr "Povraćaj prodaje"
@@ -47515,8 +47586,8 @@ msgstr "Subota"
#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js:119
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:628
#: erpnext/accounts/doctype/ledger_merge/ledger_merge.js:75
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:292
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:328
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47554,7 +47625,7 @@ msgstr "Sazhen"
#: 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/public/js/utils/barcode_scanner.js:215
+#: erpnext/public/js/utils/barcode_scanner.js:241
#: erpnext/selling/doctype/quotation/quotation.json
#: erpnext/selling/doctype/sales_order/sales_order.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -47586,7 +47657,7 @@ msgstr "Režim skeniranja"
msgid "Scan Serial No"
msgstr "Skeniraj broj serije"
-#: erpnext/public/js/utils/barcode_scanner.js:179
+#: erpnext/public/js/utils/barcode_scanner.js:205
msgid "Scan barcode for item {0}"
msgstr "Skeniraj bar-kod za stavku {0}"
@@ -47600,7 +47671,7 @@ msgstr "Režim skeniranja je omogućen, postojeća količina neće biti preuzeta
msgid "Scanned Cheque"
msgstr "Skenirani ček"
-#: erpnext/public/js/utils/barcode_scanner.js:247
+#: erpnext/public/js/utils/barcode_scanner.js:273
msgid "Scanned Quantity"
msgstr "Skenirana količina"
@@ -47894,7 +47965,7 @@ msgid "Segregate Serial / Batch Bundle"
msgstr "Razdvoji paket serije / šarže"
#: erpnext/buying/doctype/purchase_order/purchase_order.js:250
-#: erpnext/selling/doctype/sales_order/sales_order.js:1107
+#: erpnext/selling/doctype/sales_order/sales_order.js:1110
#: erpnext/selling/doctype/sales_order/sales_order_list.js:96
#: erpnext/selling/report/sales_analytics/sales_analytics.js:93
msgid "Select"
@@ -47916,15 +47987,15 @@ msgstr "Izaberite alternativnu stavku za prodajnu porudžbinu"
msgid "Select Attribute Values"
msgstr "Izaberite vrednosti atributa"
-#: erpnext/selling/doctype/sales_order/sales_order.js:853
+#: erpnext/selling/doctype/sales_order/sales_order.js:856
msgid "Select BOM"
msgstr "Izaberite sastavnicu"
-#: erpnext/selling/doctype/sales_order/sales_order.js:834
+#: erpnext/selling/doctype/sales_order/sales_order.js:837
msgid "Select BOM and Qty for Production"
msgstr "Izaberite sastavnicu i količinu za proizvodnju"
-#: erpnext/selling/doctype/sales_order/sales_order.js:985
+#: erpnext/selling/doctype/sales_order/sales_order.js:988
msgid "Select BOM, Qty and For Warehouse"
msgstr "Izaberite sastavnicu, količinu i skladište"
@@ -47954,7 +48025,7 @@ msgstr "Izaberite kolone i filtere"
msgid "Select Company"
msgstr "Izaberite kompaniju"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:468
+#: erpnext/manufacturing/doctype/job_card/job_card.js:476
msgid "Select Corrective Operation"
msgstr "Izaberite korektivnu operaciju"
@@ -47995,7 +48066,7 @@ msgstr "Izaberite adresu otpreme "
msgid "Select DocType"
msgstr "Izaberite DocType"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:186
+#: erpnext/manufacturing/doctype/job_card/job_card.js:194
msgid "Select Employees"
msgstr "Izaberite zaposlena lica"
@@ -48003,12 +48074,12 @@ msgstr "Izaberite zaposlena lica"
msgid "Select Finished Good"
msgstr "Izaberite gotov proizvod"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1186
-#: erpnext/selling/doctype/sales_order/sales_order.js:1198
+#: erpnext/selling/doctype/sales_order/sales_order.js:1189
+#: erpnext/selling/doctype/sales_order/sales_order.js:1201
msgid "Select Items"
msgstr "Izaberite stavke"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1072
+#: erpnext/selling/doctype/sales_order/sales_order.js:1075
msgid "Select Items based on Delivery Date"
msgstr "Izaberite stavke na osnovu datuma isporuke"
@@ -48019,7 +48090,7 @@ msgstr "Izaberite stavke za kontrolu kvaliteta"
#. Label of the select_items_to_manufacture_section (Section Break) field in
#. DocType 'Production Plan'
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:881
+#: erpnext/selling/doctype/sales_order/sales_order.js:884
msgid "Select Items to Manufacture"
msgstr "Izaberite stavke za proizvodnju"
@@ -48033,7 +48104,7 @@ msgstr "Izaberite stavke do datuma isporuke"
msgid "Select Job Worker Address"
msgstr "Izaberite adresu zaposlenog"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1118
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1127
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:955
msgid "Select Loyalty Program"
msgstr "Izaberite program lojalnosti"
@@ -48167,7 +48238,7 @@ msgstr "Izaberite finansijsku evidenciju za stavku {0} u redu {1}"
msgid "Select item group"
msgstr "Izaberite grupu stavki"
-#: erpnext/manufacturing/doctype/bom/bom.js:376
+#: erpnext/manufacturing/doctype/bom/bom.js:397
msgid "Select template item"
msgstr "Izaberite šablon stavke"
@@ -48184,7 +48255,7 @@ msgstr "Izaberite podrazumevanu radnu stanicu na kojoj će se izvršiti operacij
msgid "Select the Item to be manufactured."
msgstr "Izaberite stavku koja će biti proizvedena."
-#: erpnext/manufacturing/doctype/bom/bom.js:858
+#: erpnext/manufacturing/doctype/bom/bom.js:879
msgid "Select the Item to be manufactured. The Item name, UoM, Company, and Currency will be fetched automatically."
msgstr "Izaberite stavku koja će biti proizvedena. Naziv stavke, jedinica mere, kompanija i valuta će automatski biti preuzeti."
@@ -48205,11 +48276,11 @@ msgstr "Izaberite datum"
msgid "Select the date and your timezone"
msgstr "Izaberite datum i vremensku zonu"
-#: erpnext/manufacturing/doctype/bom/bom.js:877
+#: erpnext/manufacturing/doctype/bom/bom.js:898
msgid "Select the raw materials (Items) required to manufacture the Item"
msgstr "Izaberite sirovine (stavke) potrebne za proizvodnju stavke"
-#: erpnext/manufacturing/doctype/bom/bom.js:431
+#: erpnext/manufacturing/doctype/bom/bom.js:452
msgid "Select variant item code for the template item {0}"
msgstr "Izaberite šifru varijante stavke za šablon stavke {0}"
@@ -48294,7 +48365,7 @@ msgstr "Prodaja imovine"
msgid "Selling"
msgstr "Prodaja"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:330
+#: erpnext/accounts/report/gross_profit/gross_profit.py:336
msgid "Selling Amount"
msgstr "Prodajni iznos"
@@ -48466,7 +48537,7 @@ msgstr "Podešavanje stavke serije i šarže"
msgid "Serial / Batch Bundle"
msgstr "Paket serije / šarže"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:441
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:442
msgid "Serial / Batch Bundle Missing"
msgstr "Nedostaje paket serije / šarže"
@@ -48543,7 +48614,7 @@ msgstr "Brojevi serije / šarže"
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:65
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:149
#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:37
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:409
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:436
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:38
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:60
#: erpnext/stock/report/stock_ledger/stock_ledger.py:336
@@ -48643,7 +48714,7 @@ msgstr "Broj serije je obavezan za stavku {0}"
msgid "Serial No {0} already exists"
msgstr "Broj serije {0} već postoji"
-#: erpnext/public/js/utils/barcode_scanner.js:321
+#: erpnext/public/js/utils/barcode_scanner.js:347
msgid "Serial No {0} already scanned"
msgstr "Broj serije {0} je već skeniran"
@@ -48664,7 +48735,7 @@ msgstr "Broj serije {0} ne postoji"
msgid "Serial No {0} does not exists"
msgstr "Broj serije {0} ne postoji"
-#: erpnext/public/js/utils/barcode_scanner.js:402
+#: erpnext/public/js/utils/barcode_scanner.js:436
msgid "Serial No {0} is already added"
msgstr "Broj serije {0} je već dodat"
@@ -48692,7 +48763,7 @@ msgstr "Broj serije {0} nije pronađen"
msgid "Serial No: {0} has already been transacted into another POS Invoice."
msgstr "Broj serije: {0} je već transakcijski upisan u drugi fiskalni račun."
-#: erpnext/public/js/utils/barcode_scanner.js:271
+#: erpnext/public/js/utils/barcode_scanner.js:297
#: erpnext/public/js/utils/serial_no_batch_selector.js:16
#: erpnext/public/js/utils/serial_no_batch_selector.js:190
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:50
@@ -49189,8 +49260,8 @@ msgstr "Postavi osnovnu cenu ručno"
msgid "Set Default Supplier"
msgstr "Postavi podrazumevanog dobavljača"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:339
-#: erpnext/manufacturing/doctype/job_card/job_card.js:408
+#: erpnext/manufacturing/doctype/job_card/job_card.js:347
+#: erpnext/manufacturing/doctype/job_card/job_card.js:416
msgid "Set Finished Good Quantity"
msgstr "Postavi količinu gotovog proizvoda"
@@ -49221,11 +49292,11 @@ msgstr "Postavi budžete po grupama stavki za ovu teritoriju. Takođe možete uk
msgid "Set Landed Cost Based on Purchase Invoice Rate"
msgstr "Postavi ukupne troškove na osnovu cene ulazne fakture"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1130
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1139
msgid "Set Loyalty Program"
msgstr "Postavi program lojalnosti"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:312
msgid "Set New Release Date"
msgstr "Postavi novi datum izdavanja"
@@ -49254,7 +49325,7 @@ msgstr "Postavi lozinku"
msgid "Set Posting Date"
msgstr "Postavi datum knjiženja"
-#: erpnext/manufacturing/doctype/bom/bom.js:904
+#: erpnext/manufacturing/doctype/bom/bom.js:925
msgid "Set Process Loss Item Quantity"
msgstr "Postavi količinu stavki za gubitak u procesu"
@@ -49268,7 +49339,7 @@ msgstr "Postavi status projekta"
msgid "Set Project and all Tasks to status {0}?"
msgstr "Postavu projekat i sve zadatke u status {0}?"
-#: erpnext/manufacturing/doctype/bom/bom.js:905
+#: erpnext/manufacturing/doctype/bom/bom.js:926
msgid "Set Quantity"
msgstr "Postavi količinu"
@@ -49375,7 +49446,7 @@ msgstr "Postavi podrazumevani račun {0} za stavke van zaliha"
msgid "Set fieldname from which you want to fetch the data from the parent form."
msgstr "Postavite ime polja sa kojeg želite da preuzmete podatke iz matičnog obrasca."
-#: erpnext/manufacturing/doctype/bom/bom.js:894
+#: erpnext/manufacturing/doctype/bom/bom.js:915
msgid "Set quantity of process loss item:"
msgstr "Postavite količinu stavki za gubitak u procesu:"
@@ -49405,15 +49476,15 @@ msgstr "Postavite status ručno."
msgid "Set this if the customer is a Public Administration company."
msgstr "Postavi ovo ukoliko je kupac javno preduzeće."
-#: erpnext/assets/doctype/asset/asset.py:750
+#: erpnext/assets/doctype/asset/asset.py:766
msgid "Set {0} in asset category {1} for company {2}"
msgstr "Postavi {0} u kategoriju imovine {1} za kompaniju {2}"
-#: erpnext/assets/doctype/asset/asset.py:1083
+#: erpnext/assets/doctype/asset/asset.py:1099
msgid "Set {0} in asset category {1} or company {2}"
msgstr "Postavi {0} u kategoriju imovine {1} ili u kompaniju {2}"
-#: erpnext/assets/doctype/asset/asset.py:1080
+#: erpnext/assets/doctype/asset/asset.py:1096
msgid "Set {0} in company {1}"
msgstr "Postavi {0} u kompaniju {1}"
@@ -49480,7 +49551,7 @@ msgstr "Postavljanje računa kao račun kompanije je neophodno za bankarsko uskl
msgid "Setting up company"
msgstr "Postavljanje kompanije"
-#: erpnext/manufacturing/doctype/bom/bom.py:1051
+#: erpnext/manufacturing/doctype/bom/bom.py:1088
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr "Podešavanje {0} je neophodno"
@@ -49613,7 +49684,7 @@ msgid "Shift Name"
msgstr "Naziv promene"
#. Name of a DocType
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:243
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:249
#: erpnext/stock/doctype/shipment/shipment.json
msgid "Shipment"
msgstr "Pošiljka"
@@ -49664,7 +49735,7 @@ msgstr "Vrsta pošiljke"
msgid "Shipment details"
msgstr "Detalji isporuke"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:787
msgid "Shipments"
msgstr "Isporuke"
@@ -50350,7 +50421,7 @@ msgstr "Izvorni dokument"
msgid "Source Document Name"
msgstr "Naziv izvornog dokumenta"
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:478
msgid "Source Document No"
msgstr "Broj izvornog dokumenta"
@@ -50400,7 +50471,7 @@ msgstr "Vrsta izvora"
#. Label of the s_warehouse (Link) field in DocType 'Stock Entry Detail'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/manufacturing/doctype/bom/bom.js:403
+#: erpnext/manufacturing/doctype/bom/bom.js:424
#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
@@ -50428,7 +50499,7 @@ msgstr "Adresa izvornog skladišta"
msgid "Source Warehouse Address Link"
msgstr "Link za adresu izvornog skladišta"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1154
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr "Izvorno skladište je obavezno za stavku {0}."
@@ -50524,7 +50595,7 @@ msgstr "Podeli izdavanje"
msgid "Split Qty"
msgstr "Podeli količinu"
-#: erpnext/assets/doctype/asset/asset.py:1222
+#: erpnext/assets/doctype/asset/asset.py:1238
msgid "Split Quantity must be less than Asset Quantity"
msgstr "Podeljena količina mora biti manja od količine imovine"
@@ -50717,7 +50788,7 @@ msgstr "Početak brisanja"
msgid "Start Import"
msgstr "Početak uvoza"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:180
+#: erpnext/manufacturing/doctype/job_card/job_card.js:188
#: erpnext/manufacturing/doctype/workstation/workstation.js:124
msgid "Start Job"
msgstr "Pokreni zadatak"
@@ -51026,14 +51097,14 @@ msgstr "Svojstva stanja"
#: erpnext/setup/doctype/driver/driver.json
#: erpnext/setup/doctype/employee/employee.json
#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:323
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:358
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:329
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:364
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_trip/delivery_trip.json
#: erpnext/stock/doctype/material_request/material_request.json
#: erpnext/stock/doctype/pick_list/pick_list.json
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:276
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:305
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:283
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:312
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
#: erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
@@ -51112,8 +51183,8 @@ msgstr "Zalihe"
#: erpnext/accounts/doctype/account/account.json
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:50
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:73
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1337
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1363
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1339
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1365
#: erpnext/accounts/report/account_balance/account_balance.js:58
msgid "Stock Adjustment"
msgstr "Prilagođavanje zaliha"
@@ -51270,7 +51341,7 @@ msgstr "Stavka unosa zaliha"
msgid "Stock Entry Type"
msgstr "Vrsta unosa zaliha"
-#: erpnext/stock/doctype/pick_list/pick_list.py:1384
+#: erpnext/stock/doctype/pick_list/pick_list.py:1396
msgid "Stock Entry has been already created against this Pick List"
msgstr "Unos zaliha je već kreiran za ovu listu za odabir"
@@ -51504,14 +51575,14 @@ msgstr "Podešavanje ponovne obrade zaliha"
#: erpnext/stock/doctype/pick_list/pick_list.js:166
#: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12
#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:714
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:666
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1225
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1563
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1576
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1590
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1604
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1618
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1635
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:668
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1227
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1565
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1578
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1592
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1606
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1620
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1637
#: erpnext/stock/doctype/stock_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51520,13 +51591,13 @@ msgstr "Podešavanje ponovne obrade zaliha"
msgid "Stock Reservation"
msgstr "Rezervacija zaliha"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1746
msgid "Stock Reservation Entries Cancelled"
msgstr "Unosi rezervacije zaliha otkazani"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2156
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1698
msgid "Stock Reservation Entries Created"
msgstr "Unosi rezervacije zaliha kreirani"
@@ -51534,25 +51605,25 @@ msgstr "Unosi rezervacije zaliha kreirani"
#: erpnext/public/js/stock_reservation.js:308
#: erpnext/selling/doctype/sales_order/sales_order.js:444
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:352
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:354
#: erpnext/stock/report/reserved_stock/reserved_stock.js:53
#: erpnext/stock/report/reserved_stock/reserved_stock.py:171
msgid "Stock Reservation Entry"
msgstr "Unos rezervacije zaliha"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:528
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:530
msgid "Stock Reservation Entry cannot be updated as it has been delivered."
msgstr "Unos rezervacije zaliha ne može biti ažuriran jer su zalihe isporučene."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:522
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:524
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 "Unos rezervacije zaliha kreiran protiv liste za odabir ne može biti ažuriran. Ukoliko je potrebno da napravite promene, preporučujemo da otkažete postojeći unos i kreirate novi."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:549
msgid "Stock Reservation Warehouse Mismatch"
msgstr "Nepodudaranje skladišta za rezervaciju zaliha"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:675
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:677
msgid "Stock Reservation can only be created against {0}."
msgstr "Rezervacija zaliha može biti kreirana samo protiv {0}."
@@ -51587,7 +51658,7 @@ msgstr "Rezervisana količina zaliha (u jedinici mere zaliha)"
#. Label of a Link in the Stock Workspace
#: erpnext/setup/doctype/company/company.json
#: erpnext/setup/workspace/settings/settings.json
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:667
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:669
#: erpnext/stock/doctype/stock_settings/stock_settings.json
#: erpnext/stock/workspace/stock/stock.json
msgid "Stock Settings"
@@ -51793,11 +51864,11 @@ msgstr "Zalihe i proizvodnja"
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr "Zalihe ne mogu biti rezervisane u grupnom skladištu {0}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1510
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr "Zalihe ne mogu biti rezervisane u grupnom skladištu {0}."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:727
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:729
msgid "Stock cannot be updated against Purchase Receipt {0}"
msgstr "Zalihe se ne mogu ažurirati prema prijemnici nabavke {0}"
@@ -51809,11 +51880,11 @@ msgstr "Zalihe ne mogu biti ažurirane za sledeće otpremnice: {0}"
msgid "Stock cannot be updated because the invoice contains a drop shipping item. Please disable 'Update Stock' or remove the drop shipping item."
msgstr "Zalihe ne mogu biti ažurirane jer faktura ne sadrži stavku sa drop shipping-om. Molimo Vas da onemogućite 'Ažuriraj zalihe' ili uklonite stavke sa drop shipping-om."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1121
msgid "Stock has been unreserved for work order {0}."
msgstr "Poništeno je rezervisanje zaliha za radni nalog {0}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:323
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:325
msgid "Stock not available for Item {0} in Warehouse {1}."
msgstr "Zalihe nisu dostupne za stavku {0} u skladištu {1}."
@@ -52125,7 +52196,7 @@ msgstr "Uslužna stavka naloga za podugovaranje"
msgid "Subcontracting Order Supplied Item"
msgstr "Nabavljene stavke naloga za podugovaranje"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:943
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:965
msgid "Subcontracting Order {0} created."
msgstr "Nalog za podugovaranje {0} je kreiran."
@@ -52215,7 +52286,7 @@ msgstr "Naslov"
msgid "Submit"
msgstr "Podnesi"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:939
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:961
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:910
msgid "Submit Action Failed"
msgstr "Podnošenje radnje nije uspelo"
@@ -52666,7 +52737,7 @@ msgstr "Nabavljena količina"
#: erpnext/selling/doctype/customer/customer.js:230
#: erpnext/selling/doctype/party_specific_item/party_specific_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:160
-#: erpnext/selling/doctype/sales_order/sales_order.js:1231
+#: erpnext/selling/doctype/sales_order/sales_order.js:1235
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/doctype/sms_center/sms_center.json
#: erpnext/setup/workspace/home/home.json
@@ -52677,7 +52748,7 @@ msgstr "Nabavljena količina"
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
#: erpnext/stock/doctype/shipment/shipment.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:462
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:505
#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr "Dobavljač"
@@ -52802,7 +52873,7 @@ msgstr "Faktura dobavljača"
msgid "Supplier Invoice Date"
msgstr "Datum izdavanja fakture dobavljača"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1730
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1732
msgid "Supplier Invoice Date cannot be greater than Posting Date"
msgstr "Datum izdavanja fakture dobavljača ne može biti veći od datuma knjiženja"
@@ -52812,12 +52883,12 @@ msgstr "Datum izdavanja fakture dobavljača ne može biti veći od datuma knjiž
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:59
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/report/general_ledger/general_ledger.html:104
-#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/general_ledger/general_ledger.py:780
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr "Broj fakture dobavljača"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1757
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1759
msgid "Supplier Invoice No exists in Purchase Invoice {0}"
msgstr "Broj fakture dobavljača već postoji u ulaznoj fakturi {0}"
@@ -53045,7 +53116,7 @@ msgstr "Vrsta dobavljača"
#. 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:62
+#: erpnext/manufacturing/doctype/job_card/job_card.js:70
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
msgid "Supplier Warehouse"
msgstr "Skladište dobavljača"
@@ -53378,7 +53449,7 @@ msgstr "Iznos poreza odbijenog na izvoru"
msgid "TDS Computation Summary"
msgstr "Rezime obračuna poreza odbijenog na izvoru"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1514
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1516
msgid "TDS Deducted"
msgstr "Odbijen porez po odbitku na izvoru"
@@ -54233,7 +54304,7 @@ msgstr "Televizija"
msgid "Template"
msgstr "Šablon"
-#: erpnext/manufacturing/doctype/bom/bom.js:355
+#: erpnext/manufacturing/doctype/bom/bom.js:376
msgid "Template Item"
msgstr "Stavka šablona"
@@ -54469,7 +54540,7 @@ msgstr "Šablon uslova i odredbi"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:182
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:68
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:221
-#: erpnext/accounts/report/gross_profit/gross_profit.py:399
+#: erpnext/accounts/report/gross_profit/gross_profit.py:411
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js:8
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:21
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:263
@@ -54568,7 +54639,7 @@ msgstr "Pristup zahtevu za ponudu sa portala je onemogućeno. Da biste omogućil
msgid "The BOM which will be replaced"
msgstr "Sastavnica koja će biti zamenjena"
-#: erpnext/stock/serial_batch_bundle.py:1378
+#: erpnext/stock/serial_batch_bundle.py:1394
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr "Šarža {0} sadrži negativnu količinu {1} u skladištu {2}. Molimo Vas da ispravite količinu."
@@ -54683,7 +54754,7 @@ msgstr "Polje od vlasnika ne može biti prazno"
msgid "The field To Shareholder cannot be blank"
msgstr "Polje ka vlasniku ne može biti prazno"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:399
msgid "The field {0} in row {1} is not set"
msgstr "Polje {0} u redu {1} nije postavljeno"
@@ -54752,6 +54823,10 @@ msgstr "Radna kartica {0} je {1} i ne možete da je završite."
msgid "The job card {0} is in {1} state and you cannot start it again."
msgstr "Radna kartica {0} je {1} i ne možete ponovo da je započnete."
+#: erpnext/public/js/utils/barcode_scanner.js:533
+msgid "The last scanned warehouse has been cleared and won't be set in the subsequently scanned items"
+msgstr "Poslednje skenirano skladište je očišćeno i neće biti podešeno za stavke koje se budu skenirale naknadno"
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.py:46
msgid "The lowest tier must have a minimum spent amount of 0. Customers need to be part of a tier as soon as they are enrolled in the program."
msgstr "Najniži nivo mora imati minimalni iznos potrošnje od 0. Kupci moraju biti deo nivoa čim se prijave za program."
@@ -54830,7 +54905,7 @@ msgstr "Osnovni račun {0} mora biti grupa"
msgid "The selected BOMs are not for the same item"
msgstr "Izabrane sastavnice nisu za istu stavku"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:493
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:494
msgid "The selected change account {} doesn't belongs to Company {}."
msgstr "Izabrani račun za promene {} ne pripada kompaniji {}."
@@ -54964,7 +55039,7 @@ msgstr "{0} {1} se korsiti za izračunavanje vrednosti troškova za gotov proizv
msgid "Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc."
msgstr "Zatim se cenovna pravila filtriraju na osnovu kupca, grupe kupaca, teritorije, dobavljača, vrste dobavljača, kampanje, prodajnog partnera, itd."
-#: erpnext/assets/doctype/asset/asset.py:579
+#: erpnext/assets/doctype/asset/asset.py:595
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr "Postoje aktivna održavanja ili popravke za ovu imovinu. Morate ih završiti pre nego što otkažete imovinu."
@@ -55067,7 +55142,7 @@ msgstr "Ova stavka je varijanta {0} (Šablon)."
msgid "This Month's Summary"
msgstr "Rezime ovog meseca"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:952
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:974
msgid "This PO has been fully subcontracted."
msgstr "Ova nabavna porudžbina je u potpunosti podugovorena."
@@ -55091,7 +55166,7 @@ msgstr "Ova radnja će zaustaviti buduće naplate. Da li ste sigurni da želite
msgid "This action will unlink this account from any external service integrating ERPNext with your bank accounts. It cannot be undone. Are you certain ?"
msgstr "Ova radnja će poništiti povezivanje računa od bilo koje eskterne usluge koja povezuje ERPNext sa Vašim tekućim računom. Ova radnja se ne može povratiti. Da li ste sigurni?"
-#: erpnext/assets/doctype/asset/asset.py:359
+#: erpnext/assets/doctype/asset/asset.py:360
msgid "This asset category is marked as non-depreciable. Please disable depreciation calculation or choose a different category."
msgstr "Ova kategorija imovine je označena kao nepodložna amortizaciji. Omogućite obračun amortizacije ili izaberite drugu kategoriju."
@@ -55103,7 +55178,7 @@ msgstr "Ovo obuhvata sve tablice za ocenjivanje povezane sa ovim podešavanjem"
msgid "This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?"
msgstr "Ovaj dokument prelazi ograničenje za {0} {1} za stavku {4}. Da li pravite još jedan {3} za isti {2}?"
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:483
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:489
msgid "This field is used to set the 'Customer'."
msgstr "Ovo polje se koristi za postavljanje 'Kupca'."
@@ -55113,11 +55188,11 @@ msgstr "Ovo polje se koristi za postavljanje 'Kupca'."
msgid "This filter will be applied to Journal Entry."
msgstr "Ovaj filter će biti primenjen na nalog knjiženja."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:812
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:813
msgid "This invoice has already been paid."
msgstr "Ova faktura je već plaćena."
-#: erpnext/manufacturing/doctype/bom/bom.js:219
+#: erpnext/manufacturing/doctype/bom/bom.js:240
msgid "This is a Template BOM and will be used to make the work order for {0} of the item {1}"
msgstr "Ovo je šablon sastavnice i koristiće se za izradu radnog naloga {0} stavke {1}"
@@ -55190,7 +55265,7 @@ msgstr "Ovo se zasniva na transakcijama vezanim za ovog prodavca. Pogledajte vre
msgid "This is considered dangerous from accounting point of view."
msgstr "Ovo se smatra rizičnim sa računovodstvenog stanovišta."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:531
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:533
msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice"
msgstr "Ovo se radi kako bi se obradila računovodstvena evidencija u slučajevima kada je prijemnica nabavke kreirana nakon ulazne fakture"
@@ -55206,7 +55281,7 @@ msgstr "Ovo je za stavke sirovina koje će se koristiti za kreiranje gotovih pro
msgid "This item filter has already been applied for the {0}"
msgstr "Ovaj filter stavki je već primenjen za {0}"
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:496
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:502
msgid "This option can be checked to edit the 'Posting Date' and 'Posting Time' fields."
msgstr "Ova opcija može biti označena kako biste mogli da uređujete polja 'Datum knjiženja' i 'Vreme knjiženja'."
@@ -55242,7 +55317,7 @@ msgstr "Ovaj raspored je kreiran kada je imovina {0} vraćena putem izlazne fakt
msgid "This schedule was created when Asset {0} was scrapped."
msgstr "Ovaj raspored je kreiran kada je imovina {0} otpisana."
-#: erpnext/assets/doctype/asset/asset.py:1356
+#: erpnext/assets/doctype/asset/asset.py:1372
msgid "This schedule was created when Asset {0} was {1} into new Asset {2}."
msgstr "Ovaj raspored je kreiran kada je imovina {0} bila {1} u novu imovinu {2}."
@@ -55264,7 +55339,7 @@ msgstr "Ovaj raspored je kreiran kada je premeštaj imovine {0} prilagođen kroz
msgid "This section allows the user to set the Body and Closing text of the Dunning Letter for the Dunning Type based on language, which can be used in Print."
msgstr "Ovaj odeljak omogućava korisniku da postavi tekst i zaključak opomene za vrstu opomene na osnovu jezika, koji se može koristiti pri štampanju."
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:489
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:495
msgid "This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc."
msgstr "Ova tabela se koristi za postavljanje detalja o poljima 'Stavka', 'Količina', 'Osnovna cena', itd."
@@ -55464,7 +55539,7 @@ msgstr "Tajmer je prekoračio zadate časove."
#. Name of a DocType
#. Label of a Link in the Projects Workspace
#. Label of a shortcut in the Projects Workspace
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1014
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1023
#: erpnext/projects/doctype/timesheet/timesheet.json
#: erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py:26
#: erpnext/projects/report/timesheet_billing_summary/timesheet_billing_summary.py:59
@@ -55579,7 +55654,7 @@ msgstr "Naslov"
#. Label of the to_uom (Link) field in DocType 'UOM Conversion Factor'
#. Label of the to (Data) field in DocType 'Call Log'
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1046
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1055
#: erpnext/setup/doctype/uom_conversion_factor/uom_conversion_factor.json
#: erpnext/telephony/doctype/call_log/call_log.json
#: erpnext/templates/pages/projects.html:68
@@ -55950,7 +56025,7 @@ msgstr "U skladište"
msgid "To Warehouse (Optional)"
msgstr "U skladište (opciono)"
-#: erpnext/manufacturing/doctype/bom/bom.js:872
+#: erpnext/manufacturing/doctype/bom/bom.js:893
msgid "To add Operations tick the 'With Operations' checkbox."
msgstr "Da biste dodali operacije, označite polje 'Sa operacijama'."
@@ -56025,11 +56100,11 @@ msgstr "Da biste ovo poništili, omogućite '{0}' u kompaniji {1}"
msgid "To still proceed with editing this Attribute Value, enable {0} in Item Variant Settings."
msgstr "Da biste nastavili sa uređivanjem ove vrednosti atributa, omogućite {0} u podešavanjima varijanti stavke."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:621
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:623
msgid "To submit the invoice without purchase order please set {0} as {1} in {2}"
msgstr "Da biste podneli fakturu bez nabavne porudžbine, postavite {0} kao {1} u {2}"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:642
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:644
msgid "To submit the invoice without purchase receipt please set {0} as {1} in {2}"
msgstr "Da biste podneli fakturu bez prijemnica nabavke, molimo Vas da postavite {0} kao {1} u {2}"
@@ -56039,7 +56114,7 @@ msgid "To use a different finance book, please uncheck 'Include Default FB Asset
msgstr "Da biste koristili drugu finansijsku evidenciju, poništite označavanje opcije 'Uključi podrazumevanu imovinu u finansijskim evidencijama'"
#: erpnext/accounts/report/financial_statements.py:603
-#: erpnext/accounts/report/general_ledger/general_ledger.py:304
+#: erpnext/accounts/report/general_ledger/general_ledger.py:310
#: erpnext/accounts/report/trial_balance/trial_balance.py:292
msgid "To use a different finance book, please uncheck 'Include Default FB Entries'"
msgstr "Da biste koristili drugu finansijsku knjigu, poništite označavanje opcije 'Uključi podrazumevane unose u finansijskim evidencijama'"
@@ -56133,7 +56208,7 @@ msgstr "Torr"
#: erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py:229
#: erpnext/accounts/report/financial_statements.py:699
#: erpnext/accounts/report/general_ledger/general_ledger.html:132
-#: erpnext/accounts/report/general_ledger/general_ledger.py:378
+#: erpnext/accounts/report/general_ledger/general_ledger.py:398
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:699
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:93
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:98
@@ -56942,7 +57017,7 @@ msgstr "Ukupni procenat doprinosa treba biti 100"
msgid "Total hours: {0}"
msgstr "Ukupno sati: {0}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:523
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:524
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:536
msgid "Total payments amount can't be greater than {}"
msgstr "Ukupan iznos za plaćanje ne može biti veći od {}"
@@ -57602,7 +57677,7 @@ msgstr "UAE VAT Settings"
#: erpnext/quality_management/doctype/quality_review_objective/quality_review_objective.json
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
#: erpnext/selling/doctype/quotation_item/quotation_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1225
+#: erpnext/selling/doctype/sales_order/sales_order.js:1228
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:43
#: erpnext/selling/report/sales_analytics/sales_analytics.py:138
@@ -57676,7 +57751,7 @@ msgstr "Detalji konverzije jedinice mere"
msgid "UOM Conversion Factor"
msgstr "Faktor konverzije jedinice mere"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1387
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1404
msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}"
msgstr "Faktor konverzije jedinice mere ({0} -> {1}) nije pronađen za stavku: {2}"
@@ -58060,11 +58135,11 @@ msgstr "Predstojeći događaji u kalendaru "
#: erpnext/accounts/doctype/account/account.js:204
#: erpnext/accounts/doctype/cost_center/cost_center.js:107
-#: erpnext/manufacturing/doctype/job_card/job_card.js:338
-#: erpnext/manufacturing/doctype/job_card/job_card.js:407
+#: erpnext/manufacturing/doctype/job_card/job_card.js:346
+#: erpnext/manufacturing/doctype/job_card/job_card.js:415
#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:500
#: erpnext/public/js/utils.js:608 erpnext/public/js/utils.js:912
-#: erpnext/public/js/utils/barcode_scanner.js:183
+#: erpnext/public/js/utils/barcode_scanner.js:209
#: erpnext/public/js/utils/serial_no_batch_selector.js:17
#: erpnext/public/js/utils/serial_no_batch_selector.js:191
#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js:179
@@ -58165,7 +58240,7 @@ msgstr "Ažuriraj trošak utrošenog materijala u projektu"
#. Option for the 'Update Type' (Select) field in DocType 'BOM Update Log'
#. Label of the update_cost_section (Section Break) field in DocType 'BOM
#. Update Tool'
-#: erpnext/manufacturing/doctype/bom/bom.js:135
+#: erpnext/manufacturing/doctype/bom/bom.js:156
#: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.json
#: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json
msgid "Update Cost"
@@ -58259,7 +58334,7 @@ msgstr "Ažuriraj učestalost projekta"
msgid "Update latest price in all BOMs"
msgstr "Ažuriraj najnoviju cenu u svim sastavnicama"
-#: erpnext/assets/doctype/asset/asset.py:401
+#: erpnext/assets/doctype/asset/asset.py:402
msgid "Update stock must be enabled for the purchase invoice {0}"
msgstr "Morate omogućiti ažuriranje zaliha za ulaznu fakturu {0}"
@@ -58275,7 +58350,7 @@ msgstr "Ažuriraj modifikovani vremenski žig za nove komunikacije primljene kod
msgid "Update timestamp on new communication"
msgstr "Ažuriraj vremenski žig za nove komunikacije"
-#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:534
+#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:539
msgid "Updated successfully"
msgstr "Ažuriranje uspešno"
@@ -58383,7 +58458,7 @@ msgstr "Koristi ponovnu obradu na osnovu stavki"
#. Label of the use_multi_level_bom (Check) field in DocType 'Work Order'
#. Label of the use_multi_level_bom (Check) field in DocType 'Stock Entry'
-#: erpnext/manufacturing/doctype/bom/bom.js:337
+#: erpnext/manufacturing/doctype/bom/bom.js:358
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Use Multi-Level BOM"
@@ -58713,7 +58788,7 @@ msgstr "Polja za datum početka važenja i datum završetka važenja su obavezna
msgid "Valid till Date cannot be before Transaction Date"
msgstr "Datum završetka važenja ne može biti pre datuma transakcije"
-#: erpnext/selling/doctype/quotation/quotation.py:154
+#: erpnext/selling/doctype/quotation/quotation.py:156
msgid "Valid till date cannot be before transaction date"
msgstr "Datum završetka važenja ne može biti pre datuma transakcije"
@@ -58775,7 +58850,7 @@ msgstr "Punovažnost i upotreba"
msgid "Validity in Days"
msgstr "Punovažnost u danima"
-#: erpnext/selling/doctype/quotation/quotation.py:361
+#: erpnext/selling/doctype/quotation/quotation.py:363
msgid "Validity period of this quotation has ended."
msgstr "Period punovažnosti ove ponude je istekao."
@@ -58824,7 +58899,7 @@ msgstr "Metod vrednovanja"
#. Label of the valuation_rate (Currency) field in DocType 'Stock
#. Reconciliation Item'
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:323
+#: erpnext/accounts/report/gross_profit/gross_profit.py:329
#: erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
#: erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json
#: erpnext/manufacturing/doctype/bom/bom.json
@@ -59053,7 +59128,7 @@ msgstr "Greška atributa varijante"
msgid "Variant Attributes"
msgstr "Atributi varijante"
-#: erpnext/manufacturing/doctype/bom/bom.js:176
+#: erpnext/manufacturing/doctype/bom/bom.js:197
msgid "Variant BOM"
msgstr "Varijanta sastavnice"
@@ -59075,8 +59150,8 @@ msgstr "Izveštaj o detaljima varijante"
msgid "Variant Field"
msgstr "Polje varijante"
-#: erpnext/manufacturing/doctype/bom/bom.js:291
-#: erpnext/manufacturing/doctype/bom/bom.js:370
+#: erpnext/manufacturing/doctype/bom/bom.js:312
+#: erpnext/manufacturing/doctype/bom/bom.js:391
msgid "Variant Item"
msgstr "Stavka varijante"
@@ -59210,7 +59285,7 @@ msgstr "Video podešavanje"
#: erpnext/accounts/doctype/cost_center/cost_center_tree.js:56
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js:205
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:76
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:14
#: erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:24
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:167
@@ -59234,8 +59309,8 @@ msgstr "Video podešavanje"
#: erpnext/stock/doctype/item/item.js:142
#: erpnext/stock/doctype/item/item.js:150
#: erpnext/stock/doctype/item/item.js:158
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:228
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:239
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:232
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:243
#: erpnext/stock/doctype/stock_entry/stock_entry.js:297
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:46
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:62
@@ -59263,7 +59338,7 @@ msgstr "Prikaz glavne knjige"
msgid "View Leads"
msgstr "Prikaz potencijalnih klijenata"
-#: erpnext/accounts/doctype/account/account_tree.js:275
+#: erpnext/accounts/doctype/account/account_tree.js:270
#: erpnext/stock/doctype/batch/batch.js:18
msgid "View Ledger"
msgstr "Prikaz dnevnika"
@@ -59401,7 +59476,7 @@ msgstr "Naziv dokumenta"
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:209
#: erpnext/accounts/report/general_ledger/general_ledger.js:49
-#: erpnext/accounts/report/general_ledger/general_ledger.py:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:735
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js:41
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:33
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:65
@@ -59440,7 +59515,7 @@ msgstr "Količina u dokumentu"
#. Label of the voucher_subtype (Small Text) field in DocType 'GL Entry'
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:729
msgid "Voucher Subtype"
msgstr "Podvrsta dokumenta"
@@ -59472,7 +59547,7 @@ msgstr "Podvrsta dokumenta"
#: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1184
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:200
-#: erpnext/accounts/report/general_ledger/general_ledger.py:707
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
@@ -59493,7 +59568,7 @@ msgstr "Podvrsta dokumenta"
#: erpnext/stock/report/reserved_stock/reserved_stock.py:145
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:40
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:107
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:429
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:472
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:27
#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:114
#: erpnext/stock/report/stock_ledger/stock_ledger.py:320
@@ -59627,7 +59702,7 @@ msgstr "Lice koje je došlo bez prethodnog zakazivanja"
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/gross_profit/gross_profit.js:56
-#: erpnext/accounts/report/gross_profit/gross_profit.py:308
+#: erpnext/accounts/report/gross_profit/gross_profit.py:314
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:41
#: erpnext/accounts/report/purchase_register/purchase_register.js:52
#: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py:28
@@ -59677,7 +59752,7 @@ msgstr "Lice koje je došlo bez prethodnog zakazivanja"
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:350
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:352
#: erpnext/stock/doctype/warehouse/warehouse.json
#: erpnext/stock/page/stock_balance/stock_balance.js:11
#: erpnext/stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:25
@@ -59703,7 +59778,7 @@ msgstr "Lice koje je došlo bez prethodnog zakazivanja"
#: erpnext/stock/report/reserved_stock/reserved_stock.py:96
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:34
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:138
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:442
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:485
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:21
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:47
#: erpnext/stock/report/stock_ageing/stock_ageing.js:30
@@ -59825,7 +59900,7 @@ msgid "Warehouse not found against the account {0}"
msgstr "Skladište nije pronađeno za račun {0}"
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1160
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:426
msgid "Warehouse required for stock Item {0}"
msgstr "Skladište je obavezno za stavku zaliha {0}"
@@ -60014,6 +60089,10 @@ msgstr "Status garancije / godišnjeg ugovora o održavanju"
msgid "Warranty Claim"
msgstr "Reklamacija po osnovu garancije"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:525
+msgid "Warranty Expiry (Serial)"
+msgstr "Istek garancije (serija)"
+
#. Label of the warranty_expiry_date (Date) field in DocType 'Serial No'
#. Label of the warranty_expiry_date (Date) field in DocType 'Warranty Claim'
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -60437,7 +60516,7 @@ msgstr "Skladište nedovršene proizvodnje"
#. Entry'
#. Option for the 'From Voucher Type' (Select) field in DocType 'Stock
#. Reservation Entry'
-#: erpnext/manufacturing/doctype/bom/bom.js:167
+#: erpnext/manufacturing/doctype/bom/bom.js:188
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
@@ -60459,7 +60538,7 @@ msgstr "Skladište nedovršene proizvodnje"
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:455
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:498
#: erpnext/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr "Radni nalog"
@@ -60523,7 +60602,7 @@ msgstr "Radni nalog se ne može kreirati iz stavke šablona"
msgid "Work Order has been {0}"
msgstr "Radni nalog je {0}"
-#: erpnext/selling/doctype/sales_order/sales_order.js:823
+#: erpnext/selling/doctype/sales_order/sales_order.js:826
msgid "Work Order not created"
msgstr "Radni nalog nije kreiran"
@@ -60536,7 +60615,7 @@ msgstr "Radni nalog: {0} radna kartica nije pronađena za operaciju {1}"
msgid "Work Orders"
msgstr "Radni nalozi"
-#: erpnext/selling/doctype/sales_order/sales_order.js:908
+#: erpnext/selling/doctype/sales_order/sales_order.js:911
msgid "Work Orders Created: {0}"
msgstr "Kreirani radni nalozi: {0}"
@@ -60976,7 +61055,7 @@ msgid "You can only have Plans with the same billing cycle in a Subscription"
msgstr "Mоžete imati samo planove sa istim ciklusom naplate u pretplati"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:412
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:876
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:885
msgid "You can only redeem max {0} points in this order."
msgstr "Možete iskoristiti maksimalno {0} poena u ovoj naruždbini."
@@ -61004,7 +61083,7 @@ msgstr "Ne možete obraditi broj serije {0} jer je već korišćen u SABB {1}. {
msgid "You can't redeem Loyalty Points having more value than the Total Amount."
msgstr "Ne možete iskoristiti poene lojalnosti u vrednosti većoj od ukupnog iznosa."
-#: erpnext/manufacturing/doctype/bom/bom.js:653
+#: erpnext/manufacturing/doctype/bom/bom.js:674
msgid "You cannot change the rate if BOM is mentioned against any Item."
msgstr "Ne možete promeniti cenu ukoliko je sastavnica navedena za bilo koju stavku."
@@ -61104,7 +61183,7 @@ msgstr "Još uvek niste kerirali {0}"
msgid "You must select a customer before adding an item."
msgstr "Morate da izaberete kupca pre nego što dodate stavku."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:267
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:268
msgid "You need to cancel POS Closing Entry {} to be able to cancel this document."
msgstr "Morate otkazati unos zatvaranja maloprodaje {} da biste mogli da otkažete ovaj dokument."
@@ -61201,7 +61280,7 @@ msgstr "kao opis"
msgid "as Title"
msgstr "kao naslov"
-#: erpnext/manufacturing/doctype/bom/bom.js:896
+#: erpnext/manufacturing/doctype/bom/bom.js:917
msgid "as a percentage of finished item quantity"
msgstr "kao procenat količine finalne stavke"
@@ -61221,7 +61300,7 @@ msgstr "od {}"
msgid "cannot be greater than 100"
msgstr "ne može biti veće od 100"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:331
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:333
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1046
msgid "dated {0}"
msgstr "datirano {0}"
@@ -61594,7 +61673,7 @@ msgstr "Račun {0} ne pripada kompaniji {1}"
msgid "{0} account is not of type {1}"
msgstr "{0} račun nije vrsta {1}"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:496
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:498
msgid "{0} account not found while submitting purchase receipt"
msgstr "{0} nalog nije pronađen prilikom podnošenja prijemnice nabavke"
@@ -61618,7 +61697,7 @@ msgstr "{0} prema prodajnoj porudžbini {1}"
msgid "{0} already has a Parent Procedure {1}."
msgstr "{0} već ima matičnu proceduru {1}."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:544
msgid "{0} and {1}"
msgstr "{0} i {1}"
@@ -61789,6 +61868,10 @@ msgstr "{0} je otvoren. Zatvorite maloprodaju ili otkažite postojeći unos poč
msgid "{0} is required"
msgstr "{0} je obavezan"
+#: erpnext/assets/doctype/asset/asset.py:431
+msgid "{0} is still in Draft. Please submit it before saving the Asset."
+msgstr "{0} je i dalje u nacrtu. Molimo Vas da ga podnesete pre nego što sačuvate imovinu."
+
#: erpnext/manufacturing/doctype/work_order/work_order.js:454
msgid "{0} items in progress"
msgstr "{0} stavki u obradi"
@@ -61874,6 +61957,10 @@ msgstr "{0} varijanti je kreirano."
msgid "{0} will be given as discount."
msgstr "{0} će biti dato kao popust."
+#: erpnext/public/js/utils/barcode_scanner.js:523
+msgid "{0} will be set as the {1} in subsequently scanned items"
+msgstr "{0} će biti podešeno kao {1} pri naknadnom skeniranju stavki"
+
#: erpnext/manufacturing/doctype/job_card/job_card.py:883
msgid "{0} {1}"
msgstr "{0} {1}"
@@ -61886,7 +61973,7 @@ msgstr "{0} {1} ručno"
msgid "{0} {1} Partially Reconciled"
msgstr "{0} {1} delimično usklađeno"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:516
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:518
msgid "{0} {1} cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr "{0} {1} ne može biti ažurirano. Ukoliko je potrebno napraviti izmene, preporučuje se da otkažete postojeći unos i kreirate novi."
diff --git a/erpnext/locale/sv.po b/erpnext/locale/sv.po
index 070dd618654..555b8d036c0 100644
--- a/erpnext/locale/sv.po
+++ b/erpnext/locale/sv.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: frappe\n"
"Report-Msgid-Bugs-To: hello@frappe.io\n"
-"POT-Creation-Date: 2025-08-10 09:37+0000\n"
-"PO-Revision-Date: 2025-08-13 17:31\n"
+"POT-Creation-Date: 2025-08-17 09:36+0000\n"
+"PO-Revision-Date: 2025-08-17 18:14\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Swedish\n"
"MIME-Version: 1.0\n"
@@ -143,7 +143,7 @@ msgstr "% Klar"
msgid "% Delivered"
msgstr "% Levererad"
-#: erpnext/manufacturing/doctype/bom/bom.js:892
+#: erpnext/manufacturing/doctype/bom/bom.js:913
#, python-format
msgid "% Finished Item Quantity"
msgstr "% Färdig Artikel Kvantitet"
@@ -1092,6 +1092,10 @@ msgstr "AB-"
msgid "ACC-PINV-.YYYY.-"
msgstr "ACC-PINV-.YYYY.-"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:531
+msgid "AMC Expiry (Serial)"
+msgstr "Service Avtal Utgång Datum (Serienummer)"
+
#. Label of the amc_expiry_date (Date) field in DocType 'Serial No'
#. Label of the amc_expiry_date (Date) field in DocType 'Warranty Claim'
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -1319,7 +1323,7 @@ msgstr "Enligt stycklista {0} saknas artikel '{1}' i lager post."
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:30
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:190
#: erpnext/accounts/report/general_ledger/general_ledger.js:38
-#: erpnext/accounts/report/general_ledger/general_ledger.py:652
+#: erpnext/accounts/report/general_ledger/general_ledger.py:672
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js:30
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:30
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
@@ -1530,7 +1534,7 @@ msgstr "Konto erfordras att hämta Betalning Poster"
msgid "Account is not set for the dashboard chart {0}"
msgstr "Konto är inte angiven för Översikt Panel Diagram {0}"
-#: erpnext/assets/doctype/asset/asset.py:755
+#: erpnext/assets/doctype/asset/asset.py:771
msgid "Account not Found"
msgstr "Konto ej funnen"
@@ -1912,8 +1916,8 @@ msgstr "Bokföring Dimension Filter"
msgid "Accounting Entries"
msgstr "Bokföring Poster"
-#: erpnext/assets/doctype/asset/asset.py:789
-#: erpnext/assets/doctype/asset/asset.py:804
+#: erpnext/assets/doctype/asset/asset.py:805
+#: erpnext/assets/doctype/asset/asset.py:820
#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:559
msgid "Accounting Entry for Asset"
msgstr "Bokföring Post för Tillgång"
@@ -1927,29 +1931,29 @@ msgstr "Bokföring Post för Landad Kostnad Verifikat i Lager Post {0}"
msgid "Accounting Entry for Landed Cost Voucher for SCR {0}"
msgstr "Bokföring Post för Landad Kostnad Verifikat för Underleverantör Följesedel {0}"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:814
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:816
msgid "Accounting Entry for Service"
msgstr "Bokföring Post för Service"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:999
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1020
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1038
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1059
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1080
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1104
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1211
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1447
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1469
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1001
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1022
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1040
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1061
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1082
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1106
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1213
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1449
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1471
#: erpnext/controllers/stock_controller.py:579
#: erpnext/controllers/stock_controller.py:596
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:909
#: erpnext/stock/doctype/stock_entry/stock_entry.py:1627
#: erpnext/stock/doctype/stock_entry/stock_entry.py:1641
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:613
msgid "Accounting Entry for Stock"
msgstr "Bokföring Post för Lager"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:716
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:718
msgid "Accounting Entry for {0}"
msgstr "Bokföring Post för {0}"
@@ -2492,9 +2496,9 @@ msgstr "Åtgärd på Ny Faktura"
#: erpnext/buying/doctype/supplier/supplier.js:128
#: erpnext/buying/doctype/supplier/supplier.js:137
#: erpnext/buying/doctype/supplier_scorecard_scoring_standing/supplier_scorecard_scoring_standing.json
-#: erpnext/manufacturing/doctype/bom/bom.js:139
-#: erpnext/manufacturing/doctype/bom/bom.js:150
-#: erpnext/manufacturing/doctype/bom/bom.js:161
+#: erpnext/manufacturing/doctype/bom/bom.js:160
+#: erpnext/manufacturing/doctype/bom/bom.js:171
+#: erpnext/manufacturing/doctype/bom/bom.js:182
#: erpnext/projects/doctype/project/project.js:87
#: erpnext/projects/doctype/project/project.js:95
#: erpnext/projects/doctype/project/project.js:151
@@ -2783,7 +2787,7 @@ msgstr "Faktisk Moms/Avgift kan inte inkluderas i Artikel Pris på rad {0}"
#: erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json
#: erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
#: erpnext/crm/doctype/lead/lead.js:85
-#: erpnext/manufacturing/doctype/bom/bom.js:922
+#: erpnext/manufacturing/doctype/bom/bom.js:943
#: erpnext/manufacturing/doctype/plant_floor/stock_summary_template.html:55
#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:235
#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:264
@@ -2800,7 +2804,7 @@ msgstr "Lägg till"
msgid "Add / Edit Prices"
msgstr "Lägg till / Ändra Priser"
-#: erpnext/accounts/doctype/account/account_tree.js:252
+#: erpnext/accounts/doctype/account/account_tree.js:248
msgid "Add Child"
msgstr "Lägg till Underval"
@@ -2896,7 +2900,7 @@ msgid "Add Quote"
msgstr "Lägg till Offert"
#. Label of the add_raw_materials (Button) field in DocType 'BOM Operation'
-#: erpnext/manufacturing/doctype/bom/bom.js:920
+#: erpnext/manufacturing/doctype/bom/bom.js:941
#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
msgid "Add Raw Materials"
msgstr "Lägg till Råmaterial"
@@ -3473,11 +3477,11 @@ msgstr "Adress som används för att bestämma Moms Kategori i Transaktioner"
msgid "Adjust Asset Value"
msgstr "Justera Tillgång Värde"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1078
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1087
msgid "Adjustment Against"
msgstr "Justering Mot"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:644
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:646
msgid "Adjustment based on Purchase Invoice rate"
msgstr "Justering Baserad på Inköp Faktura Pris"
@@ -3667,7 +3671,7 @@ msgstr "Mot "
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
#: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:39
#: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:91
-#: erpnext/accounts/report/general_ledger/general_ledger.py:721
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Account"
msgstr "Mot Konto"
@@ -3686,7 +3690,7 @@ msgstr "Mot Avtal Order"
msgid "Against Customer Order {0}"
msgstr "Mot Kund Order {0}"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1191
+#: erpnext/selling/doctype/sales_order/sales_order.js:1194
msgid "Against Default Supplier"
msgstr "Mot Standard Leverantör"
@@ -3778,13 +3782,13 @@ msgstr "Mot Försäljning Order Artikel"
msgid "Against Stock Entry"
msgstr "Mot Lager Post"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:329
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:331
msgid "Against Supplier Invoice {0}"
msgstr "Mot Leverantör Faktura {0}"
#. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry'
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:741
+#: erpnext/accounts/report/general_ledger/general_ledger.py:774
msgid "Against Voucher"
msgstr "Mot Verifikat"
@@ -3808,7 +3812,7 @@ msgstr "Mot Verifikat Nummer"
#: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/general_ledger/general_ledger.py:772
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr "Mot Verifikat Typ"
@@ -4099,11 +4103,11 @@ msgstr "All kommunikation inklusive och ovanför detta ska flyttas till ny Ären
msgid "All items are already requested"
msgstr "Alla artiklar är redan efterfrågade"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1335
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1342
msgid "All items have already been Invoiced/Returned"
msgstr "Alla Artiklar är redan Fakturerade / Återlämnade"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1196
msgid "All items have already been received"
msgstr "Alla Artiklar är redan mottagna"
@@ -4129,7 +4133,7 @@ msgstr "Alla artiklar är redan returnerade."
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 "Alla nödvändiga artiklar (råmaterial) kommer att hämtas från stycklista och läggs till denna tabell. Här kan du också ändra hämtlager för valfri artikel. Och under produktion kan du spåra överförd råmaterial från denna tabell."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:847
msgid "All these items have already been Invoiced/Returned"
msgstr "Alla Artiklar är redan Fakturerade / Återlämnade"
@@ -4194,7 +4198,7 @@ msgstr "Tilldelad"
#: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json
#: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
#: erpnext/accounts/doctype/unreconcile_payment_entries/unreconcile_payment_entries.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:378
+#: erpnext/accounts/report/gross_profit/gross_profit.py:384
#: erpnext/public/js/utils/unreconcile.js:87
msgid "Allocated Amount"
msgstr "Tilldelad Belopp"
@@ -4676,7 +4680,7 @@ msgstr "Standard i Kassa Profil {0} för Användare {1} redan angiven. Inaktiver
msgid "Also you can't switch back to FIFO after setting the valuation method to Moving Average for this item."
msgstr "Du kan inte byta tillbaka till FIFO efter att ha angivit värdering sätt till MA för denna artikel."
-#: erpnext/manufacturing/doctype/bom/bom.js:200
+#: erpnext/manufacturing/doctype/bom/bom.js:221
#: erpnext/manufacturing/doctype/work_order/work_order.js:151
#: erpnext/manufacturing/doctype/work_order/work_order.js:166
#: erpnext/public/js/utils.js:518
@@ -5772,11 +5776,11 @@ msgstr "Eftersom det finns negativ lager kan du inte aktivera {0}."
msgid "As there are reserved stock, you cannot disable {0}."
msgstr "Eftersom det finns reserverat lager kan du inte inaktivera {0}."
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1031
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1046
msgid "As there are sufficient Sub Assembly Items, Work Order is not required for Warehouse {0}."
msgstr "Eftersom det finns tillräckligt med Underenhet Artiklar erfordras inte Arbetsorder för Lager {0}."
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1743
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1760
msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}."
msgstr "Eftersom det finns tillräckligt med Råmaterial erfordras inte Material Begäran för Lager {0}."
@@ -5826,7 +5830,7 @@ msgstr "Montering Artiklar"
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/workspace/assets/assets.json
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:221
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:225
#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Asset"
msgstr "Tillgång"
@@ -5944,7 +5948,7 @@ msgstr "Tillgång Avskrivning Schema {0} för Tillgång {1} finns redan."
msgid "Asset Depreciation Schedule {0} for Asset {1} and Finance Book {2} already exists."
msgstr "Tillgång Avskrivning Schema {0} för Tillgång {1} och Finans Register {2} finns redan."
-#: erpnext/assets/doctype/asset/asset.py:176
+#: erpnext/assets/doctype/asset/asset.py:177
msgid "Asset Depreciation Schedules created/updated:
{0}
Please check, edit if needed, and submit the Asset."
msgstr "Avskrivning Schema för Tillgångar skapad/uppdaterad:
{0}
Kontrollera, redigera vid behov och godkänn tillgång."
@@ -6017,7 +6021,7 @@ msgstr "Tillgång Service Team"
#. Label of a Link in the Assets Workspace
#: erpnext/assets/doctype/asset_movement/asset_movement.json
#: erpnext/assets/workspace/assets/assets.json
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:232
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:236
msgid "Asset Movement"
msgstr "Tillgång Förändring"
@@ -6026,7 +6030,7 @@ msgstr "Tillgång Förändring"
msgid "Asset Movement Item"
msgstr "Tillgång Förändring Artikel"
-#: erpnext/assets/doctype/asset/asset.py:1035
+#: erpnext/assets/doctype/asset/asset.py:1051
msgid "Asset Movement record {0} created"
msgstr "Tillgång Förändring Post {0} skapad"
@@ -6155,11 +6159,11 @@ msgstr "Tillgång Värde Justering kan inte bokföras före illgång inköpdatum
msgid "Asset Value Analytics"
msgstr "Tillgång Värde Analys"
-#: erpnext/assets/doctype/asset/asset.py:208
+#: erpnext/assets/doctype/asset/asset.py:209
msgid "Asset cancelled"
msgstr "Tillgång Annullerad"
-#: erpnext/assets/doctype/asset/asset.py:584
+#: erpnext/assets/doctype/asset/asset.py:600
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr "Tillgång kan inte annulleras, eftersom det redan är {0}"
@@ -6171,15 +6175,15 @@ msgstr "Tillgång kan inte skrotas före senaste avskrivning post."
msgid "Asset capitalized after Asset Capitalization {0} was submitted"
msgstr "Tillgång aktiverad efter att Tillgång Aktivering {0} godkändes"
-#: erpnext/assets/doctype/asset/asset.py:217
+#: erpnext/assets/doctype/asset/asset.py:218
msgid "Asset created"
msgstr "Tillgång Skapad"
-#: erpnext/assets/doctype/asset/asset.py:1275
+#: erpnext/assets/doctype/asset/asset.py:1291
msgid "Asset created after being split from Asset {0}"
msgstr "Tillgång skapad efter att ha delats från Tillgång {0}"
-#: erpnext/assets/doctype/asset/asset.py:220
+#: erpnext/assets/doctype/asset/asset.py:221
msgid "Asset deleted"
msgstr "Tillgång Borttagen"
@@ -6220,7 +6224,7 @@ msgstr "Tillgång skrotad via Journal Post {0}"
msgid "Asset sold"
msgstr "Tillgång Såld"
-#: erpnext/assets/doctype/asset/asset.py:195
+#: erpnext/assets/doctype/asset/asset.py:196
msgid "Asset submitted"
msgstr "Tillgång Godkänd"
@@ -6228,7 +6232,7 @@ msgstr "Tillgång Godkänd"
msgid "Asset transferred to Location {0}"
msgstr "Tillgång överförd till Plats {0}"
-#: erpnext/assets/doctype/asset/asset.py:1284
+#: erpnext/assets/doctype/asset/asset.py:1300
msgid "Asset updated after being split into Asset {0}"
msgstr "Tillgång uppdaterad efter att ha delats upp i Tillgång {0}"
@@ -6319,7 +6323,7 @@ msgstr "Tillgångar har inte skapats för {item_code}. Skapa Tillgång manuellt.
msgid "Assets {assets_link} created for {item_code}"
msgstr "Tillgångar {assets_link} skapade för {item_code}"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:193
+#: erpnext/manufacturing/doctype/job_card/job_card.js:201
msgid "Assign Job to Employee"
msgstr "Tilldela jobb till Personal"
@@ -6369,11 +6373,11 @@ msgstr "På rad #{0}: Plockad kvantitet {1} för artikel {2} är större än til
msgid "At least one account with exchange gain or loss is required"
msgstr "Minst ett konto med Valutaväxling Resultat erfordras"
-#: erpnext/assets/doctype/asset/asset.py:1141
+#: erpnext/assets/doctype/asset/asset.py:1157
msgid "At least one asset has to be selected."
msgstr "Minst en Tillgång måste väljas."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:930
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:965
msgid "At least one invoice has to be selected."
msgstr "Minst en Faktura måste väljas"
@@ -6381,7 +6385,7 @@ msgstr "Minst en Faktura måste väljas"
msgid "At least one item should be entered with negative quantity in return document"
msgstr "Minst en artikel ska anges med negativ kvantitet i Retur Dokument"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:484
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:485
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:540
msgid "At least one mode of payment is required for POS invoice."
msgstr "Åtminstone ett Betalning Sätt erfordras för Kassa Faktura."
@@ -6931,7 +6935,7 @@ msgstr "Tillgängligt Lager"
msgid "Available Stock for Packing Items"
msgstr "Tillgängligt Lager för Artikel Paket"
-#: erpnext/assets/doctype/asset/asset.py:313
+#: erpnext/assets/doctype/asset/asset.py:314
msgid "Available for use date is required"
msgstr "Tillgängligt för Användning Datum erfordras"
@@ -6948,7 +6952,7 @@ msgstr "Tillgänglig {0}"
msgid "Available-for-use Date"
msgstr "Tillgängligt för Användning Datum"
-#: erpnext/assets/doctype/asset/asset.py:418
+#: erpnext/assets/doctype/asset/asset.py:419
msgid "Available-for-use Date should be after purchase date"
msgstr "Tillgängligt för Användning Datum ska vara senare än Inköp Datum"
@@ -7003,7 +7007,7 @@ msgstr "Genomsnitt Pris på Inköp Prislista"
msgid "Avg. Selling Price List Rate"
msgstr "Genomsnitt Pris på Försäljning Prislista"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:316
+#: erpnext/accounts/report/gross_profit/gross_profit.py:322
msgid "Avg. Selling Rate"
msgstr "Genomsnitt Försäljning Pris"
@@ -7058,7 +7062,7 @@ msgstr "Lager Kvantitet"
#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js:5
#: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:109
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1005
+#: erpnext/selling/doctype/sales_order/sales_order.js:1008
#: erpnext/stock/doctype/material_request/material_request.js:334
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/stock/doctype/stock_entry/stock_entry.js:633
@@ -7072,7 +7076,7 @@ msgstr "Stycklista"
msgid "BOM 1"
msgstr "Stycklista 1"
-#: erpnext/manufacturing/doctype/bom/bom.py:1519
+#: erpnext/manufacturing/doctype/bom/bom.py:1556
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr "Stycklista 1 {0} och Stycklista 2 {1} ska inte vara lika"
@@ -7291,7 +7295,7 @@ msgstr "Stycklista Webbplats Artikel"
msgid "BOM Website Operation"
msgstr "Stycklista Webbplats Åtgärd"
-#: erpnext/stock/doctype/stock_entry/stock_entry.js:1208
+#: erpnext/stock/doctype/stock_entry/stock_entry.js:1214
msgid "BOM and Manufacturing Quantity are required"
msgstr "Stycklista och Produktion Kvantitet erfodras"
@@ -7314,19 +7318,19 @@ msgstr "Stycklista Rekursion: {0} kan inte vara underordnad till {1}"
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr "Stycklista Rekursion: {1} kan inte vara överordnad eller underordnad till {0}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1332
+#: erpnext/manufacturing/doctype/bom/bom.py:1369
msgid "BOM {0} does not belong to Item {1}"
msgstr "Stycklista {0} tillhör inte Artikel {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1314
+#: erpnext/manufacturing/doctype/bom/bom.py:1351
msgid "BOM {0} must be active"
msgstr "Stycklista {0} måste vara aktiv"
-#: erpnext/manufacturing/doctype/bom/bom.py:1317
+#: erpnext/manufacturing/doctype/bom/bom.py:1354
msgid "BOM {0} must be submitted"
msgstr "Stycklista {0} måste godkännas"
-#: erpnext/manufacturing/doctype/bom/bom.py:734
+#: erpnext/manufacturing/doctype/bom/bom.py:765
msgid "BOM {0} not found for the item {1}"
msgstr "Stycklista {0} hittades inte för artikel {1}"
@@ -7397,7 +7401,7 @@ msgstr "Saldo"
msgid "Balance (Dr - Cr)"
msgstr "Saldo (Dr - Cr)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:673
+#: erpnext/accounts/report/general_ledger/general_ledger.py:693
msgid "Balance ({0})"
msgstr "Saldo ({0})"
@@ -7789,7 +7793,7 @@ msgstr "Stapel"
#: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
-#: erpnext/public/js/utils/barcode_scanner.js:282
+#: erpnext/public/js/utils/barcode_scanner.js:308
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#: erpnext/stock/doctype/item_barcode/item_barcode.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -8010,6 +8014,7 @@ msgid "Batch Details"
msgstr "Parti Detaljer"
#: erpnext/stock/doctype/batch/batch.py:197
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:455
msgid "Batch Expiry Date"
msgstr "Parti Förfallo Datum"
@@ -8062,7 +8067,7 @@ msgstr "Parti Artikel Utgång Status"
#: 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:2446
-#: erpnext/public/js/utils/barcode_scanner.js:260
+#: erpnext/public/js/utils/barcode_scanner.js:286
#: erpnext/public/js/utils/serial_no_batch_selector.js:438
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#: erpnext/stock/doctype/item_price/item_price.json
@@ -8083,7 +8088,7 @@ msgstr "Parti Artikel Utgång Status"
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:81
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:160
#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:19
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:416
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:448
#: erpnext/stock/report/stock_ledger/stock_ledger.js:78
#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
#: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
@@ -8098,7 +8103,7 @@ msgstr "Parti Nummer erfordras"
msgid "Batch No {0} does not exists"
msgstr "Parti Nummer {0} finns inte"
-#: erpnext/stock/utils.py:632
+#: erpnext/stock/utils.py:638
msgid "Batch No {0} is linked with Item {1} which has serial no. Please scan serial no instead."
msgstr "Parti Nummer {0} är länkat till Artikel {1} som har serie nummer. Skanna serie nummer istället."
@@ -8166,7 +8171,7 @@ msgstr "Parti och Serie Nummer"
msgid "Batch not created for item {} since it does not have a batch series."
msgstr "Parti är inte skapad för Artikel {} eftersom den inte har Parti Nummer."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:348
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:350
msgid "Batch {0} and Warehouse"
msgstr "Parti {0} och Lager"
@@ -8243,7 +8248,7 @@ msgstr "Faktura för Avvisad Kvantitet i Inköp Faktura"
#. Label of a Card Break in the Manufacturing Workspace
#. Label of a Link in the Manufacturing Workspace
-#: erpnext/manufacturing/doctype/bom/bom.py:1188
+#: erpnext/manufacturing/doctype/bom/bom.py:1225
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8557,7 +8562,7 @@ msgid "Blanket Order Rate"
msgstr "Avtal Order Värde"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:268
msgid "Block Invoice"
msgstr "Spärra Faktura"
@@ -8755,7 +8760,7 @@ msgstr "Clearing Nummer"
#: erpnext/accounts/doctype/pricing_rule_brand/pricing_rule_brand.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:300
+#: erpnext/accounts/report/gross_profit/gross_profit.py:306
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:53
#: erpnext/accounts/report/sales_register/sales_register.js:64
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -8828,7 +8833,7 @@ msgstr "Media"
msgid "Brokerage"
msgstr "Mäkleri"
-#: erpnext/manufacturing/doctype/bom/bom.js:143
+#: erpnext/manufacturing/doctype/bom/bom.js:164
msgid "Browse BOM"
msgstr "Bläddra Stycklista"
@@ -9050,7 +9055,7 @@ msgstr "Inköp"
msgid "Buying & Selling Settings"
msgstr "Inköp & Försäljning Inställningar"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:337
+#: erpnext/accounts/report/gross_profit/gross_profit.py:343
msgid "Buying Amount"
msgstr "Inköp Belopp"
@@ -9721,11 +9726,11 @@ msgstr "Kan inte konvertera till Grupp eftersom Konto Typ är vald."
msgid "Cannot covert to Group because Account Type is selected."
msgstr "Kan inte konvertera till Grupp eftersom Konto Typ valts."
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:988
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:990
msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts."
msgstr "Kan inte skapa Lager Reservation Poster för framtid daterade Inköp Följesedlar."
-#: erpnext/selling/doctype/sales_order/sales_order.py:1758
+#: erpnext/selling/doctype/sales_order/sales_order.py:1774
#: erpnext/stock/doctype/pick_list/pick_list.py:199
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 "Kan inte skapa plocklista för Försäljning Order {0} eftersom den har reserverad lager. Vänligen avboka lager för att skapa plocklista."
@@ -9738,15 +9743,11 @@ msgstr "Kan inte skapa bokföring poster mot inaktiverade konto: {0}"
msgid "Cannot create return for consolidated invoice {0}."
msgstr "Kan inte skapa retur för konsoliderad faktura {0}."
-#: erpnext/accounts/doctype/account/account_tree.js:241
-msgid "Cannot create root account."
-msgstr "Kan inte skapa klass konto."
-
-#: erpnext/manufacturing/doctype/bom/bom.py:1044
+#: erpnext/manufacturing/doctype/bom/bom.py:1081
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr "Kan inte inaktivera eller annullera Stycklista eftersom den är kopplat till andra Stycklistor"
-#: erpnext/crm/doctype/opportunity/opportunity.py:277
+#: erpnext/crm/doctype/opportunity/opportunity.py:282
msgid "Cannot declare as lost, because Quotation has been made."
msgstr "Kan inte ange som förlorad, eftersom Försäljning Offert är skapad."
@@ -9776,7 +9777,11 @@ msgstr "Kan inte ställa flera dokument i kö för ett bolag. {0} är redan i k
msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No."
msgstr "Kan inte säkerställa leverans efter Serie Nummer eftersom Artikel {0} lagts till med och utan säker leverans med serie nummer"
-#: erpnext/public/js/utils/barcode_scanner.js:54
+#: erpnext/public/js/utils/barcode_scanner.js:62
+msgid "Cannot find Item or Warehouse with this Barcode"
+msgstr "Kan inte hitta Artikel eller Lager med denna Streckkod / QRkod"
+
+#: erpnext/public/js/utils/barcode_scanner.js:63
msgid "Cannot find Item with this Barcode"
msgstr "Kan inte hitta Artikel med denna Streck/QR Kod"
@@ -9827,7 +9832,7 @@ msgstr "Kan inte hämta länk token. Se fellogg för mer information"
msgid "Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row"
msgstr "Kan inte välja avgifts typ som \"På föregående Rad Belopp\" eller \"På föregående Rad Totalt\" för första rad"
-#: erpnext/selling/doctype/quotation/quotation.py:283
+#: erpnext/selling/doctype/quotation/quotation.py:285
msgid "Cannot set as Lost as Sales Order is made."
msgstr "Kan inte ange som förlorad eftersom Försäljning Order är skapad."
@@ -10014,7 +10019,7 @@ msgstr "Kassaflöde från Verksamhet"
msgid "Cash In Hand"
msgstr "Kassa och Bank"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:321
msgid "Cash or Bank Account is mandatory for making payment entry"
msgstr "Kassa eller Bank Konto erfordras för Betalning Post"
@@ -10640,8 +10645,8 @@ msgstr "Klient"
#: erpnext/selling/doctype/sales_order/sales_order.js:591
#: erpnext/selling/doctype/sales_order/sales_order.js:623
#: erpnext/selling/doctype/sales_order/sales_order_list.js:66
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:319
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:276
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:325
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:283
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:170
#: erpnext/support/doctype/issue/issue.js:23
msgid "Close"
@@ -10746,7 +10751,7 @@ msgstr "Stängning (Cr)"
msgid "Closing (Dr)"
msgstr "Stängning (Dr)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:379
+#: erpnext/accounts/report/general_ledger/general_ledger.py:399
msgid "Closing (Opening + Total)"
msgstr "Stängning (Öppning + Totalt)"
@@ -11606,7 +11611,7 @@ msgstr "Bolag erfordras för att skapa faktura. Ange standard bolag i Standard I
msgid "Company name not same"
msgstr "Bolag Namn är inte samma"
-#: erpnext/assets/doctype/asset/asset.py:261
+#: erpnext/assets/doctype/asset/asset.py:262
msgid "Company of asset {0} and purchase document {1} doesn't matches."
msgstr "Bolag Tillgång {0} och Inköp Dokument {1} stämmer inte."
@@ -11649,7 +11654,7 @@ msgstr "Bolag{0} har lagts till mer än en gång"
msgid "Company {} does not exist yet. Taxes setup aborted."
msgstr "Bolag {} finns inte ännu. Moms inställning avbröts."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:528
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:529
msgid "Company {} does not match with POS Profile Company {}"
msgstr "Bolag {} stämmer inte med Kassa Profil Bolag {}"
@@ -11686,7 +11691,7 @@ msgstr "Konkurrenter"
msgid "Complete"
msgstr "Klar"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:230
+#: erpnext/manufacturing/doctype/job_card/job_card.js:238
#: erpnext/manufacturing/doctype/workstation/workstation.js:151
msgid "Complete Job"
msgstr "Slutför Jobb"
@@ -11819,8 +11824,8 @@ msgstr "Klar Kvantitet"
msgid "Completed Qty cannot be greater than 'Qty to Manufacture'"
msgstr "Klar Kvantitet får inte vara högre än 'Kvantitet att Producera'"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:278
-#: erpnext/manufacturing/doctype/job_card/job_card.js:373
+#: erpnext/manufacturing/doctype/job_card/job_card.js:286
+#: erpnext/manufacturing/doctype/job_card/job_card.js:381
#: erpnext/manufacturing/doctype/workstation/workstation.js:296
msgid "Completed Quantity"
msgstr "Klar Kvantitet"
@@ -12712,13 +12717,13 @@ msgstr "Korrigerande"
msgid "Corrective Action"
msgstr "Korrigerande Åtgärd"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:430
+#: erpnext/manufacturing/doctype/job_card/job_card.js:438
msgid "Corrective Job Card"
msgstr "Korrigerande Jobbkort"
#. Label of the corrective_operation_section (Tab Break) field in DocType 'Job
#. Card'
-#: erpnext/manufacturing/doctype/job_card/job_card.js:437
+#: erpnext/manufacturing/doctype/job_card/job_card.js:445
#: erpnext/manufacturing/doctype/job_card/job_card.json
msgid "Corrective Operation"
msgstr "Korrigerande Åtgärd"
@@ -12862,9 +12867,9 @@ msgstr "Kostnad"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:197
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98
#: erpnext/accounts/report/general_ledger/general_ledger.js:153
-#: erpnext/accounts/report/general_ledger/general_ledger.py:734
+#: erpnext/accounts/report/general_ledger/general_ledger.py:767
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
-#: erpnext/accounts/report/gross_profit/gross_profit.py:364
+#: erpnext/accounts/report/gross_profit/gross_profit.py:370
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
#: erpnext/accounts/report/purchase_register/purchase_register.js:46
#: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py:29
@@ -12949,8 +12954,8 @@ msgstr "Resultat Enhet för artikel rader är uppdaterad till {0}"
msgid "Cost Center is a part of Cost Center Allocation, hence cannot be converted to a group"
msgstr "Resultat Enhet är del av Resultat Enhet Tilldelning och kan därför inte konverteras till grupp"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1412
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:873
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1414
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:875
msgid "Cost Center is required in row {0} in Taxes table for type {1}"
msgstr "Resultat Enhet erfodras på rad {0} i Moms Tabell för typ {1}"
@@ -12970,11 +12975,11 @@ msgstr "Resultat Enhet med befintliga transaktioner kan inte omvandlas till Regi
msgid "Cost Center {0} cannot be used for allocation as it is used as main cost center in other allocation record."
msgstr "Resultat Enhet {0} kan inte användas för tilldelning eftersom det används som Huvud Resultat Enhet i annan tilldelning post."
-#: erpnext/assets/doctype/asset/asset.py:289
+#: erpnext/assets/doctype/asset/asset.py:290
msgid "Cost Center {} doesn't belong to Company {}"
msgstr "Resultat Enhet {} tillhör inte bolag {}"
-#: erpnext/assets/doctype/asset/asset.py:296
+#: erpnext/assets/doctype/asset/asset.py:297
msgid "Cost Center {} is a group cost center and group cost centers cannot be used in transactions"
msgstr "Resultat Enhet {} är Grupp Resultat Enhet och Grupp Resultat Enhet kan inte användas i transaktioner"
@@ -13090,11 +13095,11 @@ msgstr "Kostnad och Fakturering fält är uppdaterad"
msgid "Could Not Delete Demo Data"
msgstr "Kunde inte ta bort Demo Data"
-#: erpnext/selling/doctype/quotation/quotation.py:584
+#: erpnext/selling/doctype/quotation/quotation.py:606
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr "Kunde inte skapa Kund automatiskt pga följande erfodrade fält saknas:"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:674
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr "Kunde inte skapa Kredit Faktura automatiskt, avmarkera 'Skapa Kredit Faktura' och skicka igen"
@@ -13223,9 +13228,9 @@ msgstr "Cr"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:127
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:135
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:146
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:222
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:659
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:683
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:228
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:665
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:689
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13265,14 +13270,14 @@ msgstr "Cr"
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:34
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:48
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:64
-#: erpnext/manufacturing/doctype/bom/bom.js:171
-#: erpnext/manufacturing/doctype/bom/bom.js:180
-#: erpnext/manufacturing/doctype/bom/bom.js:190
-#: erpnext/manufacturing/doctype/bom/bom.js:194
-#: erpnext/manufacturing/doctype/bom/bom.js:438
+#: erpnext/manufacturing/doctype/bom/bom.js:192
+#: erpnext/manufacturing/doctype/bom/bom.js:201
+#: erpnext/manufacturing/doctype/bom/bom.js:211
+#: erpnext/manufacturing/doctype/bom/bom.js:215
+#: erpnext/manufacturing/doctype/bom/bom.js:459
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.js:99
-#: erpnext/manufacturing/doctype/job_card/job_card.js:137
-#: erpnext/manufacturing/doctype/job_card/job_card.js:151
+#: erpnext/manufacturing/doctype/job_card/job_card.js:145
+#: erpnext/manufacturing/doctype/job_card/job_card.js:159
#: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:268
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:145
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:159
@@ -13284,7 +13289,7 @@ msgstr "Cr"
#: erpnext/projects/doctype/task/task_tree.js:81
#: erpnext/public/js/communication.js:19 erpnext/public/js/communication.js:31
#: erpnext/public/js/communication.js:41
-#: erpnext/public/js/controllers/transaction.js:361
+#: erpnext/public/js/controllers/transaction.js:362
#: erpnext/public/js/controllers/transaction.js:2494
#: erpnext/selling/doctype/customer/customer.js:181
#: erpnext/selling/doctype/quotation/quotation.js:125
@@ -13303,18 +13308,18 @@ msgstr "Cr"
#: erpnext/selling/doctype/sales_order/sales_order.js:759
#: erpnext/selling/doctype/sales_order/sales_order.js:766
#: erpnext/selling/doctype/sales_order/sales_order.js:770
-#: erpnext/selling/doctype/sales_order/sales_order.js:917
-#: erpnext/selling/doctype/sales_order/sales_order.js:1056
+#: erpnext/selling/doctype/sales_order/sales_order.js:920
+#: erpnext/selling/doctype/sales_order/sales_order.js:1059
#: erpnext/stock/doctype/delivery_note/delivery_note.js:96
#: erpnext/stock/doctype/delivery_note/delivery_note.js:98
#: erpnext/stock/doctype/delivery_note/delivery_note.js:121
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:247
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:261
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:271
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:281
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:300
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:305
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:347
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:253
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:277
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:287
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:306
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:311
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:353
#: erpnext/stock/doctype/item/item.js:167
#: erpnext/stock/doctype/item/item.js:174
#: erpnext/stock/doctype/item/item.js:182
@@ -13338,15 +13343,15 @@ msgstr "Cr"
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:70
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:82
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:108
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:279
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:284
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:286
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:291
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:297
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:300
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:298
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:304
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:307
#: erpnext/stock/doctype/stock_entry/stock_entry.js:170
#: erpnext/stock/doctype/stock_entry/stock_entry.js:172
#: erpnext/stock/doctype/stock_entry/stock_entry.js:247
-#: erpnext/stock/doctype/stock_entry/stock_entry.js:1283
+#: erpnext/stock/doctype/stock_entry/stock_entry.js:1289
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:231
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:264
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:277
@@ -13471,7 +13476,7 @@ msgstr "Skapa Kassa Öppning Post"
msgid "Create Payment Entry"
msgstr "Skapa Betalning Post"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:806
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:807
msgid "Create Payment Entry for Consolidated POS Invoices."
msgstr "Skapa Betalning Post för Konsoliderade Kassa Fakturor."
@@ -13487,7 +13492,7 @@ msgstr "Skapa Utskrift Format"
msgid "Create Prospect"
msgstr "Skapa Prospekt"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1238
+#: erpnext/selling/doctype/sales_order/sales_order.js:1242
#: erpnext/utilities/activation.py:106
msgid "Create Purchase Order"
msgstr "Skapa Inköp Order"
@@ -13619,7 +13624,7 @@ msgstr "Skapade {0} Resultatkort för {1} mellan:"
msgid "Creating Accounts..."
msgstr "Skapar Bokföring..."
-#: erpnext/selling/doctype/sales_order/sales_order.js:1133
+#: erpnext/selling/doctype/sales_order/sales_order.js:1136
msgid "Creating Delivery Note ..."
msgstr "Skapar Försäljning Följesedel ..."
@@ -13639,11 +13644,11 @@ msgstr "Skapar Packsedel ..."
msgid "Creating Purchase Invoices ..."
msgstr "Skapar Inköp Ordrar ..."
-#: erpnext/selling/doctype/sales_order/sales_order.js:1258
+#: erpnext/selling/doctype/sales_order/sales_order.js:1262
msgid "Creating Purchase Order ..."
msgstr "Skapar Inköp Order ..."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:746
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13714,11 +13719,11 @@ msgstr "Skapande av {0} delvis klar.\n"
msgid "Credit"
msgstr "Kredit"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:691
+#: erpnext/accounts/report/general_ledger/general_ledger.py:711
msgid "Credit (Transaction)"
msgstr "Kredit (Transaktion)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:666
+#: erpnext/accounts/report/general_ledger/general_ledger.py:686
msgid "Credit ({0})"
msgstr "Kredit ({0})"
@@ -13861,14 +13866,14 @@ msgstr "Kredit Faktura Skapad"
msgid "Credit Note will update it's own outstanding amount, even if 'Return Against' is specified."
msgstr "Kredit Faktura kommer att uppdatera sitt eget utestående belopp, även om \"Retur Mot\" är angivet."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:671
msgid "Credit Note {0} has been created automatically"
msgstr "Kredit Faktura {0} skapad automatiskt"
#. Label of the credit_to (Link) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:369
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:377
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:371
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:379
#: erpnext/controllers/accounts_controller.py:2282
msgid "Credit To"
msgstr "Kredit Till"
@@ -14067,7 +14072,7 @@ msgstr "Cup"
#: erpnext/accounts/report/financial_statements.html:29
#: erpnext/accounts/report/financial_statements.py:678
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
-#: erpnext/accounts/report/gross_profit/gross_profit.py:427
+#: erpnext/accounts/report/gross_profit/gross_profit.py:443
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
@@ -14168,7 +14173,7 @@ msgstr "Valuta kan inte ändras efter att poster är skapade med någon annan va
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2319
+#: erpnext/accounts/utils.py:2323
msgid "Currency for {0} must be {1}"
msgstr "Valuta för {0} måste vara {1}"
@@ -14434,13 +14439,13 @@ msgstr "Anpassad?"
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:286
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:289
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/accounts/doctype/sales_invoice_reference/sales_invoice_reference.json
#: erpnext/accounts/doctype/tax_rule/tax_rule.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:38
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:29
-#: erpnext/accounts/report/gross_profit/gross_profit.py:385
+#: erpnext/accounts/report/gross_profit/gross_profit.py:391
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:37
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:22
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:225
@@ -14503,8 +14508,8 @@ msgstr "Anpassad?"
#: erpnext/setup/doctype/customer_group/customer_group.json
#: erpnext/setup/doctype/territory/territory.json
#: erpnext/setup/workspace/home/home.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:215
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:482
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:218
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:488
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
#: erpnext/stock/doctype/item/item.json
@@ -14518,7 +14523,7 @@ msgstr "Anpassad?"
#: erpnext/stock/report/delayed_item_report/delayed_item_report.py:121
#: erpnext/stock/report/delayed_order_report/delayed_order_report.js:36
#: erpnext/stock/report/delayed_order_report/delayed_order_report.py:46
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:469
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:512
#: erpnext/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14696,7 +14701,7 @@ msgstr "Kund Återkoppling"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:185
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:56
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:228
-#: erpnext/accounts/report/gross_profit/gross_profit.py:392
+#: erpnext/accounts/report/gross_profit/gross_profit.py:398
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:212
#: erpnext/accounts/report/sales_register/sales_register.js:27
#: erpnext/accounts/report/sales_register/sales_register.py:202
@@ -14804,6 +14809,7 @@ msgstr "Kund Mobil Nummer"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:156
#: 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
+#: erpnext/accounts/report/gross_profit/gross_profit.py:405
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:232
#: erpnext/accounts/report/sales_register/sales_register.py:193
#: erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -14951,7 +14957,7 @@ msgstr "Kund erfordras för \"Kund Rabatt\""
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1087
#: erpnext/selling/doctype/sales_order/sales_order.py:373
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:418
msgid "Customer {0} does not belong to project {1}"
msgstr "Kund {0} tillhör inte Projekt {1}"
@@ -15440,11 +15446,11 @@ msgstr "Hej System Ansvarig,"
msgid "Debit"
msgstr "Debet"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:684
+#: erpnext/accounts/report/general_ledger/general_ledger.py:704
msgid "Debit (Transaction)"
msgstr "Debet (Transaktion)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:659
+#: erpnext/accounts/report/general_ledger/general_ledger.py:679
msgid "Debit ({0})"
msgstr "Debet ({0})"
@@ -16386,7 +16392,7 @@ msgstr "Leverans"
#. Label of the delivery_date (Date) field in DocType 'Sales Order'
#. Label of the delivery_date (Date) field in DocType 'Sales Order Item'
#: erpnext/public/js/utils.js:813
-#: erpnext/selling/doctype/sales_order/sales_order.js:1076
+#: erpnext/selling/doctype/sales_order/sales_order.js:1079
#: erpnext/selling/doctype/sales_order/sales_order.json
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:321
@@ -16421,7 +16427,7 @@ msgstr "Leverans Ansvarig"
#. Label of a Link in the Stock Workspace
#. Label of a shortcut in the Stock Workspace
#: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:306
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:312
#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:36
#: 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
@@ -16528,7 +16534,7 @@ msgstr "Leverera Till"
#. Label of the delivery_trip (Link) field in DocType 'Delivery Note'
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:277
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:283
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_trip/delivery_trip.json
#: erpnext/stock/workspace/stock/stock.json
@@ -16718,7 +16724,7 @@ msgstr "Avskrivning Post"
msgid "Depreciation Entry Posting Status"
msgstr "Avskrivning Post Registrering Status"
-#: erpnext/assets/doctype/asset/asset.py:1109
+#: erpnext/assets/doctype/asset/asset.py:1125
msgid "Depreciation Entry against asset {0}"
msgstr "Avskrivning Post mot tillgång {0}"
@@ -16765,11 +16771,11 @@ msgstr "Avskrivning Registrering Datum"
msgid "Depreciation Posting Date cannot be before Available-for-use Date"
msgstr "Avskrivning Registrering Datum kan inte vara före Tillgänglig för Användning Datum"
-#: erpnext/assets/doctype/asset/asset.py:318
+#: erpnext/assets/doctype/asset/asset.py:319
msgid "Depreciation Row {0}: Depreciation Posting Date cannot be before Available-for-use Date"
msgstr "Avskrivning Rad {0}: Avskrivning Registrering Datum kan inte vara före Tillgänglig för Användning Datum"
-#: erpnext/assets/doctype/asset/asset.py:569
+#: erpnext/assets/doctype/asset/asset.py:585
msgid "Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1}"
msgstr "Avskrivning Rad {0}: Förväntad värde efter nyttjande tid måste vara högre än eller lika med {1}"
@@ -16796,7 +16802,7 @@ msgstr "Avskrivning Schema"
msgid "Depreciation Schedule View"
msgstr "Avskrivning Schema Vy"
-#: erpnext/assets/doctype/asset/asset.py:412
+#: erpnext/assets/doctype/asset/asset.py:413
msgid "Depreciation cannot be calculated for fully depreciated assets"
msgstr "Avskrivning kan inte beräknas för fullt avskrivna tillgångar"
@@ -16974,7 +16980,7 @@ msgstr "Avskrivning eliminerad via återföring"
#: erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
#: erpnext/accounts/doctype/share_type/share_type.json
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:72
-#: erpnext/accounts/report/gross_profit/gross_profit.py:302
+#: erpnext/accounts/report/gross_profit/gross_profit.py:308
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:175
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:196
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:72
@@ -17267,7 +17273,7 @@ msgstr "Differens Kvantitet"
msgid "Difference Value"
msgstr "Differens Värde"
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:491
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:497
msgid "Different 'Source Warehouse' and 'Target Warehouse' can be set for each row."
msgstr "Olika 'Från Lager' och 'Till Lager' kan anges för varje rad."
@@ -18037,7 +18043,7 @@ msgstr "Ska alla kunder meddelas via E-post?"
msgid "Do you want to submit the material request"
msgstr "Ska Material Begäran godkännas"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:76
+#: erpnext/manufacturing/doctype/job_card/job_card.js:84
msgid "Do you want to submit the stock entry?"
msgstr "Vill du godkänna lagerpost?"
@@ -18544,7 +18550,7 @@ msgstr "Kopiera Kund Grupp"
msgid "Duplicate Entry. Please check Authorization Rule {0}"
msgstr "Dubblett Post. Kontrollera Auktorisering Regel {0}"
-#: erpnext/assets/doctype/asset/asset.py:342
+#: erpnext/assets/doctype/asset/asset.py:343
msgid "Duplicate Finance Book"
msgstr "Kopiera Finans Register"
@@ -18737,7 +18743,7 @@ msgstr "Redigera Anteckning"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:495
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:501
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -19175,7 +19181,7 @@ msgstr "Tom"
msgid "Ems(Pica)"
msgstr "Ems(Pica)"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1642
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr "Aktivera Tillåt Partiell Reservation i Lager Inställningar för att reservera partiell lager."
@@ -19412,8 +19418,8 @@ msgstr "Slut datum kan inte vara tidigare än Start datum."
#. 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:311
-#: erpnext/manufacturing/doctype/job_card/job_card.js:380
+#: erpnext/manufacturing/doctype/job_card/job_card.js:319
+#: erpnext/manufacturing/doctype/job_card/job_card.js:388
#: 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
@@ -19504,8 +19510,8 @@ msgstr "Ange Serie Nummer"
msgid "Enter Supplier"
msgstr "Ange Leverantör"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:337
-#: erpnext/manufacturing/doctype/job_card/job_card.js:406
+#: erpnext/manufacturing/doctype/job_card/job_card.js:345
+#: erpnext/manufacturing/doctype/job_card/job_card.js:414
#: erpnext/manufacturing/doctype/workstation/workstation.js:312
msgid "Enter Value"
msgstr "Ange Värde"
@@ -19546,7 +19552,7 @@ msgstr "Ange Kund Telefon Nummer"
msgid "Enter date to scrap asset"
msgstr "Ange datum för tillgång avskrivning"
-#: erpnext/assets/doctype/asset/asset.py:410
+#: erpnext/assets/doctype/asset/asset.py:411
msgid "Enter depreciation details"
msgstr "Ange Avskrivning Detaljer"
@@ -19580,7 +19586,7 @@ msgstr "Ange namn på Bank eller Låne Bolag innan godkännande."
msgid "Enter the opening stock units."
msgstr "Ange Öppning Lager Enheter."
-#: erpnext/manufacturing/doctype/bom/bom.js:865
+#: erpnext/manufacturing/doctype/bom/bom.js:886
msgid "Enter the quantity of the Item that will be manufactured from this Bill of Materials."
msgstr "Ange kvantitet för Artikel som ska produceras från denna Stycklista."
@@ -19938,7 +19944,7 @@ msgstr "Valutaväxling Kurs måste vara samma som {0} {1} ({2})"
msgid "Excise Entry"
msgstr "Punktskatt Post"
-#: erpnext/stock/doctype/stock_entry/stock_entry.js:1276
+#: erpnext/stock/doctype/stock_entry/stock_entry.js:1282
msgid "Excise Invoice"
msgstr "Punktskatt Faktura"
@@ -20110,7 +20116,7 @@ msgstr "Förväntad Värde Efter Användning"
#: erpnext/accounts/doctype/cashier_closing/cashier_closing.json
#: erpnext/accounts/doctype/ledger_merge/ledger_merge.json
#: erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:596
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:598
#: erpnext/accounts/report/account_balance/account_balance.js:28
#: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:89
#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:178
@@ -20178,13 +20184,13 @@ msgstr "Kostnad Anspråk"
msgid "Expense Head"
msgstr "Kostnad Konto"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:490
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:514
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:534
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:492
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:516
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:536
msgid "Expense Head Changed"
msgstr "Kostnad Konto Ändrad"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:592
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:594
msgid "Expense account is mandatory for item {0}"
msgstr "Kostnad Konto erfordras för Artikel {0}"
@@ -20325,6 +20331,11 @@ msgstr "Extra Stor"
msgid "Extra Small"
msgstr "Extra Liten"
+#. Label of the finished_good (Link) field in DocType 'BOM Operation'
+#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
+msgid "FG / Semi FG Item"
+msgstr "Färdig / Halvfärdig Artikel"
+
#. Option for the 'Valuation Method' (Select) field in DocType 'Item'
#. Option for the 'Default Valuation Method' (Select) field in DocType 'Stock
#. Settings'
@@ -20533,7 +20544,7 @@ msgstr "Hämta Baserad På"
msgid "Fetch Customers"
msgstr "Hämta Kunder"
-#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js:76
+#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js:77
msgid "Fetch Items from Warehouse"
msgstr "Hämta Artiklar från Lager"
@@ -20549,7 +20560,7 @@ msgstr "Hämta Förfallna Fakturor"
msgid "Fetch Subscription Updates"
msgstr "Hämta Prenumeration Uppdateringar"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1017
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1026
msgid "Fetch Timesheet"
msgstr "Hämta Tidrapport"
@@ -20941,11 +20952,6 @@ msgstr "Färdig Artikel {0} måste vara underleverantör artikel."
msgid "Finished Goods"
msgstr "Färdig Artikel"
-#. Label of the finished_good (Link) field in DocType 'BOM Operation'
-#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
-msgid "Finished Goods / Semi Finished Goods Item"
-msgstr "Färdiga Artiklar / Halvfärdiga Artiklar Post"
-
#. Label of the fg_based_section_section (Section Break) field in DocType 'BOM'
#: erpnext/manufacturing/doctype/bom/bom.json
msgid "Finished Goods Based Operating Cost"
@@ -20956,11 +20962,6 @@ msgstr "Färdiga Artiklar Baserade Driftskostnader"
msgid "Finished Goods Item"
msgstr "Färdig Artikel Post"
-#. Label of the finished_good_qty (Float) field in DocType 'BOM Operation'
-#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
-msgid "Finished Goods Qty"
-msgstr "Färdig Artikel Kvantitet"
-
#. Label of the fg_reference_id (Data) field in DocType 'BOM Creator Item'
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
msgid "Finished Goods Reference"
@@ -21124,7 +21125,7 @@ msgstr "Fast Tillgång"
#. Capitalization Asset Item'
#. Label of the fixed_asset_account (Link) field in DocType 'Asset Category
#. Account'
-#: erpnext/assets/doctype/asset/asset.py:751
+#: erpnext/assets/doctype/asset/asset.py:767
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
#: erpnext/assets/doctype/asset_category_account/asset_category_account.json
msgid "Fixed Asset Account"
@@ -21290,7 +21291,7 @@ msgid "For Job Card"
msgstr "För Jobbkort"
#. Label of the for_operation (Link) field in DocType 'Job Card'
-#: erpnext/manufacturing/doctype/job_card/job_card.js:450
+#: erpnext/manufacturing/doctype/job_card/job_card.js:458
#: erpnext/manufacturing/doctype/job_card/job_card.json
msgid "For Operation"
msgstr "För Åtgärd"
@@ -21339,7 +21340,7 @@ msgstr "För Leverantör"
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:466
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:997
+#: erpnext/selling/doctype/sales_order/sales_order.js:1000
#: erpnext/stock/doctype/material_request/material_request.js:344
#: erpnext/templates/form_grid/material_request_grid.html:36
msgid "For Warehouse"
@@ -21409,7 +21410,7 @@ msgstr "Referens"
msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included"
msgstr "För rad {0} i {1}. Om man vill inkludera {2} i Artikel Pris, rader {3} måste också inkluderas"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1635
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1652
msgid "For row {0}: Enter Planned Qty"
msgstr "För rad {0}: Ange Planerad Kvantitet"
@@ -21584,7 +21585,7 @@ msgstr "Fredag"
#. Label of the from_uom (Link) field in DocType 'UOM Conversion Factor'
#. Label of the from (Data) field in DocType 'Call Log'
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1020
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1029
#: erpnext/setup/doctype/uom_conversion_factor/uom_conversion_factor.json
#: erpnext/telephony/doctype/call_log/call_log.json
#: erpnext/templates/pages/projects.html:67
@@ -22188,7 +22189,7 @@ msgstr "Bokföring Register Saldo"
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:644
+#: erpnext/accounts/report/general_ledger/general_ledger.py:664
msgid "GL Entry"
msgstr "Bokföring Register Post"
@@ -22454,12 +22455,12 @@ msgid "Get Items"
msgstr "Hämta Artiklar"
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:170
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:192
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:270
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:299
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:330
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1073
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:173
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:198
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:273
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:305
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:339
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1082
#: erpnext/buying/doctype/purchase_order/purchase_order.js:612
#: erpnext/buying/doctype/purchase_order/purchase_order.js:632
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:366
@@ -22475,13 +22476,13 @@ msgstr "Hämta Artiklar"
#: erpnext/public/js/controllers/buying.js:296
#: erpnext/selling/doctype/quotation/quotation.js:167
#: erpnext/selling/doctype/sales_order/sales_order.js:174
-#: erpnext/selling/doctype/sales_order/sales_order.js:798
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:187
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:236
+#: erpnext/selling/doctype/sales_order/sales_order.js:801
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:190
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:242
#: erpnext/stock/doctype/material_request/material_request.js:126
#: erpnext/stock/doctype/material_request/material_request.js:221
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:156
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:270
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:160
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:277
#: erpnext/stock/doctype/stock_entry/stock_entry.js:319
#: erpnext/stock/doctype/stock_entry/stock_entry.js:366
#: erpnext/stock/doctype/stock_entry/stock_entry.js:395
@@ -22609,7 +22610,7 @@ msgstr "Hämta Leverantörer"
msgid "Get Suppliers By"
msgstr "Hämta Leverantörer"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1069
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1078
msgid "Get Timesheets"
msgstr "Hämta Tidrapporter"
@@ -22927,7 +22928,7 @@ msgstr "Brutto Marginal %"
#. Label of the gross_profit (Currency) field in DocType 'Quotation Item'
#. Label of the gross_profit (Currency) field in DocType 'Sales Order Item'
#: erpnext/accounts/report/gross_profit/gross_profit.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:344
+#: erpnext/accounts/report/gross_profit/gross_profit.py:350
#: erpnext/accounts/workspace/financial_reports/financial_reports.json
#: erpnext/selling/doctype/quotation_item/quotation_item.json
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -22938,7 +22939,7 @@ msgstr "Brutto Resultat"
msgid "Gross Profit / Loss"
msgstr "Brutto Resultat"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:351
+#: erpnext/accounts/report/gross_profit/gross_profit.py:357
msgid "Gross Profit Percent"
msgstr "Brutto Resultat %"
@@ -22950,11 +22951,11 @@ msgstr "Brutto Resultat %"
msgid "Gross Purchase Amount"
msgstr "Brutto Inköp Belopp"
-#: erpnext/assets/doctype/asset/asset.py:380
+#: erpnext/assets/doctype/asset/asset.py:381
msgid "Gross Purchase Amount is mandatory"
msgstr "Brutto Inköp Belopp erfordras"
-#: erpnext/assets/doctype/asset/asset.py:425
+#: erpnext/assets/doctype/asset/asset.py:441
msgid "Gross Purchase Amount should be equal to purchase amount of one single Asset."
msgstr "Brutto Inköp Belopp ska vara lika med inköp belopp för enskild Tillgång."
@@ -24000,11 +24001,11 @@ msgstr "Om man har denna artikel i Lager, kommer System att lagerbokföra varje
msgid "If you need to reconcile particular transactions against each other, then please select accordingly. If not, all the transactions will be allocated in FIFO order."
msgstr "Om man behöver stämma av specifika transaktioner mot varandra, välj därefter. Om inte, kommer alla transaktioner att tilldelas i FIFO ordning."
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1036
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1051
msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox."
msgstr "Om du fortfarande vill fortsätta, avmarkera \"Hoppa över tillgängliga underenhet artiklar\"."
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1748
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1765
msgid "If you still want to proceed, please enable {0}."
msgstr "För att fortsätta, aktivera {0}."
@@ -24078,11 +24079,11 @@ msgstr "Ignorera Tom Lager"
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr "Ignorera Valutakurs omvärdering och Resultat Journaler"
-#: erpnext/selling/doctype/sales_order/sales_order.js:980
+#: erpnext/selling/doctype/sales_order/sales_order.js:983
msgid "Ignore Existing Ordered Qty"
msgstr "Ignorera Befintlig Försäljning Order Kvantitet"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1740
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1757
msgid "Ignore Existing Projected Quantity"
msgstr "Ignorera Befintligt Uppskattad Kvantitet"
@@ -24727,7 +24728,7 @@ msgstr "Inkludera Utgångna Partier"
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:976
+#: erpnext/selling/doctype/sales_order/sales_order.js:979
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -24926,7 +24927,7 @@ msgstr "Felaktig vald (grupp) Lager för Ombeställning"
msgid "Incorrect Component Quantity"
msgstr "Felaktig Komponent Kvantitet"
-#: erpnext/assets/doctype/asset/asset.py:321
+#: erpnext/assets/doctype/asset/asset.py:322
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py:56
msgid "Incorrect Date"
msgstr "Felaktigt Datum"
@@ -25172,7 +25173,7 @@ msgstr "Installation Datum"
#. 'Installation Note'
#. Label of a Link in the Stock Workspace
#: erpnext/selling/doctype/installation_note/installation_note.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:257
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:263
#: erpnext/stock/workspace/stock/stock.json
msgid "Installation Note"
msgstr "Installation Avisering"
@@ -25182,7 +25183,7 @@ msgstr "Installation Avisering"
msgid "Installation Note Item"
msgstr "Installation Avisering Post"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:625
msgid "Installation Note {0} has already been submitted"
msgstr "Installation Avisering {0} är redan godkänd"
@@ -25240,7 +25241,7 @@ msgstr "Otillräckliga Behörigheter"
#: erpnext/stock/doctype/pick_list/pick_list.py:132
#: erpnext/stock/doctype/pick_list/pick_list.py:1003
#: erpnext/stock/doctype/stock_entry/stock_entry.py:788
-#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1103 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr "Otillräcklig Lager"
@@ -25334,6 +25335,10 @@ msgstr "Inter Bolag Journal Post Referens"
msgid "Inter Company Order Reference"
msgstr "Inter Bolag Order Referens"
+#: erpnext/selling/doctype/sales_order/sales_order.js:742
+msgid "Inter Company Purchase Order"
+msgstr "Inter Bolag Inköp Order"
+
#. Label of the inter_company_reference (Link) field in DocType 'Delivery Note'
#. Label of the inter_company_reference (Link) field in DocType 'Purchase
#. Receipt'
@@ -25342,6 +25347,10 @@ msgstr "Inter Bolag Order Referens"
msgid "Inter Company Reference"
msgstr "Inter Bolag Referens"
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:485
+msgid "Inter Company Sales Order"
+msgstr "Inter Bolag Försäljning Order"
+
#. Label of the inter_transfer_reference_section (Section Break) field in
#. DocType 'Sales Order Item'
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -25383,10 +25392,18 @@ msgstr "Intern Kund"
msgid "Internal Customer for company {0} already exists"
msgstr "Intern Kund för Bolag {0} finns redan"
+#: erpnext/selling/doctype/sales_order/sales_order.js:741
+msgid "Internal Purchase Order"
+msgstr "Intern Inköp Order"
+
#: erpnext/controllers/accounts_controller.py:731
msgid "Internal Sale or Delivery Reference missing."
msgstr "Intern Försäljning eller Leverans Referens saknas."
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:484
+msgid "Internal Sales Order"
+msgstr "Intern Försäljning Order"
+
#: erpnext/controllers/accounts_controller.py:733
msgid "Internal Sales Reference Missing"
msgstr "Intern Försäljning Referens saknas"
@@ -25455,8 +25472,8 @@ msgstr "Introduktion"
msgid "Invalid"
msgstr "Ogiltig"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:370
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:378
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:372
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:380
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:961
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:971
#: erpnext/assets/doctype/asset_category/asset_category.py:69
@@ -25499,8 +25516,8 @@ msgstr "Ogiltig Underordnad Procedur"
msgid "Invalid Company for Inter Company Transaction."
msgstr "Ogiltig Bolag för Intern Bolag Transaktion"
-#: erpnext/assets/doctype/asset/asset.py:292
-#: erpnext/assets/doctype/asset/asset.py:299
+#: erpnext/assets/doctype/asset/asset.py:293
+#: erpnext/assets/doctype/asset/asset.py:300
#: erpnext/controllers/accounts_controller.py:3037
msgid "Invalid Cost Center"
msgstr "Ogiltig Resultat Enhet"
@@ -25530,7 +25547,7 @@ msgstr "Ogiltig Dokument Typ"
msgid "Invalid Formula"
msgstr "Ogiltig Formel"
-#: erpnext/assets/doctype/asset/asset.py:430
+#: erpnext/assets/doctype/asset/asset.py:446
msgid "Invalid Gross Purchase Amount"
msgstr "Ogiltig Brutto Inköp Belopp"
@@ -25538,7 +25555,7 @@ msgstr "Ogiltig Brutto Inköp Belopp"
msgid "Invalid Group By"
msgstr "Ogiltig Gruppera Efter"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:453
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:454
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:914
msgid "Invalid Item"
msgstr "Ogiltig Artikel"
@@ -25581,7 +25598,7 @@ msgstr "Ogiltig Primär Roll"
msgid "Invalid Priority"
msgstr "Ogiltig Prioritet"
-#: erpnext/manufacturing/doctype/bom/bom.py:1093
+#: erpnext/manufacturing/doctype/bom/bom.py:1130
msgid "Invalid Process Loss Configuration"
msgstr "Ogiltig Process Förlust Konfiguration"
@@ -25609,8 +25626,8 @@ msgstr "Ogiltig Retur"
msgid "Invalid Sales Invoices"
msgstr "Ogiltiga Försäljning Fakturor"
-#: erpnext/assets/doctype/asset/asset.py:515
-#: erpnext/assets/doctype/asset/asset.py:534
+#: erpnext/assets/doctype/asset/asset.py:531
+#: erpnext/assets/doctype/asset/asset.py:550
msgid "Invalid Schedule"
msgstr "Ogiltig Schema"
@@ -25643,7 +25660,7 @@ msgstr "Ogiltigt belopp i bokföring av {} {} för Konto {}: {}"
msgid "Invalid condition expression"
msgstr "Ogiltig Villkor Uttryck"
-#: erpnext/selling/doctype/quotation/quotation.py:270
+#: erpnext/selling/doctype/quotation/quotation.py:272
msgid "Invalid lost reason {0}, please create a new lost reason"
msgstr "Ogiltig förlorad anledning {0}, skapa ny förlorad anledning"
@@ -25789,7 +25806,7 @@ msgstr "Faktura Gräns"
msgid "Invoice Number"
msgstr "Faktura Nummer"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:812
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:813
msgid "Invoice Paid"
msgstr "Faktura Betald"
@@ -26383,6 +26400,14 @@ msgstr "Är Standard"
msgid "Is Stock Item"
msgstr "Är Lager Artikel"
+#. Label of the is_sub_assembly_item (Check) field in DocType 'BOM Explosion
+#. Item'
+#. Label of the is_sub_assembly_item (Check) field in DocType 'BOM Item'
+#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
+#: erpnext/manufacturing/doctype/bom_item/bom_item.json
+msgid "Is Sub Assembly Item"
+msgstr "Är Underenhet Artikel"
+
#. Label of the is_subcontracted (Check) field in DocType 'Purchase Invoice'
#. Label of the is_subcontracted (Check) field in DocType 'Purchase Order'
#. Label of the is_subcontracted (Check) field in DocType 'Supplier Quotation'
@@ -26609,7 +26634,7 @@ msgstr "Det är inte möjligt att fördela avgifter lika när det totala beloppe
#: erpnext/buying/workspace/buying/buying.json
#: erpnext/controllers/taxes_and_totals.py:1123
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.json
-#: erpnext/manufacturing/doctype/bom/bom.js:944
+#: erpnext/manufacturing/doctype/bom/bom.js:979
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109
#: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:25
@@ -26630,7 +26655,7 @@ msgstr "Det är inte möjligt att fördela avgifter lika när det totala beloppe
#: erpnext/public/js/stock_analytics.js:92
#: erpnext/selling/doctype/party_specific_item/party_specific_item.json
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1203
+#: erpnext/selling/doctype/sales_order/sales_order.js:1206
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:46
#: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.js:14
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.js:36
@@ -26833,10 +26858,10 @@ msgstr "Artikel Kundkorg"
#: erpnext/accounts/doctype/pricing_rule_item_code/pricing_rule_item_code.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1026
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1035
#: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:68
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:37
-#: erpnext/accounts/report/gross_profit/gross_profit.py:281
+#: erpnext/accounts/report/gross_profit/gross_profit.py:287
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:150
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:171
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:37
@@ -26893,8 +26918,8 @@ msgstr "Artikel Kundkorg"
#: erpnext/selling/doctype/quotation_item/quotation_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:345
#: erpnext/selling/doctype/sales_order/sales_order.js:453
-#: erpnext/selling/doctype/sales_order/sales_order.js:839
-#: erpnext/selling/doctype/sales_order/sales_order.js:990
+#: erpnext/selling/doctype/sales_order/sales_order.js:842
+#: erpnext/selling/doctype/sales_order/sales_order.js:993
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py:29
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:27
@@ -26937,7 +26962,7 @@ msgstr "Artikel Kundkorg"
#: erpnext/stock/report/item_price_stock/item_price_stock.py:18
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:125
#: 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:396
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:419
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:7
#: erpnext/stock/report/stock_ageing/stock_ageing.py:130
#: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:104
@@ -26964,7 +26989,7 @@ msgstr "Artikelkod > Artikelgrupp > Varumärke"
msgid "Item Code cannot be changed for Serial No."
msgstr "Artikel Kod kan inte ändras för Serie Nummer"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:445
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:447
msgid "Item Code required at Row No {0}"
msgstr "Artikel Kod erfordras vid Rad Nummer {0}"
@@ -27069,7 +27094,7 @@ msgstr "Artikel Detaljer "
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/doctype/tax_rule/tax_rule.json
#: erpnext/accounts/report/gross_profit/gross_profit.js:44
-#: erpnext/accounts/report/gross_profit/gross_profit.py:294
+#: erpnext/accounts/report/gross_profit/gross_profit.py:300
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js:21
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:28
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:28
@@ -27281,7 +27306,7 @@ msgstr "Artikel Producent"
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:74
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:71
-#: erpnext/accounts/report/gross_profit/gross_profit.py:288
+#: erpnext/accounts/report/gross_profit/gross_profit.py:294
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:33
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:156
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:177
@@ -27330,7 +27355,7 @@ msgstr "Artikel Producent"
#: erpnext/public/js/controllers/transaction.js:2414
#: erpnext/public/js/utils.js:756
#: erpnext/selling/doctype/quotation_item/quotation_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:845
+#: erpnext/selling/doctype/sales_order/sales_order.js:848
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py:35
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:33
@@ -27364,7 +27389,7 @@ msgstr "Artikel Producent"
#: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143
#: 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:131
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:403
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:426
#: erpnext/stock/report/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -27413,7 +27438,7 @@ msgstr "Artikel Pris Inställningar"
msgid "Item Price Stock"
msgstr "Lager Artikel Pris"
-#: erpnext/stock/get_item_details.py:1063
+#: erpnext/stock/get_item_details.py:1058
msgid "Item Price added for {0} in Price List {1}"
msgstr "Artikel Pris lagd till för {0} i Prislista {1}"
@@ -27421,7 +27446,7 @@ msgstr "Artikel Pris lagd till för {0} i Prislista {1}"
msgid "Item Price appears multiple times based on Price List, Supplier/Customer, Currency, Item, Batch, UOM, Qty, and Dates."
msgstr "Artikel Pris visas flera gånger baserat på Prislista, Leverantör/Kund, Valuta, Artikel, Parti, Enhet, Kvantitet och Datum."
-#: erpnext/stock/get_item_details.py:1042
+#: erpnext/stock/get_item_details.py:1037
msgid "Item Price updated for {0} in Price List {1}"
msgstr "Artikel Pris uppdaterad för {0} i Prislista {1}"
@@ -27569,8 +27594,8 @@ msgstr "Artikel att Producera"
msgid "Item UOM"
msgstr "Artikel Enhet"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:409
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:416
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:410
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:417
msgid "Item Unavailable"
msgstr "Artikel ej Tillgänglig"
@@ -27686,7 +27711,7 @@ msgid "Item must be added using 'Get Items from Purchase Receipts' button"
msgstr "Artikel måste läggas till med hjälp av 'Hämta Artiklar från Inköp Följesedel' Knapp"
#: erpnext/buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:42
-#: erpnext/selling/doctype/sales_order/sales_order.js:1210
+#: erpnext/selling/doctype/sales_order/sales_order.js:1213
msgid "Item name"
msgstr "Artikel Namn"
@@ -27733,7 +27758,7 @@ msgstr "Artikel {0} kan inte läggas till som underenhet av sig själv"
msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}."
msgstr "Artikel {0} kan inte skapas order för mer än {1} mot Avtal Order {2}."
-#: erpnext/assets/doctype/asset/asset.py:274
+#: erpnext/assets/doctype/asset/asset.py:275
#: erpnext/stock/doctype/item/item.py:634
msgid "Item {0} does not exist"
msgstr "Artikel {0} finns inte"
@@ -27754,7 +27779,7 @@ msgstr "Artikel {0} är angiven flera gånger."
msgid "Item {0} has already been returned"
msgstr "Artikel {0} är redan returnerad"
-#: erpnext/assets/doctype/asset/asset.py:276
+#: erpnext/assets/doctype/asset/asset.py:277
msgid "Item {0} has been disabled"
msgstr "Artikel {0} är inaktiverad"
@@ -27770,7 +27795,7 @@ msgstr "Artikel {0} har nått slut på sin livslängd {1}"
msgid "Item {0} ignored since it is not a stock item"
msgstr "Artikel {0} ignorerad eftersom det inte är Lager Artikel"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:565
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:567
msgid "Item {0} is already reserved/delivered against Sales Order {1}."
msgstr "Artikel {0} är redan reserverad/levererad mot Försäljning Order {1}."
@@ -27798,7 +27823,7 @@ msgstr "Artikel {0} är inte underleverantör artikel"
msgid "Item {0} is not active or end of life has been reached"
msgstr "Artikel {0} är inte aktiv eller livslängd har uppnåtts"
-#: erpnext/assets/doctype/asset/asset.py:278
+#: erpnext/assets/doctype/asset/asset.py:279
msgid "Item {0} must be a Fixed Asset Item"
msgstr "Artikel {0} måste vara Fast Tillgång Artikel"
@@ -27810,7 +27835,7 @@ msgstr "Artikel {0} måste vara Ej Lager Artikel"
msgid "Item {0} must be a Sub-contracted Item"
msgstr "Artikel {0} måste vara Underleverantör Artikel"
-#: erpnext/assets/doctype/asset/asset.py:280
+#: erpnext/assets/doctype/asset/asset.py:281
msgid "Item {0} must be a non-stock item"
msgstr "Artikel {0} får inte vara Lager Artikel"
@@ -27867,7 +27892,7 @@ msgstr "Försäljning Historik per Artikel"
msgid "Item-wise Sales Register"
msgstr "Försäljning Register per Artikel"
-#: erpnext/stock/get_item_details.py:703
+#: erpnext/stock/get_item_details.py:698
msgid "Item/Item Code required to get Item Tax Template."
msgstr "Artikel / Artikel Kod erfordras för att hämta Artikel Moms Mall."
@@ -27925,11 +27950,11 @@ msgstr "Artikel: {0} finns inte i system"
#: erpnext/selling/doctype/installation_note/installation_note.json
#: erpnext/selling/doctype/product_bundle/product_bundle.json
#: erpnext/selling/doctype/quotation/quotation.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:831
+#: erpnext/selling/doctype/sales_order/sales_order.js:834
#: erpnext/selling/doctype/sales_order/sales_order.json
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:19
#: erpnext/setup/doctype/item_group/item_group.js:87
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:487
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:493
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/material_request/material_request.json
#: erpnext/stock/doctype/packing_slip/packing_slip.json
@@ -27959,8 +27984,8 @@ msgstr "Artikel Katalog"
msgid "Items Filter"
msgstr "Artikel Filter"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1601
-#: erpnext/selling/doctype/sales_order/sales_order.js:1246
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1618
+#: erpnext/selling/doctype/sales_order/sales_order.js:1250
msgid "Items Required"
msgstr "Artiklar Erfodrade"
@@ -27980,7 +28005,7 @@ msgstr "Artiklar & Prissättning"
msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}."
msgstr "Artiklar kan inte uppdateras eftersom underleverantör order är skapad mot Inköp Order {0}."
-#: erpnext/selling/doctype/sales_order/sales_order.js:1026
+#: erpnext/selling/doctype/sales_order/sales_order.js:1029
msgid "Items for Raw Material Request"
msgstr "Artiklar för Råmaterial Begäran"
@@ -27994,7 +28019,7 @@ msgstr "Artikel Pris har ändrats till noll eftersom Tillåt Noll Värderingssat
msgid "Items to Be Repost"
msgstr "Artikel som ska Läggas om"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1600
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1617
msgid "Items to Manufacture are required to pull the Raw Materials associated with it."
msgstr "Artiklar som ska produceras erfordras för att hämta tilldelad Råmaterial."
@@ -28491,7 +28516,7 @@ msgstr "Landad Kostnad Leverantör Faktura"
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:685
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:104
#: erpnext/stock/workspace/stock/stock.json
@@ -28603,6 +28628,35 @@ msgstr "Senaste Order Datum"
msgid "Last Purchase Rate"
msgstr "Senaste Inköp Pris"
+#. Label of the last_scanned_warehouse (Data) field in DocType 'POS Invoice'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Purchase
+#. Invoice'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Sales Invoice'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Purchase Order'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Quotation'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Sales Order'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Delivery Note'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Material
+#. Request'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Purchase
+#. Receipt'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Stock Entry'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Stock
+#. Reconciliation'
+#: 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/buying/doctype/purchase_order/purchase_order.json
+#: erpnext/selling/doctype/quotation/quotation.json
+#: erpnext/selling/doctype/sales_order/sales_order.json
+#: erpnext/stock/doctype/delivery_note/delivery_note.json
+#: erpnext/stock/doctype/material_request/material_request.json
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+#: erpnext/stock/doctype/stock_entry/stock_entry.json
+#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
+msgid "Last Scanned Warehouse"
+msgstr "Senast skannad Lager"
+
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:328
msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}."
msgstr "Senaste Lager Transaktion för Artikel {0} på Lager {1} var den {2}."
@@ -29405,7 +29459,7 @@ msgstr "Lojalitet Poäng: {0}"
#: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.json
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1121
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1130
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/selling/doctype/customer/customer.json
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:952
@@ -29728,7 +29782,7 @@ msgstr "Valfri Ämne"
#. Label of the make (Data) field in DocType 'Vehicle'
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:109
-#: erpnext/manufacturing/doctype/job_card/job_card.js:471
+#: erpnext/manufacturing/doctype/job_card/job_card.js:479
#: erpnext/setup/doctype/vehicle/vehicle.json
msgid "Make"
msgstr "Märke"
@@ -29762,7 +29816,7 @@ msgstr "Skapa Inköp Faktura"
msgid "Make Quotation"
msgstr "Skapa Offert"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:356
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:363
msgid "Make Return Entry"
msgstr "Skapa Retur Post"
@@ -29777,12 +29831,12 @@ msgstr "Skapa Försäljning Faktura"
msgid "Make Serial No / Batch from Work Order"
msgstr "Skapa Serie / Parti Nummer från Arbetsorder"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:74
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:282
+#: erpnext/manufacturing/doctype/job_card/job_card.js:82
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:289
msgid "Make Stock Entry"
msgstr "Skapa Lager Post"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:345
+#: erpnext/manufacturing/doctype/job_card/job_card.js:353
msgid "Make Subcontracting PO"
msgstr "Skapa Underleverantör Inköp Order"
@@ -29852,18 +29906,18 @@ msgstr "Verkställande Direktör"
#: erpnext/accounts/doctype/pos_field/pos_field.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:147
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:76
-#: erpnext/manufacturing/doctype/bom/bom.js:85
-#: erpnext/manufacturing/doctype/bom/bom.js:603
+#: erpnext/manufacturing/doctype/bom/bom.js:87
+#: erpnext/manufacturing/doctype/bom/bom.js:624
#: erpnext/manufacturing/doctype/bom/bom.py:261
#: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py:71
#: erpnext/public/js/controllers/accounts.js:249
#: erpnext/public/js/controllers/transaction.js:2812
#: erpnext/public/js/utils/party.js:321
#: erpnext/stock/doctype/delivery_note/delivery_note.js:164
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:203
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:206
#: erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:138
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:250
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:254
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:101
msgid "Mandatory"
msgstr "Erfordras"
@@ -29894,15 +29948,15 @@ msgstr "Erfordrad för Balans Rapport"
msgid "Mandatory For Profit and Loss Account"
msgstr "Erfodrad för Resultat Rapport"
-#: erpnext/selling/doctype/quotation/quotation.py:588
+#: erpnext/selling/doctype/quotation/quotation.py:610
msgid "Mandatory Missing"
msgstr "Erfodrad Saknas"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:628
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:630
msgid "Mandatory Purchase Order"
msgstr "Inköp Order Erfodras"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:649
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:651
msgid "Mandatory Purchase Receipt"
msgstr "Inköp Följesedel Erfodras"
@@ -30167,7 +30221,7 @@ msgstr "Produktion Typ"
msgid "Manufacturing User"
msgstr "Produktion Användare"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:179
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:183
msgid "Mapping Purchase Receipt ..."
msgstr "Mappar Inköp Följesedel..."
@@ -30403,7 +30457,7 @@ msgstr "Material Kvitto"
#: 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:133
+#: erpnext/manufacturing/doctype/job_card/job_card.js:141
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:155
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
#: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
@@ -30499,7 +30553,7 @@ msgstr "Material Begäran Plan Artikel"
msgid "Material Request Type"
msgstr "Material Begäran Typ"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1704
+#: erpnext/selling/doctype/sales_order/sales_order.py:1720
msgid "Material Request not created, as quantity for Raw Materials already available."
msgstr "Material Begäran är inte skapad eftersom kvantitet för Råmaterial är redan tillgänglig."
@@ -30517,7 +30571,7 @@ msgstr "Material Begäran användes för att skapa detta Lager Post"
msgid "Material Request {0} is cancelled or stopped"
msgstr "Material Begäran {0} avbruten eller stoppad"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1042
+#: erpnext/selling/doctype/sales_order/sales_order.js:1045
msgid "Material Request {0} submitted."
msgstr "Material Begäran {0} godkänd."
@@ -30554,7 +30608,7 @@ msgstr "Material Retur från Bearbetning"
#. 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:147
+#: erpnext/manufacturing/doctype/job_card/job_card.js:155
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:90
#: erpnext/stock/doctype/item/item.json
@@ -30725,7 +30779,7 @@ msgstr "Maximum Värde"
msgid "Maximum discount for Item {0} is {1}%"
msgstr "Maximum rabatt för Artikel {0} är {1} %"
-#: erpnext/public/js/utils/barcode_scanner.js:99
+#: erpnext/public/js/utils/barcode_scanner.js:125
msgid "Maximum quantity scanned for item {0}."
msgstr "Maximum kvantitet skannad för artikel {0}."
@@ -31196,7 +31250,7 @@ msgstr "Saknas"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:87
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:184
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:588
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:590
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2249
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
#: erpnext/assets/doctype/asset_category/asset_category.py:116
@@ -31208,7 +31262,7 @@ msgid "Missing Asset"
msgstr "Tillgång Saknas"
#: erpnext/accounts/doctype/gl_entry/gl_entry.py:178
-#: erpnext/assets/doctype/asset/asset.py:308
+#: erpnext/assets/doctype/asset/asset.py:309
msgid "Missing Cost Center"
msgstr "Resultat Enhet Saknas"
@@ -31216,11 +31270,11 @@ msgstr "Resultat Enhet Saknas"
msgid "Missing Default in Company"
msgstr "Standard Inställningar i Bolag saknas"
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:44
msgid "Missing Filters"
msgstr "Saknade Filter"
-#: erpnext/assets/doctype/asset/asset.py:350
+#: erpnext/assets/doctype/asset/asset.py:351
msgid "Missing Finance Book"
msgstr "Finans Register Saknas"
@@ -31252,7 +31306,7 @@ msgstr "Erfordrade Värden Saknas"
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr "E-post Mall saknas för Leverans. Ange Mall i Leverans Inställningar."
-#: erpnext/manufacturing/doctype/bom/bom.py:1052
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr "Värde Saknas"
@@ -31490,7 +31544,7 @@ msgstr "Månad(er) efter Faktura Månad slut"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:62
#: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:75
-#: erpnext/accounts/report/gross_profit/gross_profit.py:406
+#: erpnext/accounts/report/gross_profit/gross_profit.py:418
#: erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json
#: erpnext/buying/report/purchase_analytics/purchase_analytics.js:61
#: erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
@@ -31918,7 +31972,7 @@ msgstr "Naturgas"
msgid "Needs Analysis"
msgstr "Behöver Analys"
-#: erpnext/stock/serial_batch_bundle.py:1381
+#: erpnext/stock/serial_batch_bundle.py:1397
msgid "Negative Batch Quantity"
msgstr "Negativ Parti Kvantitet"
@@ -32359,7 +32413,7 @@ msgstr "Nya Serie Nummer kan inte ha Lager. Lager måste anges av Lager Post ell
msgid "New Task"
msgstr "Ny Uppgift"
-#: erpnext/manufacturing/doctype/bom/bom.js:156
+#: erpnext/manufacturing/doctype/bom/bom.js:177
msgid "New Version"
msgstr "Ny Version"
@@ -32386,7 +32440,7 @@ msgstr "Ny bokföring år skapad :-"
msgid "New invoices will be generated as per schedule even if current invoices are unpaid or past due date"
msgstr "Nya fakturor skapas enligt schema även om aktuella fakturor är obetalda eller förfallna"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:258
msgid "New release date should be in the future"
msgstr "Ny utgivning datum ska vara i framtiden"
@@ -32468,8 +32522,8 @@ msgstr "Nästa E-post kommer att skickas:"
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:625
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:646
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:627
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:648
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/buying/doctype/buying_settings/buying_settings.json
#: erpnext/projects/doctype/project/project.json
@@ -32528,11 +32582,11 @@ msgstr "Ingen Artikel med Serie Nummer {0}"
msgid "No Items selected for transfer."
msgstr "Inga Artiklar har valts för överföring."
-#: erpnext/selling/doctype/sales_order/sales_order.js:824
+#: erpnext/selling/doctype/sales_order/sales_order.js:827
msgid "No Items with Bill of Materials to Manufacture"
msgstr "Inga Artiklar med Stycklista att Producera"
-#: erpnext/selling/doctype/sales_order/sales_order.js:962
+#: erpnext/selling/doctype/sales_order/sales_order.js:965
msgid "No Items with Bill of Materials."
msgstr "Inga Artiklar med Stycklista."
@@ -32548,7 +32602,7 @@ msgstr "Inga Anteckningar"
msgid "No Outstanding Invoices found for this party"
msgstr "Inga Utestående Fakturor hittades för denna parti"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:623
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:624
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr "Ingen Kassa Profil hittad. Skapa ny Kassa Profil"
@@ -32568,7 +32622,7 @@ msgstr "Inga inköp Order skapades"
msgid "No Records for these settings."
msgstr "Inga Poster för dessa inställningar."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:334
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:336
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1049
msgid "No Remarks"
msgstr "Inga Anmärkningar"
@@ -32597,7 +32651,7 @@ msgstr "Ingen Leverantör hittades för Inter Bolag Transaktioner som represente
msgid "No Tax Withholding data found for the current posting date."
msgstr "Ingen Moms Avdrag data hittades för aktuell registrering datum."
-#: erpnext/accounts/report/gross_profit/gross_profit.py:857
+#: erpnext/accounts/report/gross_profit/gross_profit.py:874
msgid "No Terms"
msgstr "Inga Villkor"
@@ -32613,7 +32667,7 @@ msgstr "Inga Oavstämda Betalningar hittades för denna parti"
msgid "No Work Orders were created"
msgstr "Inga Arbetsordrar skapades"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:803
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:805
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:742
msgid "No accounting entries for the following warehouses"
msgstr "Inga bokföring poster för följande Lager"
@@ -32860,7 +32914,7 @@ msgstr "Ej Avskrivningsbar Kategori"
msgid "Non Profit"
msgstr "Förening"
-#: erpnext/manufacturing/doctype/bom/bom.py:1420
+#: erpnext/manufacturing/doctype/bom/bom.py:1457
msgid "Non stock items"
msgstr "Ej Lager Artiklar"
@@ -32879,19 +32933,19 @@ msgid "None of the items have any change in quantity or value."
msgstr "Ingen av Artiklar har någon förändring i kvantitet eller värde."
#. Name of a UOM
-#: erpnext/setup/setup_wizard/data/uom_data.json erpnext/stock/utils.py:681
-#: erpnext/stock/utils.py:683
+#: erpnext/setup/setup_wizard/data/uom_data.json erpnext/stock/utils.py:703
+#: erpnext/stock/utils.py:705
msgid "Nos"
msgstr "St"
#: erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py:66
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:270
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:271
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:556
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:568
#: erpnext/assets/doctype/asset/asset.js:618
#: erpnext/assets/doctype/asset/asset.js:633
#: erpnext/controllers/buying_controller.py:269
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:72
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:73
#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:80
msgid "Not Allowed"
msgstr "Ej Tillåtet"
@@ -32926,7 +32980,7 @@ msgstr "Ej Levererad"
msgid "Not Initiated"
msgstr "Ej Initierad"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:812
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:823
#: erpnext/templates/pages/material_request_info.py:21
#: erpnext/templates/pages/order.py:37 erpnext/templates/pages/rfq.py:46
msgid "Not Permitted"
@@ -33000,7 +33054,7 @@ msgstr "Ej på Lager"
#: erpnext/manufacturing/doctype/work_order/work_order.py:2041
#: erpnext/manufacturing/doctype/work_order/work_order.py:2110
#: erpnext/selling/doctype/sales_order/sales_order.py:826
-#: erpnext/selling/doctype/sales_order/sales_order.py:1685
+#: erpnext/selling/doctype/sales_order/sales_order.py:1701
msgid "Not permitted"
msgstr "Ej Tillåtet"
@@ -33010,12 +33064,12 @@ msgstr "Ej Tillåtet"
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:288
#: erpnext/crm/doctype/crm_note/crm_note.json
#: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py:100
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1040
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1750
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1055
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1767
#: erpnext/projects/doctype/timesheet/timesheet.json
#: erpnext/public/js/controllers/buying.js:477
#: erpnext/selling/doctype/customer/customer.py:129
-#: erpnext/selling/doctype/sales_order/sales_order.js:1180
+#: erpnext/selling/doctype/sales_order/sales_order.js:1183
#: erpnext/stock/doctype/item/item.js:526
#: erpnext/stock/doctype/item/item.py:571
#: erpnext/stock/doctype/item_price/item_price.json
@@ -33692,7 +33746,7 @@ msgstr "Öppna Arbetsorder"
msgid "Open a new ticket"
msgstr "Öppna ny Ärende"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:377
+#: erpnext/accounts/report/general_ledger/general_ledger.py:397
#: erpnext/public/js/stock_analytics.js:97
msgid "Opening"
msgstr "Öppning"
@@ -33789,7 +33843,7 @@ msgstr "Öppning Faktura Skapande Post"
msgid "Opening Invoice Item"
msgstr "Öppning Faktura Post"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1628
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1836
msgid "Opening Invoice has rounding adjustment of {0}.
'{1}' account is required to post these values. Please set it in Company: {2}.
Or, '{3}' can be enabled to not post any rounding adjustment."
msgstr "Öppning Fakturan har avrundning justering på {0}.
'{1}' konto erfordras för att bokföra dessa värden. Ange det i Bolag: {2}.
Eller så kan '{3}' aktiveras för att inte bokföra någon avrundning justering."
@@ -33864,7 +33918,7 @@ msgstr "Drift Kostnad (Bolag Valuta)"
msgid "Operating Cost Per BOM Quantity"
msgstr "Drift Kostnad per Stycklista Kvantitet"
-#: erpnext/manufacturing/doctype/bom/bom.py:1436
+#: erpnext/manufacturing/doctype/bom/bom.py:1473
msgid "Operating Cost as per Work Order / BOM"
msgstr "Drift Kostnad per Arbetsorder / Styckelista"
@@ -33894,7 +33948,7 @@ msgstr "Drift Kostnader"
#. Label of the operation (Link) field in DocType 'Work Order Item'
#. Label of the operation (Link) field in DocType 'Work Order Operation'
#. Label of a Link in the Manufacturing Workspace
-#: erpnext/manufacturing/doctype/bom/bom.js:409
+#: erpnext/manufacturing/doctype/bom/bom.js:430
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
@@ -33986,7 +34040,7 @@ msgstr "Åtgärd Klar för hur många färdiga artiklar?"
msgid "Operation time does not depend on quantity to produce"
msgstr "Åtgärd Tid beror inte på kvantitet som ska produceras"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:513
+#: erpnext/manufacturing/doctype/job_card/job_card.js:521
msgid "Operation {0} added multiple times in the work order {1}"
msgstr "Åtgärd {0} har lagts till flera gånger i Arbetsorder {1}"
@@ -34020,7 +34074,7 @@ msgstr "Åtgärder"
msgid "Operations Routing"
msgstr "Åtgärd Ordning"
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1098
msgid "Operations cannot be left blank"
msgstr "Åtgärder kan inte lämnas tomma"
@@ -34594,7 +34648,7 @@ msgstr "Utleverans"
msgid "Over Billing Allowance (%)"
msgstr "Över Fakturering Tillåtelse (%)"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1260
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1262
msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%"
msgstr "Överfakturering Tillåtelse för Inköp Följesedel Artikel {0} ({1}) överskreds med {2}%"
@@ -35088,7 +35142,7 @@ msgstr "Packlista"
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:293
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:299
#: erpnext/stock/doctype/packing_slip/packing_slip.json
#: erpnext/stock/workspace/stock/stock.json
msgid "Packing Slip"
@@ -35099,7 +35153,7 @@ msgstr "Packsedel"
msgid "Packing Slip Item"
msgstr "Packsedel Artikel"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:641
msgid "Packing Slip(s) cancelled"
msgstr "Packsedel Annullerad"
@@ -35230,7 +35284,7 @@ msgstr "Betald från Konto Typ"
msgid "Paid To Account Type"
msgstr "Betald till Konto Typ"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:324
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:326
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1095
msgid "Paid amount + Write Off Amount can not be greater than Grand Total"
msgstr "Betald Belopp + Avskrivning Belopp kan inte vara högre än Totalt Belopp"
@@ -35385,11 +35439,11 @@ msgstr "Överordnad Artikel"
msgid "Parent Item Group"
msgstr "Överordnad Artikel Grupp"
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:80
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:81
msgid "Parent Item {0} must not be a Fixed Asset"
msgstr "Överordnad Artikel {0} får inte vara Tillgång"
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:78
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:79
msgid "Parent Item {0} must not be a Stock Item"
msgstr "Överordnad Artikel {0} får inte vara Lager Artikel"
@@ -35409,7 +35463,7 @@ msgstr "Överordnad Procedur"
msgid "Parent Row No"
msgstr "Överordnad Rad Nummer"
-#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:496
+#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:499
msgid "Parent Row No not found for {0}"
msgstr "Överordnad Rad Nummer hittades inte för {0}"
@@ -35460,7 +35514,7 @@ msgstr "Delvis Material Överförd"
msgid "Partial Payment in POS Transactions are not allowed."
msgstr "Delbetalningar i Kassa Transaktioner är inte tillåtna."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1645
msgid "Partial Stock Reservation"
msgstr "Partiell Lager Reservation"
@@ -35654,7 +35708,7 @@ msgstr "Delar Per Million"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:147
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:228
#: erpnext/accounts/report/general_ledger/general_ledger.js:74
-#: erpnext/accounts/report/general_ledger/general_ledger.py:723
+#: erpnext/accounts/report/general_ledger/general_ledger.py:743
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:161
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46
@@ -35759,6 +35813,7 @@ msgstr "Parti Stämmer Ej"
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:110
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: erpnext/crm/doctype/contract/contract.json
#: erpnext/selling/doctype/party_specific_item/party_specific_item.json
#: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22
@@ -35817,7 +35872,7 @@ msgstr "Parti Specifik Artikel"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:141
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:219
#: erpnext/accounts/report/general_ledger/general_ledger.js:65
-#: erpnext/accounts/report/general_ledger/general_ledger.py:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:742
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:157
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35
@@ -35912,7 +35967,7 @@ msgstr "Sökväg"
msgid "Pause"
msgstr "Paus"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:216
+#: erpnext/manufacturing/doctype/job_card/job_card.js:224
msgid "Pause Job"
msgstr "Pausa Jobb"
@@ -36408,7 +36463,7 @@ msgstr "Betalningsstatus"
#: 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:1200
-#: erpnext/accounts/report/gross_profit/gross_profit.py:412
+#: erpnext/accounts/report/gross_profit/gross_profit.py:424
#: erpnext/accounts/workspace/accounting/accounting.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:30
msgid "Payment Term"
@@ -36521,7 +36576,7 @@ msgstr "Betalning Bortkoppling Fel"
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr "Betalning mot {0} {1} kan inte kan vara högre än Utestående Belopp {2}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:748
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:749
msgid "Payment amount cannot be less than or equal to 0"
msgstr "Faktura belopp får inte vara lägre än eller lika med 0"
@@ -36538,7 +36593,7 @@ msgstr "Betalning på {0} mottagen."
msgid "Payment of {0} received successfully. Waiting for other requests to complete..."
msgstr "Betalning på {0} mottagen. Väntar på att andra begäran ska slutföras..."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:378
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:379
msgid "Payment related to {0} is not completed"
msgstr "Betalning relaterad till {0} är inte klar"
@@ -36681,7 +36736,7 @@ msgstr "Väntande Belopp"
#: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
#: erpnext/manufacturing/doctype/work_order/work_order.js:312
#: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:183
-#: erpnext/selling/doctype/sales_order/sales_order.js:1217
+#: erpnext/selling/doctype/sales_order/sales_order.js:1220
#: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:45
msgid "Pending Qty"
msgstr "Väntar på Kvantitet"
@@ -37060,7 +37115,7 @@ msgstr "Telefon Nummer"
#. Reservation Entry'
#. Label of a Link in the Stock Workspace
#: erpnext/selling/doctype/sales_order/sales_order.js:637
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:199
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:202
#: erpnext/stock/doctype/material_request/material_request.js:140
#: erpnext/stock/doctype/pick_list/pick_list.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -37379,12 +37434,12 @@ msgid "Please Select a Company."
msgstr "Välj Bolag"
#: erpnext/stock/doctype/delivery_note/delivery_note.js:165
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:204
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:207
msgid "Please Select a Customer"
msgstr "Välj Kund"
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:139
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:251
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:255
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:102
msgid "Please Select a Supplier"
msgstr "Välj Leverantör"
@@ -37470,7 +37525,7 @@ msgstr "Välj Flera Valutor alternativ för att tillåta konto med annan valuta"
msgid "Please check Process Deferred Accounting {0} and submit manually after resolving errors."
msgstr "Välj Bearbeta Uppskjuten Bokföring {0} och godkänn manuellt efter att ha löst fel."
-#: erpnext/manufacturing/doctype/bom/bom.js:84
+#: erpnext/manufacturing/doctype/bom/bom.js:86
msgid "Please check either with operations or FG Based Operating Cost."
msgstr "Välj antingen Med Åtgärder eller Färdig Artikel Baserad Åtgärd Kostnad."
@@ -37515,7 +37570,7 @@ msgstr "Kontakta administratör för att utöka kredit gränser för {0}."
msgid "Please convert the parent account in corresponding child company to a group account."
msgstr "Konvertera Överordnad Konto i motsvarande Dotter Bolag till ett Grupp Konto."
-#: erpnext/selling/doctype/quotation/quotation.py:586
+#: erpnext/selling/doctype/quotation/quotation.py:608
msgid "Please create Customer from Lead {0}."
msgstr "Skapa Kund från Potentiell Kund {0}."
@@ -37531,7 +37586,7 @@ msgstr "Skapa Bokföring Dimension vid behov."
msgid "Please create purchase from internal sale or delivery document itself"
msgstr "Skapa Inköp från intern Försäljning eller Följesedel"
-#: erpnext/assets/doctype/asset/asset.py:390
+#: erpnext/assets/doctype/asset/asset.py:391
msgid "Please create purchase receipt or purchase invoice for the item {0}"
msgstr "Skapa Inköp Följesdel eller Inköp Faktura för Artikel {0}"
@@ -37543,7 +37598,7 @@ msgstr "Ta bort Artikel Paket {0} innan sammanslagning av {1} med {2}"
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr "Inaktivera Arbetsflöde tillfälligt för Journal Post {0}"
-#: erpnext/assets/doctype/asset/asset.py:429
+#: erpnext/assets/doctype/asset/asset.py:445
msgid "Please do not book expense of multiple assets against one single Asset."
msgstr "Bokför inte kostnader för flera Tillgångar mot enskild Tillgång."
@@ -37573,7 +37628,7 @@ msgstr "Aktivera endast om du förstår effekterna av att aktivera detta."
msgid "Please enable pop-ups"
msgstr "Aktivera pop-ups"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:665
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:667
msgid "Please enable {0} in the {1}."
msgstr "Aktivera {0} i {1}."
@@ -37581,11 +37636,11 @@ msgstr "Aktivera {0} i {1}."
msgid "Please enable {} in {} to allow same item in multiple rows"
msgstr "Aktivera {} i {} för att tillåta samma Artikel i flera rader"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:367
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:369
msgid "Please ensure that the {0} account is a Balance Sheet account. You can change the parent account to a Balance Sheet account or select a different account."
msgstr "Kontrollera att {0} konto är Balans Rapport Konto. Ändra Överordnad Konto till Balans Rapport Konto eller välj annat konto."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:375
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:377
msgid "Please ensure that the {0} account {1} is a Payable account. You can change the account type to Payable or select a different account."
msgstr "Kontrollera att {0} konto {1} är Skuld Konto. Ändra Konto Typ till Skuld Konto Typ eller välj ett annat konto."
@@ -37601,7 +37656,7 @@ msgstr "Kontrollera att {} konto {} är fordring konto."
msgid "Please enter Difference Account or set default Stock Adjustment Account for company {0}"
msgstr "Ange Differens Konto eller standard konto för Lager Justering Konto för bolag {0}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:508
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:509
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1188
msgid "Please enter Account for Change Amount"
msgstr "Ange Växel Belopp Konto"
@@ -37683,7 +37738,7 @@ msgstr "Ange Leverans Paket information"
msgid "Please enter Warehouse and Date"
msgstr "Ange Lager och Datum"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:653
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:655
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1184
msgid "Please enter Write Off Account"
msgstr "Ange Avskrivning Konto"
@@ -37712,7 +37767,7 @@ msgstr "Ange Mobil Nummer"
msgid "Please enter parent cost center"
msgstr "Ange Överordnad Resultat Enhet"
-#: erpnext/public/js/utils/barcode_scanner.js:165
+#: erpnext/public/js/utils/barcode_scanner.js:191
msgid "Please enter quantity for item {0}"
msgstr "Ange Kvantitet för artikel {0}"
@@ -37728,7 +37783,7 @@ msgstr "Ange Serie Nummer"
msgid "Please enter the company name to confirm"
msgstr "Ange Bolag Namn att bekräfta"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:751
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:752
msgid "Please enter the phone number first"
msgstr "Ange Telefon Nummer"
@@ -37831,7 +37886,7 @@ msgstr "Välj Mall Typ att ladda ner mall"
msgid "Please select Apply Discount On"
msgstr "Välj Tillämpa Rabatt på"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1650
+#: erpnext/selling/doctype/sales_order/sales_order.py:1666
msgid "Please select BOM against item {0}"
msgstr "Välj Stycklista mot Artikel {0}"
@@ -37917,11 +37972,11 @@ msgstr "Välj Registrering Datum före val av Parti"
msgid "Please select Posting Date first"
msgstr "Välj Registrering Datum"
-#: erpnext/manufacturing/doctype/bom/bom.py:1106
+#: erpnext/manufacturing/doctype/bom/bom.py:1143
msgid "Please select Price List"
msgstr "Välj Prislista"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1652
+#: erpnext/selling/doctype/sales_order/sales_order.py:1668
msgid "Please select Qty against item {0}"
msgstr "Välj Kvantitet mot Artikel {0}"
@@ -37929,7 +37984,7 @@ msgstr "Välj Kvantitet mot Artikel {0}"
msgid "Please select Sample Retention Warehouse in Stock Settings first"
msgstr "Välj Prov Lager i Lager Inställningar"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:415
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:417
msgid "Please select Serial/Batch Nos to reserve or change Reservation Based On to Qty."
msgstr "Välj Serie / Parti Nummer att reservera eller ändra Reservation Baserad På Kvantitet."
@@ -37949,17 +38004,17 @@ msgstr "Välj Underleverantör Order istället för Inköp Order {0}"
msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
msgstr "Välj Orealiserad Resultat Konto eller ange standard konto för Orealiserad Resultat Konto för Bolag {0}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1338
+#: erpnext/manufacturing/doctype/bom/bom.py:1375
msgid "Please select a BOM"
msgstr "Välj Stycklista"
#: erpnext/accounts/party.py:430
-#: erpnext/stock/doctype/pick_list/pick_list.py:1551
+#: erpnext/stock/doctype/pick_list/pick_list.py:1563
msgid "Please select a Company"
msgstr "Välj Bolag"
#: erpnext/accounts/doctype/payment_entry/payment_entry.js:267
-#: erpnext/manufacturing/doctype/bom/bom.js:603
+#: erpnext/manufacturing/doctype/bom/bom.js:624
#: erpnext/manufacturing/doctype/bom/bom.py:261
#: erpnext/public/js/controllers/accounts.js:249
#: erpnext/public/js/controllers/transaction.js:2812
@@ -38039,11 +38094,11 @@ msgstr "Välj värde för {0} Försäljning Offert {1}"
msgid "Please select an item code before setting the warehouse."
msgstr "Välj Artikel Kod innan du anger Lager."
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:26
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:43
msgid "Please select at least one filter: Item Code, Batch, or Serial No."
msgstr "Välj minst ett filter: Artikel Kod, Parti eller Serie Nummer."
-#: erpnext/selling/doctype/sales_order/sales_order.js:886
+#: erpnext/selling/doctype/sales_order/sales_order.js:889
msgid "Please select atleast one item to continue"
msgstr "Välj artikel för att fortsätta"
@@ -38128,7 +38183,7 @@ msgstr "Välj {0}"
msgid "Please select {0} first"
msgstr "Välj {0}"
-#: erpnext/public/js/controllers/transaction.js:99
+#: erpnext/public/js/controllers/transaction.js:100
msgid "Please set 'Apply Additional Discount On'"
msgstr "Ange 'Tillämpa Extra Rabatt På'"
@@ -38170,10 +38225,14 @@ msgstr "Ange Bokföring Dimension {} i {}"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:58
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:68
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:78
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:756
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:765
msgid "Please set Company"
msgstr "Ange Bolag"
+#: erpnext/regional/united_arab_emirates/utils.py:26
+msgid "Please set Customer Address to determine if the transaction is an export."
+msgstr "Ange Kund Adress för att avgöra om transaktion är till export."
+
#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr "Ange Avskrivning relaterade konton i Tillgångar Kategori {0} eller Bolag {1}"
@@ -38196,7 +38255,7 @@ msgstr "Ange Org.Nr. för Offentlig Förvaltning \"%s\""
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr "Ange Fast Tillgång Konto för Tillgång Kategori {0}"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:585
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:587
msgid "Please set Fixed Asset Account in {} against {}."
msgstr "Ange Tillgång Konto i {} mot {}."
@@ -38222,7 +38281,7 @@ msgstr "Ange Orealiserat Valutaväxling Resultat Konto i Bolag {0}"
msgid "Please set VAT Accounts in {0}"
msgstr "Ange Moms Konton i {0}"
-#: erpnext/regional/united_arab_emirates/utils.py:61
+#: erpnext/regional/united_arab_emirates/utils.py:83
msgid "Please set Vat Accounts for Company: \"{0}\" in UAE VAT Settings"
msgstr "Ange Moms Konton för Bolag: \"{0}\" i moms inställningarna i Förenade Arabemirater"
@@ -38230,11 +38289,11 @@ msgstr "Ange Moms Konton för Bolag: \"{0}\" i moms inställningarna i Förenade
msgid "Please set a Company"
msgstr "Ange Bolag"
-#: erpnext/assets/doctype/asset/asset.py:305
+#: erpnext/assets/doctype/asset/asset.py:306
msgid "Please set a Cost Center for the Asset or set an Asset Depreciation Cost Center for the Company {}"
msgstr "Ange Resultat Enhet för Tillgång eller ange Resultat Enhet för Tillgång Avskrivningar för Bolag {}"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1406
+#: erpnext/selling/doctype/sales_order/sales_order.py:1422
msgid "Please set a Supplier against the Items to be considered in the Purchase Order."
msgstr "Ange Leverantör mot Artiklar som ska inkluderas i Inköp Order."
@@ -38246,7 +38305,7 @@ msgstr "Ange standard Helg Lista för Bolag {0}"
msgid "Please set a default Holiday List for Employee {0} or Company {1}"
msgstr "Ange Standard Kalender för Personal {0} eller Bolag {1}"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1095
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1097
msgid "Please set account in Warehouse {0}"
msgstr "Ange Konto i Lager {0}"
@@ -38287,7 +38346,7 @@ msgstr "Ange Standard Kassa eller Bank Konto i Betalning Sätt {}"
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr "Ange Standard Kassa eller Bank Konto i Betalning Sätt {}"
-#: erpnext/accounts/utils.py:2314
+#: erpnext/accounts/utils.py:2318
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr "Ange Standard Valutaväxling Resultat Konto för Bolag {}"
@@ -38320,7 +38379,7 @@ msgstr "Ange Filter"
msgid "Please set one of the following:"
msgstr "Ange något av följande:"
-#: erpnext/assets/doctype/asset/asset.py:506
+#: erpnext/assets/doctype/asset/asset.py:522
msgid "Please set opening number of booked depreciations"
msgstr "Ange Öppning Nummer för Bokförda Avskrivningar"
@@ -38404,8 +38463,8 @@ msgid "Please specify Company"
msgstr "Ange Bolag"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:447
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:503
msgid "Please specify Company to proceed"
msgstr "Ange Bolag att fortsätta"
@@ -38612,8 +38671,8 @@ msgstr "Post Kostnader Konto"
#: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:61
#: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:66
#: erpnext/accounts/report/cheques_and_deposits_incorrectly_cleared/cheques_and_deposits_incorrectly_cleared.py:151
-#: erpnext/accounts/report/general_ledger/general_ledger.py:650
-#: erpnext/accounts/report/gross_profit/gross_profit.py:269
+#: erpnext/accounts/report/general_ledger/general_ledger.py:670
+#: erpnext/accounts/report/gross_profit/gross_profit.py:275
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:183
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:204
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
@@ -38645,7 +38704,7 @@ msgstr "Post Kostnader Konto"
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:127
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:104
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:86
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:449
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:492
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:24
#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:112
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:144
@@ -38660,7 +38719,7 @@ msgstr "Registrering Datum"
msgid "Posting Date Inheritance for Exchange Gain / Loss"
msgstr "Registrering Datum Ärvd för Växling Resultat"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:254
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:256
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:130
msgid "Posting Date cannot be future date"
msgstr "Registrering Datum kan inte vara i framtiden"
@@ -38700,7 +38759,7 @@ msgstr "Registrering Datum och Tid"
#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:275
+#: erpnext/accounts/report/gross_profit/gross_profit.py:281
#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -38999,7 +39058,7 @@ msgstr "Prislista Land"
msgid "Price List Currency"
msgstr "Prislista Valuta"
-#: erpnext/stock/get_item_details.py:1236
+#: erpnext/stock/get_item_details.py:1231
msgid "Price List Currency not selected"
msgstr "Prislista Valuta inte vald"
@@ -39668,7 +39727,7 @@ msgstr "Behandling Beskrivning"
msgid "Process Loss"
msgstr "Process Förlust"
-#: erpnext/manufacturing/doctype/bom/bom.py:1089
+#: erpnext/manufacturing/doctype/bom/bom.py:1126
msgid "Process Loss Percentage cannot be greater than 100"
msgstr "Process Förlust i Procent får inte vara större än 100 "
@@ -39687,7 +39746,7 @@ msgstr "Process Förlust i Procent får inte vara större än 100 "
msgid "Process Loss Qty"
msgstr "Process Förlust Kvantitet"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:293
+#: erpnext/manufacturing/doctype/job_card/job_card.js:301
msgid "Process Loss Quantity"
msgstr "Process Förlust Kvantitet"
@@ -40152,15 +40211,15 @@ msgstr "Framsteg(%)"
#: erpnext/accounts/doctype/psoa_project/psoa_project.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1052
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1061
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:109
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:74
#: erpnext/accounts/report/general_ledger/general_ledger.js:164
-#: erpnext/accounts/report/general_ledger/general_ledger.py:727
+#: erpnext/accounts/report/general_ledger/general_ledger.py:760
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
-#: erpnext/accounts/report/gross_profit/gross_profit.py:357
+#: erpnext/accounts/report/gross_profit/gross_profit.py:363
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:274
#: erpnext/accounts/report/purchase_register/purchase_register.py:207
@@ -40693,7 +40752,7 @@ msgstr "Inköp Detaljer"
#: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
#: erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:134
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:289
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:296
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js:30
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
@@ -40727,16 +40786,16 @@ msgstr "Inköp Faktura Artikel"
msgid "Purchase Invoice Trends"
msgstr "Inköp Faktura Trender"
-#: erpnext/assets/doctype/asset/asset.py:267
+#: erpnext/assets/doctype/asset/asset.py:268
msgid "Purchase Invoice cannot be made against an existing asset {0}"
msgstr "Inköp Faktura kan inte skapas mot befintlig tillgång {0}"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:431
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:445
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:433
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:447
msgid "Purchase Invoice {0} is already submitted"
msgstr "Inköp Faktura {0} är redan godkänd"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:2011
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:2013
msgid "Purchase Invoices"
msgstr "Inköp Fakturor"
@@ -40813,7 +40872,7 @@ msgstr "Inköp Huvudansvarig"
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#: erpnext/stock/doctype/material_request/material_request.js:179
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:246
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:250
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -40889,11 +40948,11 @@ msgstr "Inköp Order Artikel som inte mottogs i tid"
msgid "Purchase Order Pricing Rule"
msgstr "Inköp Order Pris Regel"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:624
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:626
msgid "Purchase Order Required"
msgstr "Inköp Order Erfodras"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:619
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:621
msgid "Purchase Order Required for item {}"
msgstr "Inköp Order Erfodras för Artikel {}"
@@ -40905,19 +40964,19 @@ msgstr "Inköp Order Erfodras för Artikel {}"
msgid "Purchase Order Trends"
msgstr "Inköp Order Diagram"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1179
+#: erpnext/selling/doctype/sales_order/sales_order.js:1182
msgid "Purchase Order already created for all Sales Order items"
msgstr "Inköp Order redan skapad för alla Försäljning Order Artiklar"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:320
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:322
msgid "Purchase Order number required for Item {0}"
msgstr "Inköp Order Nummer erfordras för Artikel {0}"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:662
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:664
msgid "Purchase Order {0} is not submitted"
msgstr "Inköp Order {0} ej godkänd"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:907
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:929
msgid "Purchase Orders"
msgstr "Inköp Ordrar"
@@ -40965,9 +41024,9 @@ msgstr "Inköp Prislista"
#. Reservation Entry'
#. Label of a Link in the Stock Workspace
#. Label of a shortcut in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:174
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:655
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:665
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:177
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:661
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:671
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:49
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:246
@@ -41030,11 +41089,11 @@ msgstr "Inköp Följesedel Artiklar"
msgid "Purchase Receipt No"
msgstr "Inköp Följesedel Nummer"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:645
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:647
msgid "Purchase Receipt Required"
msgstr "Inköp Följesedel Erfodras"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:640
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:642
msgid "Purchase Receipt Required for item {}"
msgstr "Inköp Följesedel Erfodras för Artikel {}"
@@ -41047,7 +41106,7 @@ msgstr "Inköp Följesedel Erfodras för Artikel {}"
msgid "Purchase Receipt Trends"
msgstr "Inköp Följesedel Diagram"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:384
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:391
msgid "Purchase Receipt doesn't have any Item for which Retain Sample is enabled."
msgstr "Inköp Följesedel innehar inte någon Artikel som Behåll Prov är aktiverad för."
@@ -41055,7 +41114,7 @@ msgstr "Inköp Följesedel innehar inte någon Artikel som Behåll Prov är akti
msgid "Purchase Receipt {0} created."
msgstr "Inköp Följesedel {0} skapad"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:669
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:671
msgid "Purchase Receipt {0} is not submitted"
msgstr "Inköp Följesedel {0} ej godkänd"
@@ -41066,7 +41125,7 @@ msgstr "Inköp Följesedel {0} ej godkänd"
msgid "Purchase Register"
msgstr "Inköp Register"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:279
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:286
msgid "Purchase Return"
msgstr "Inköp Retur"
@@ -41262,14 +41321,14 @@ msgstr "Lägg Undan Regel finns redan för Artikel {0} i Lager {1}."
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91
-#: erpnext/accounts/report/gross_profit/gross_profit.py:314
+#: erpnext/accounts/report/gross_profit/gross_profit.py:320
#: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json
#: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240
#: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:224
#: erpnext/controllers/trends.py:242 erpnext/controllers/trends.py:254
#: erpnext/controllers/trends.py:259
#: erpnext/crm/doctype/opportunity_item/opportunity_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:964
+#: erpnext/manufacturing/doctype/bom/bom.js:999
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
#: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
@@ -41289,8 +41348,8 @@ msgstr "Lägg Undan Regel finns redan för Artikel {0} i Lager {1}."
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:367
#: erpnext/selling/doctype/sales_order/sales_order.js:471
-#: erpnext/selling/doctype/sales_order/sales_order.js:863
-#: erpnext/selling/doctype/sales_order/sales_order.js:1015
+#: erpnext/selling/doctype/sales_order/sales_order.js:866
+#: erpnext/selling/doctype/sales_order/sales_order.js:1018
#: 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_voucher/landed_cost_voucher.json
@@ -41374,7 +41433,7 @@ msgstr "Kvantitet per Enhet"
#. Label of the for_quantity (Float) field in DocType 'Job Card'
#. Label of the qty (Float) field in DocType 'Work Order'
-#: erpnext/manufacturing/doctype/bom/bom.js:309
+#: erpnext/manufacturing/doctype/bom/bom.js:330
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/manufacturing/report/process_loss_report/process_loss_report.py:82
@@ -41489,7 +41548,7 @@ msgstr "Kvantitet att Leverera"
msgid "Qty to Fetch"
msgstr "Kvantitet att Hämta"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:265
+#: erpnext/manufacturing/doctype/job_card/job_card.js:273
#: erpnext/manufacturing/doctype/job_card/job_card.py:765
msgid "Qty to Manufacture"
msgstr "Kvantitet att Producera"
@@ -41502,6 +41561,8 @@ msgstr "Kvantitet att Producera"
msgid "Qty to Order"
msgstr "Kvantitet att Beställa"
+#. Label of the finished_good_qty (Float) field in DocType 'BOM Operation'
+#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
#: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:129
msgid "Qty to Produce"
msgstr "Kvantitet att Producera"
@@ -41628,7 +41689,7 @@ msgstr "Kvalitet Målsättning Avsikt"
#: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:186
+#: erpnext/manufacturing/doctype/bom/bom.js:207
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/quality_management/workspace/quality/quality.json
@@ -41703,7 +41764,7 @@ msgstr "Kvalitet Kontroll Mall"
msgid "Quality Inspection Template Name"
msgstr "Kvalitet Kontroll Mall Namn"
-#: erpnext/public/js/controllers/transaction.js:359
+#: erpnext/public/js/controllers/transaction.js:360
#: erpnext/stock/doctype/stock_entry/stock_entry.js:165
msgid "Quality Inspection(s)"
msgstr "Kvalitet Kontroll"
@@ -41821,7 +41882,7 @@ msgstr "Kvalitet Granskning Avsikt"
#: erpnext/buying/report/purchase_analytics/purchase_analytics.js:28
#: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:213
#: erpnext/manufacturing/doctype/blanket_order_item/blanket_order_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:396
+#: erpnext/manufacturing/doctype/bom/bom.js:417
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.js:68
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.json
@@ -41848,7 +41909,7 @@ msgstr "Kvalitet Granskning Avsikt"
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py:36
#: erpnext/stock/report/delayed_item_report/delayed_item_report.py:154
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:423
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:466
#: erpnext/stock/report/stock_analytics/stock_analytics.js:27
#: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
#: erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json
@@ -41970,8 +42031,8 @@ msgid "Quantity required for Item {0} in row {1}"
msgstr "Kvantitet som erfodras för artikel {0} på rad {1}"
#: erpnext/manufacturing/doctype/bom/bom.py:604
-#: erpnext/manufacturing/doctype/job_card/job_card.js:321
-#: erpnext/manufacturing/doctype/job_card/job_card.js:390
+#: erpnext/manufacturing/doctype/job_card/job_card.js:329
+#: erpnext/manufacturing/doctype/job_card/job_card.js:398
#: erpnext/manufacturing/doctype/workstation/workstation.js:303
msgid "Quantity should be greater than 0"
msgstr "Kvantitet ska vara högre än 0"
@@ -42000,7 +42061,7 @@ msgstr "Kvantitet att Producera"
msgid "Quantity to Produce should be greater than zero."
msgstr "Kvantitet att producera ska vara högre än noll."
-#: erpnext/public/js/utils/barcode_scanner.js:236
+#: erpnext/public/js/utils/barcode_scanner.js:262
msgid "Quantity to Scan"
msgstr "Kvantitet att Skanna"
@@ -42131,7 +42192,7 @@ msgstr "Offert/Potentiell Kund %"
#. Label of the prevdoc_docname (Link) field in DocType 'Sales Order Item'
#. Label of a Link in the Selling Workspace
#. Option for the 'Transaction' (Select) field in DocType 'Authorization Rule'
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:277
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:280
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:36
#: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html:20
#: erpnext/crm/doctype/contract/contract.json
@@ -42198,7 +42259,7 @@ msgstr "Försäljning Offert {0} är annullerad"
msgid "Quotation {0} not of type {1}"
msgstr "Försäljning Offert {0} inte av typ {1}"
-#: erpnext/selling/doctype/quotation/quotation.py:343
+#: erpnext/selling/doctype/quotation/quotation.py:345
#: erpnext/selling/page/sales_funnel/sales_funnel.py:57
msgid "Quotations"
msgstr "Offerter"
@@ -42650,8 +42711,8 @@ msgstr "Råmaterial Lager"
#. Label of the materials_section (Section Break) field in DocType 'BOM'
#. Label of the section_break_8 (Section Break) field in DocType 'Job Card'
#. Label of the mr_items (Table) field in DocType 'Production Plan'
-#: erpnext/manufacturing/doctype/bom/bom.js:349
-#: erpnext/manufacturing/doctype/bom/bom.js:938
+#: erpnext/manufacturing/doctype/bom/bom.js:370
+#: erpnext/manufacturing/doctype/bom/bom.js:972
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
@@ -42814,7 +42875,7 @@ msgid "Reason"
msgstr "Anledning"
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:282
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr "Spärr Anledning"
@@ -42825,7 +42886,7 @@ msgid "Reason for Failure"
msgstr "Anledning för Fel"
#: erpnext/buying/doctype/purchase_order/purchase_order.js:748
-#: erpnext/selling/doctype/sales_order/sales_order.js:1338
+#: erpnext/selling/doctype/sales_order/sales_order.js:1341
msgid "Reason for Hold"
msgstr "Anledning för Spärr"
@@ -42834,7 +42895,7 @@ msgstr "Anledning för Spärr"
msgid "Reason for Leaving"
msgstr "Anledning för Avgång"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1353
+#: erpnext/selling/doctype/sales_order/sales_order.js:1356
msgid "Reason for hold:"
msgstr "Anledning för Spärr:"
@@ -43204,7 +43265,7 @@ msgstr "Inspelning URL"
msgid "Records"
msgstr "Register"
-#: erpnext/regional/united_arab_emirates/utils.py:171
+#: erpnext/regional/united_arab_emirates/utils.py:193
msgid "Recoverable Standard Rated expenses should not be set when Reverse Charge Applicable is Y"
msgstr "Återställbara Standard Klassade Kostnader ska inte anges när Omvänd Debitering är Ja"
@@ -43646,11 +43707,11 @@ msgstr "Referens: {0}, Artikel Nummer: {1} och Kund: {2}"
msgid "References"
msgstr "Referenser"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:385
msgid "References to Sales Invoices are Incomplete"
msgstr "Referenser till Försäljning Fakturor är ofullständiga"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:380
msgid "References to Sales Orders are Incomplete"
msgstr "Referenser till Försäljning Ordrar är ofullständiga"
@@ -43795,14 +43856,14 @@ msgstr "Relation"
#. Label of the release_date (Date) field in DocType 'Purchase Invoice'
#. Label of the release_date (Date) field in DocType 'Supplier'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:268
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:312
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:274
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:318
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
msgstr "Frisläppande Datum"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:315
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:317
msgid "Release date must be in the future"
msgstr "Utgivning Datum måste vara i framtiden"
@@ -43877,7 +43938,7 @@ msgstr "Anmärkning"
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1254
#: erpnext/accounts/report/general_ledger/general_ledger.html:84
#: erpnext/accounts/report/general_ledger/general_ledger.html:110
-#: erpnext/accounts/report/general_ledger/general_ledger.py:752
+#: erpnext/accounts/report/general_ledger/general_ledger.py:785
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112
#: erpnext/accounts/report/purchase_register/purchase_register.py:296
#: erpnext/accounts/report/sales_register/sales_register.py:335
@@ -43974,8 +44035,8 @@ msgstr "Hyrd"
#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:58
#: erpnext/crm/doctype/opportunity/opportunity.js:130
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:354
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:305
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:360
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:312
#: erpnext/support/doctype/issue/issue.js:39
msgid "Reopen"
msgstr "Återöppna"
@@ -44608,7 +44669,7 @@ msgstr "Reserverad Kvantitet för Underleverantör"
msgid "Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items."
msgstr "Reserverad Kvantitet för Underleverantör: Råmaterial kvantitet för att producera underleverantör artiklar."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:606
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:608
msgid "Reserved Qty should be greater than Delivered Qty."
msgstr "Reserverad Kvantitet ska vara högre än Levererad Kvantitet."
@@ -44909,7 +44970,7 @@ msgstr "Resultat Benämning Fält"
msgid "Resume"
msgstr "Återuppta"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:200
+#: erpnext/manufacturing/doctype/job_card/job_card.js:208
msgid "Resume Job"
msgstr "Återuppta Jobb"
@@ -44939,7 +45000,7 @@ msgstr "Bevara Prov"
msgid "Retained Earnings"
msgstr "Balanserad Resultat"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:295
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:302
msgid "Retention Stock Entry"
msgstr "Prov Lager Post"
@@ -45033,13 +45094,13 @@ msgstr "Returnera Komponenter"
msgid "Return Issued"
msgstr "Retur Skapad"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:355
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:362
msgid "Return Qty"
msgstr "Retur Kvantitet"
#. Label of the return_qty_from_rejected_warehouse (Check) field in DocType
#. 'Purchase Receipt Item'
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:331
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:338
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
msgid "Return Qty from Rejected Warehouse"
msgstr "Retur Kvantitet från Avvisad Lager"
@@ -45505,12 +45566,12 @@ msgstr "Rad # {0}: Returnerad Artikel {1} finns inte i {2} {3}"
msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr "Rad #1: Sekvens ID måste vara 1 för Åtgärd {0}."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:518
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1919
msgid "Row #{0} (Payment Table): Amount must be negative"
msgstr "Rad # {0} (Betalning Tabell): Belopp måste vara negativ"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:515
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:516
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr "Rad # {0} (Betalning Tabell): Belopp måste vara positiv"
@@ -45569,7 +45630,7 @@ msgstr "Rad #{0}: Tillgång {1} är redan såld"
msgid "Row #{0}: BOM is not specified for subcontracting item {0}"
msgstr "Rad # {0}: Stycklista är inte specificerad för Underleverantör Artikel {0}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:405
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:407
msgid "Row #{0}: Batch No {1} is already selected."
msgstr "Rad # {0}: Parti Nummer {1} är redan vald."
@@ -45605,7 +45666,7 @@ msgstr "Rad #{0}: Kan inte ange Pris om fakturerad belopp är högre än belopp
msgid "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}"
msgstr "Rad # {0}: Kan inte överföra mer än Erforderlig Kvantitet {1} för Artikel {2} mot Jobbkort {3}"
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:86
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:87
msgid "Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save"
msgstr "Rad # {0}: Underordnad Artikel ska inte vara Artikel Paket. Ta Bort Artikel {1} och Spara"
@@ -45645,7 +45706,7 @@ msgstr "Rad # {0}: Datum överlappar andra rad "
msgid "Row #{0}: Default BOM not found for FG Item {1}"
msgstr "Rad # {0}: Standard Stycklista hittades inte för Färdig Artikel {1} "
-#: erpnext/assets/doctype/asset/asset.py:533
+#: erpnext/assets/doctype/asset/asset.py:549
msgid "Row #{0}: Depreciation Start Date is required"
msgstr "Rad # #{0}: Avskrivning Start Datum erfordras"
@@ -45697,7 +45758,7 @@ msgstr "Rad # {0}: Från Datum kan inte vara före Till Datum"
msgid "Row #{0}: From Time and To Time fields are required"
msgstr "Rad #{0}: Fält Från Tid och Till Tid erfordras"
-#: erpnext/public/js/utils/barcode_scanner.js:394
+#: erpnext/public/js/utils/barcode_scanner.js:428
msgid "Row #{0}: Item added"
msgstr "Rad # {0}: Artikel Lagt till"
@@ -45705,7 +45766,7 @@ msgstr "Rad # {0}: Artikel Lagt till"
msgid "Row #{0}: Item {1} does not exist"
msgstr "Rad # {0}: Artikel {1} finns inte"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1549
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr "Rad # {0}: Artikel {1} är plockad, reservera lager från Plocklista. "
@@ -45729,11 +45790,11 @@ msgstr "Rad # {0}: Artikel {1} är inte service artikel"
msgid "Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher"
msgstr "Rad # {0}: Journal Post {1} har inte konto {2} eller redan avstämd mot annan verifikat"
-#: erpnext/assets/doctype/asset/asset.py:527
+#: erpnext/assets/doctype/asset/asset.py:543
msgid "Row #{0}: Next Depreciation Date cannot be before Available-for-use Date"
msgstr "Rad #{0}: Nästa avskrivning datum kan inte vara före datum för tillgänglig för användning"
-#: erpnext/assets/doctype/asset/asset.py:522
+#: erpnext/assets/doctype/asset/asset.py:538
msgid "Row #{0}: Next Depreciation Date cannot be before Purchase Date"
msgstr "Rad #{0}: Nästa avskrivning datum kan inte vara före inköp datum"
@@ -45741,11 +45802,11 @@ msgstr "Rad #{0}: Nästa avskrivning datum kan inte vara före inköp datum"
msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
msgstr "Rad # {0}: Otillåtet att ändra Leverantör eftersom Inköp Order finns redan"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1632
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr "Rad # {0}: Endast {1} tillgänglig att reservera för artikel {2} "
-#: erpnext/assets/doctype/asset/asset.py:499
+#: erpnext/assets/doctype/asset/asset.py:515
msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}"
msgstr "Rad #{0}: Ingående Ackumulerad Avskrivning måste vara lägre än eller lika med {1}"
@@ -45753,15 +45814,15 @@ msgstr "Rad #{0}: Ingående Ackumulerad Avskrivning måste vara lägre än eller
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 "Rad # {0}: Åtgärd {1} är inte Klar för {2} Kvantitet färdiga artiklar i Arbetsorder {3}. Uppdatera drift status via Jobbkort {4}."
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1009
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1010
msgid "Row #{0}: Please select Item Code in Assembly Items"
msgstr "Rad # {0}: Välj Artikel Kod för Montering Artiklar"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1012
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1013
msgid "Row #{0}: Please select the BOM No in Assembly Items"
msgstr "Rad # {0}: Välj Stycklista Nummer för Montering Artiklar"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1006
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1007
msgid "Row #{0}: Please select the Sub Assembly Warehouse"
msgstr "Rad #{0}: Välj Underenhet Lager"
@@ -45773,7 +45834,7 @@ msgstr "Rad # {0}: Ange Ombeställning Kvantitet"
msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master"
msgstr "Rad # {0}: Uppdatera konto för uppskjutna intäkter/kostnader i artikel rad eller standard konto i bolag"
-#: erpnext/public/js/utils/barcode_scanner.js:392
+#: erpnext/public/js/utils/barcode_scanner.js:426
msgid "Row #{0}: Qty increased by {1}"
msgstr "Rad # {0}: Kvantitet ökade med {1}"
@@ -45782,7 +45843,7 @@ msgstr "Rad # {0}: Kvantitet ökade med {1}"
msgid "Row #{0}: Qty must be a positive number"
msgstr "Rad # {0}: Kvantitet måste vara psitivt tal"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:393
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:395
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 "Rad # {0}: Kvantitet ska vara mindre än eller lika med tillgänglig kvantitet att reservera (verklig antal - reserverad antal) {1} för artikel {2} mot parti {3} i lager {4}."
@@ -45798,12 +45859,16 @@ msgstr "Rad #{0}: Kvalitet Kontroll {1} är inte godkänd för artikel: {2}"
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr "Rad #{0}: Kvalitet Kontroll {1} avvisades för artikel {2}"
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:96
+msgid "Row #{0}: Quantity cannot be a non-positive number. Please increase the quantity or remove the Item {1}"
+msgstr "Rad #{0}: Kvantitet kan inte vara negativ tal. Ange kvantitet eller ta bort artikel {1}"
+
#: erpnext/controllers/accounts_controller.py:1375
#: erpnext/controllers/accounts_controller.py:3663
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr "Rad # {0}: Kvantitet för Artikel {1} kan inte vara noll."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1617
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr "Rad # {0}: Kvantitet att reservera för Artikel {1} ska vara högre än 0."
@@ -45856,11 +45921,11 @@ msgstr "Rad #{0}: Sekvens ID måste vara {1} eller {2} för Åtgärd {3}."
msgid "Row #{0}: Serial No {1} does not belong to Batch {2}"
msgstr "Rad # {0}: Serie Nummer {1} tillhör inte Parti {2}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:342
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:344
msgid "Row #{0}: Serial No {1} for Item {2} is not available in {3} {4} or might be reserved in another {5}."
msgstr "Rad # {0}: Serie Nummer {1} för artikel {2} är inte tillgänglig i {3} {4} eller kan vara reserverad i annan {5}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:358
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:360
msgid "Row #{0}: Serial No {1} is already selected."
msgstr "Rad # {0}: Serie Nummer {1} är redan vald."
@@ -45880,6 +45945,10 @@ msgstr "Rad # {0}: Service start och slutdatum erfordras för uppskjuten Bokför
msgid "Row #{0}: Set Supplier for item {1}"
msgstr "Rad # {0}: Ange Leverantör för artikel {1}"
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1017
+msgid "Row #{0}: Since 'Track Semi Finished Goods' is enabled, the BOM {1} cannot be used for Sub Assembly Items"
+msgstr "Rad #{0}: Eftersom \"Spåra Halvfärdiga Artiklar\" är aktiverat kan inte Stycklista {1} användas för underenhet artiklar"
+
#: erpnext/manufacturing/doctype/workstation/workstation.py:92
msgid "Row #{0}: Start Time and End Time are required"
msgstr "Rad # {0}: Från Tid och till Tid erfordras."
@@ -45896,32 +45965,32 @@ msgstr "Rad # {0}: Status erfordras"
msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}"
msgstr "Rad # {0}: Status måste vara {1} för Faktura Rabatt {2}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:367
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:369
msgid "Row #{0}: Stock cannot be reserved for Item {1} against a disabled Batch {2}."
msgstr "Rad # {0}: Lager kan inte reserveras för artikel {1} mot inaktiverad Parti {2}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1562
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr "Rad # {0}: Lager kan inte reserveras för artikel som inte finns i lager {1}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1575
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr "Rad # {0}: Lager kan inte reserveras i Grupp Lager {1}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1589
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr "Rad # {0}: Lager är redan reserverad för artikel {1}."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:539
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr "Rad # {0}: Lager är reserverad för artikel {1} i lager {2}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:377
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:379
msgid "Row #{0}: Stock not available to reserve for Item {1} against Batch {2} in Warehouse {3}."
msgstr "Rad # {0}: Lager är inte tillgänglig att reservera för artikel {1} mot Parti {2} i Lager {3}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1224
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1603
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr "Rad # {0}: Kvantitet ej tillgänglig för reservation för Artikel {1} på {2} Lager."
@@ -45937,7 +46006,7 @@ msgstr "Rad # {0}: Lager {1} är inte underordnad till grupp lager {2}"
msgid "Row #{0}: Timings conflicts with row {1}"
msgstr "Rad # {0}: Tid Konflikt med rad {1}"
-#: erpnext/assets/doctype/asset/asset.py:512
+#: erpnext/assets/doctype/asset/asset.py:528
msgid "Row #{0}: Total Number of Depreciations cannot be less than or equal to Opening Number of Booked Depreciations"
msgstr "Rad # #{0}: Totalt Antal Avskrivningar får inte vara mindre än eller lika med antal bokförda avskrivningar"
@@ -46009,11 +46078,11 @@ msgstr "Rad #{idx}: {schedule_date} kan inte vara före {transaction_date}."
msgid "Row #{}: Currency of {} - {} doesn't matches company currency."
msgstr "Rad # {}: Valuta för {} - {} matchar inte bolag valuta."
-#: erpnext/assets/doctype/asset/asset.py:349
+#: erpnext/assets/doctype/asset/asset.py:350
msgid "Row #{}: Finance Book should not be empty since you're using multiple."
msgstr "Rad # {}: Finans Register ska inte vara tom eftersom du använder flera."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:406
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:407
msgid "Row #{}: Item Code: {} is not available under warehouse {}."
msgstr "Rad # {}: Artikel Kod: {} är inte tillgänglig på Lager {}."
@@ -46033,23 +46102,23 @@ msgstr "Rad # {}: Kassa Faktura {} ej godkänd ännu"
msgid "Row #{}: Please assign task to a member."
msgstr "Rad # {}: Tilldela uppgift till medlem."
-#: erpnext/assets/doctype/asset/asset.py:341
+#: erpnext/assets/doctype/asset/asset.py:342
msgid "Row #{}: Please use a different Finance Book."
msgstr "Rad # {}: Använd annan Finans Register."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:477
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:478
msgid "Row #{}: Serial No {} cannot be returned since it was not transacted in original invoice {}"
msgstr "Rad # {}: Serie Nummer {} kan inte returneras eftersom den inte ingick i original faktura {}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:413
-msgid "Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}. Available quantity {}."
-msgstr "Rad # {}: Lager Kvantitet räcker inte för Artikel Kod: {} på Lager {}. Tillgänglig Kvantitet {}."
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:414
+msgid "Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}."
+msgstr "Rad #{}: Lager kvantitet är inte tillräcklig för Artikel Kod: {} på lager {}."
#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:104
msgid "Row #{}: The original Invoice {} of return invoice {} is not consolidated."
msgstr "Rad #{}: Ursprunglig Faktura {} för Retur Faktura {} är inte konsoliderad."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:450
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:451
msgid "Row #{}: You cannot add positive quantities in a return invoice. Please remove item {} to complete the return."
msgstr "Rad # {}: Man kan inte lägga till positiva kvantiteter i retur faktura. Ta bort artikel {} för att slutföra retur."
@@ -46070,7 +46139,7 @@ msgstr "Rad # {}: {} {} finns inte."
msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}."
msgstr "Rad # {}: {} {} tillhör inte bolag {}. Välj giltig {}."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:434
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:436
msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}"
msgstr "Rad # {0}: Lager erfordras. Ange Standard Lager för Artikel {1} och Bolag {2}"
@@ -46179,19 +46248,19 @@ msgstr "Rad # {0}: Antingen Följesedel eller Packad Artikel Referens erfordras"
msgid "Row {0}: Exchange Rate is mandatory"
msgstr "Rad # {0}: Valutaväxling Kurs erfordras"
-#: erpnext/assets/doctype/asset/asset.py:474
+#: erpnext/assets/doctype/asset/asset.py:490
msgid "Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount"
msgstr "Rad # {0}: Förväntad värde efter nyttjande tid måste vara mindre än Brutto Inköp Belopp"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:525
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:527
msgid "Row {0}: Expense Head changed to {1} as no Purchase Receipt is created against Item {2}."
msgstr "Rad # {0}: Kostnad har ändrats till {1} eftersom inget Inköp Följesedel är skapad mot Artikel {2}."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:482
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:484
msgid "Row {0}: Expense Head changed to {1} because account {2} is not linked to warehouse {3} or it is not the default inventory account"
msgstr "Rad # {0}: Kostnad har ändrats till {1} eftersom konto {2} inte är länkat till lager {3} eller det inte är standard konto för lager"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:507
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:509
msgid "Row {0}: Expense Head changed to {1} because expense is booked against this account in Purchase Receipt {2}"
msgstr "Rad # {0}: Kostnad har ändrats till {1} eftersom kostnad bokförs mot detta konto i Inköp Följesedel {2}"
@@ -46244,7 +46313,7 @@ msgstr "Rad # {0}: Artikel {1} måste vara Underleverantör Artikel."
msgid "Row {0}: Item {1}'s quantity cannot be higher than the available quantity."
msgstr "Rad {0}: Artikel {1} kvantitet kan inte vara högre än tillgänglig kvantitet."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:596
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr "Rad # {0}: Packad Kvantitet måste vara lika med {1} Kvantitet."
@@ -46360,7 +46429,7 @@ msgstr "Rad # {0}: För att ange periodicitet för {1} måste skillnaden mellan
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr "Rad # {0}: Enhet Konvertering Faktor erfordras"
-#: erpnext/manufacturing/doctype/bom/bom.py:1072
+#: erpnext/manufacturing/doctype/bom/bom.py:1109
#: erpnext/manufacturing/doctype/work_order/work_order.py:277
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr "Rad {0}: Arbetsplats eller Arbetsplats Typ erfordras för åtgärd {1}"
@@ -46588,6 +46657,8 @@ msgstr "Löneutbetalning Sätt"
#: erpnext/accounts/doctype/shipping_rule/shipping_rule_dashboard.py:10
#: erpnext/accounts/doctype/tax_category/tax_category_dashboard.py:9
#: erpnext/accounts/doctype/tax_rule/tax_rule.json
+#: erpnext/crm/doctype/opportunity/opportunity.js:288
+#: erpnext/crm/doctype/opportunity/opportunity.py:158
#: erpnext/projects/doctype/project/project_dashboard.py:15
#: erpnext/regional/report/vat_audit_report/vat_audit_report.py:185
#: erpnext/selling/doctype/quotation/quotation.json
@@ -46680,8 +46751,8 @@ msgstr "Försäljning Inköp Pris"
#: erpnext/accounts/doctype/sales_invoice_reference/sales_invoice_reference.json
#: erpnext/accounts/print_format/sales_auditing_voucher/sales_auditing_voucher.html:5
#: erpnext/accounts/report/gross_profit/gross_profit.js:30
-#: erpnext/accounts/report/gross_profit/gross_profit.py:256
-#: erpnext/accounts/report/gross_profit/gross_profit.py:263
+#: erpnext/accounts/report/gross_profit/gross_profit.py:262
+#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: erpnext/accounts/workspace/accounting/accounting.json
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/crm/doctype/contract/contract.json
@@ -46693,7 +46764,7 @@ msgstr "Försäljning Inköp Pris"
#: erpnext/selling/workspace/selling/selling.json
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/setup/workspace/home/home.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:343
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:349
#: erpnext/stock/doctype/delivery_note/delivery_note_list.js:65
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
msgid "Sales Invoice"
@@ -46771,11 +46842,11 @@ msgstr "Försäljning Faktura är inte godkänd"
msgid "Sales Invoice isn't created by user {}"
msgstr "Försäljning Faktura skapas inte av {}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:422
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:423
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr "Försäljning Faktura Läge är aktiverad för Kassa. Skapa Försäljning Faktura istället."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:616
msgid "Sales Invoice {0} has already been submitted"
msgstr "Försäljning Faktura {0} är redan godkänd"
@@ -46919,7 +46990,7 @@ msgstr "Försäljning Möjligheter efter Källa"
#: erpnext/selling/workspace/selling/selling.json
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.js:160
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:223
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:226
#: erpnext/stock/doctype/material_request/material_request.js:219
#: erpnext/stock/doctype/material_request_item/material_request_item.json
#: erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -46971,7 +47042,7 @@ msgstr "Försäljning Order Datum"
#: erpnext/manufacturing/doctype/production_plan_item_reference/production_plan_item_reference.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/selling/doctype/sales_order/sales_order.js:313
-#: erpnext/selling/doctype/sales_order/sales_order.js:870
+#: erpnext/selling/doctype/sales_order/sales_order.js:873
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/stock/doctype/material_request_item/material_request_item.json
#: erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -47004,7 +47075,7 @@ msgstr "Försäljning Order Status"
msgid "Sales Order Trends"
msgstr "Försäljning Order Trender"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:268
msgid "Sales Order required for Item {0}"
msgstr "Försäljning Order erfordras för Artikel {0}"
@@ -47174,7 +47245,7 @@ msgstr "Försäljning Betalning Översikt"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:191
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:80
#: erpnext/accounts/report/gross_profit/gross_profit.js:50
-#: erpnext/accounts/report/gross_profit/gross_profit.py:371
+#: erpnext/accounts/report/gross_profit/gross_profit.py:377
#: erpnext/crm/workspace/crm/crm.json
#: erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
#: erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
@@ -47255,8 +47326,8 @@ msgstr "Försäljning Register"
msgid "Sales Representative"
msgstr "Försäljningsrepresentant"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:857
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:267
+#: erpnext/accounts/report/gross_profit/gross_profit.py:874
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:273
msgid "Sales Return"
msgstr "Försäljning Retur"
@@ -47514,8 +47585,8 @@ msgstr "Lördag"
#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js:119
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:628
#: erpnext/accounts/doctype/ledger_merge/ledger_merge.js:75
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:292
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:328
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47553,7 +47624,7 @@ msgstr "Sazhen"
#: 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/public/js/utils/barcode_scanner.js:215
+#: erpnext/public/js/utils/barcode_scanner.js:241
#: erpnext/selling/doctype/quotation/quotation.json
#: erpnext/selling/doctype/sales_order/sales_order.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -47585,7 +47656,7 @@ msgstr "Skanning Läge"
msgid "Scan Serial No"
msgstr "Skanna Serie Nummer"
-#: erpnext/public/js/utils/barcode_scanner.js:179
+#: erpnext/public/js/utils/barcode_scanner.js:205
msgid "Scan barcode for item {0}"
msgstr "Skanna Streckkod för artikel {0}"
@@ -47599,7 +47670,7 @@ msgstr "Skanning Läge aktiverad, befintlig kvantitet kommer inte att hämtas."
msgid "Scanned Cheque"
msgstr "Skannad Check"
-#: erpnext/public/js/utils/barcode_scanner.js:247
+#: erpnext/public/js/utils/barcode_scanner.js:273
msgid "Scanned Quantity"
msgstr "Skannad Kvantitet"
@@ -47893,7 +47964,7 @@ msgid "Segregate Serial / Batch Bundle"
msgstr "Skilj Serie / Parti Paket"
#: erpnext/buying/doctype/purchase_order/purchase_order.js:250
-#: erpnext/selling/doctype/sales_order/sales_order.js:1107
+#: erpnext/selling/doctype/sales_order/sales_order.js:1110
#: erpnext/selling/doctype/sales_order/sales_order_list.js:96
#: erpnext/selling/report/sales_analytics/sales_analytics.js:93
msgid "Select"
@@ -47915,15 +47986,15 @@ msgstr "Välj Alternativ Artikel för Försäljning Order"
msgid "Select Attribute Values"
msgstr "Välj Egenskap Värden"
-#: erpnext/selling/doctype/sales_order/sales_order.js:853
+#: erpnext/selling/doctype/sales_order/sales_order.js:856
msgid "Select BOM"
msgstr "Välj Stycklista"
-#: erpnext/selling/doctype/sales_order/sales_order.js:834
+#: erpnext/selling/doctype/sales_order/sales_order.js:837
msgid "Select BOM and Qty for Production"
msgstr "Välj Stycklista och Kvantitet för Produktion"
-#: erpnext/selling/doctype/sales_order/sales_order.js:985
+#: erpnext/selling/doctype/sales_order/sales_order.js:988
msgid "Select BOM, Qty and For Warehouse"
msgstr "Välj Stycklista, Kvantitet och Till Lager"
@@ -47953,7 +48024,7 @@ msgstr "Välj Kolumner och Filter"
msgid "Select Company"
msgstr "Välj Bolag"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:468
+#: erpnext/manufacturing/doctype/job_card/job_card.js:476
msgid "Select Corrective Operation"
msgstr "Välj Korrigerande Åtgärd"
@@ -47994,7 +48065,7 @@ msgstr "Välj Avsändning Adress "
msgid "Select DocType"
msgstr "Välj DocType"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:186
+#: erpnext/manufacturing/doctype/job_card/job_card.js:194
msgid "Select Employees"
msgstr "Välj Personal"
@@ -48002,12 +48073,12 @@ msgstr "Välj Personal"
msgid "Select Finished Good"
msgstr "Välj Färdig Artikel"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1186
-#: erpnext/selling/doctype/sales_order/sales_order.js:1198
+#: erpnext/selling/doctype/sales_order/sales_order.js:1189
+#: erpnext/selling/doctype/sales_order/sales_order.js:1201
msgid "Select Items"
msgstr "Välj Artiklar"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1072
+#: erpnext/selling/doctype/sales_order/sales_order.js:1075
msgid "Select Items based on Delivery Date"
msgstr "Välj Artiklar baserad på Leverans Datum"
@@ -48018,7 +48089,7 @@ msgstr " Välj Artiklar för Kvalitet Kontroll"
#. Label of the select_items_to_manufacture_section (Section Break) field in
#. DocType 'Production Plan'
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:881
+#: erpnext/selling/doctype/sales_order/sales_order.js:884
msgid "Select Items to Manufacture"
msgstr "Välj Artiklar att Producera"
@@ -48032,7 +48103,7 @@ msgstr "Välj Artiklar baserad på Leverans Datum"
msgid "Select Job Worker Address"
msgstr "Välj Jobb Ansvarig Adress"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1118
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1127
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:955
msgid "Select Loyalty Program"
msgstr "Välj Lojalitet Program"
@@ -48166,7 +48237,7 @@ msgstr "Välj Finans Register för artikel {0} på rad {1}"
msgid "Select item group"
msgstr "Välj Artikel Grupp"
-#: erpnext/manufacturing/doctype/bom/bom.js:376
+#: erpnext/manufacturing/doctype/bom/bom.js:397
msgid "Select template item"
msgstr "Välj Mall Artikel"
@@ -48183,7 +48254,7 @@ msgstr "Välj Standard Arbetsstation där Åtgärd ska utföras. Detta kommer at
msgid "Select the Item to be manufactured."
msgstr "Välj Artikel som ska produceras."
-#: erpnext/manufacturing/doctype/bom/bom.js:858
+#: erpnext/manufacturing/doctype/bom/bom.js:879
msgid "Select the Item to be manufactured. The Item name, UoM, Company, and Currency will be fetched automatically."
msgstr "Välj Artikel som ska produceras. Artikel Namn, Enhet, Bolag och Valuta kommer att hämtas automatiskt."
@@ -48204,11 +48275,11 @@ msgstr "Välj datum"
msgid "Select the date and your timezone"
msgstr "Välj Datum och Tidzon"
-#: erpnext/manufacturing/doctype/bom/bom.js:877
+#: erpnext/manufacturing/doctype/bom/bom.js:898
msgid "Select the raw materials (Items) required to manufacture the Item"
msgstr "Välj Råmaterial (Artiklar) som erfordras för att producera artikel"
-#: erpnext/manufacturing/doctype/bom/bom.js:431
+#: erpnext/manufacturing/doctype/bom/bom.js:452
msgid "Select variant item code for the template item {0}"
msgstr "Välj Variant Artikel Kod för Artikel Mall {0}"
@@ -48293,7 +48364,7 @@ msgstr "Sälj Tillgång"
msgid "Selling"
msgstr "Försäljning"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:330
+#: erpnext/accounts/report/gross_profit/gross_profit.py:336
msgid "Selling Amount"
msgstr "Försäljning Belopp"
@@ -48465,7 +48536,7 @@ msgstr "Serie Nummer & Parti Inställningar"
msgid "Serial / Batch Bundle"
msgstr "Serie / Parti Paket"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:441
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:442
msgid "Serial / Batch Bundle Missing"
msgstr "Serie / Parti Paket Saknas"
@@ -48542,7 +48613,7 @@ msgstr "Serie / Parti Nummer"
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:65
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:149
#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:37
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:409
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:436
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:38
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:60
#: erpnext/stock/report/stock_ledger/stock_ledger.py:336
@@ -48642,7 +48713,7 @@ msgstr "Serie Nummer erfordras för Artikel {0}"
msgid "Serial No {0} already exists"
msgstr "Serie Nummer {0} finns redan"
-#: erpnext/public/js/utils/barcode_scanner.js:321
+#: erpnext/public/js/utils/barcode_scanner.js:347
msgid "Serial No {0} already scanned"
msgstr "Serie Nummer {0} är redan skannad"
@@ -48663,7 +48734,7 @@ msgstr "Serie Nummer {0} finns inte"
msgid "Serial No {0} does not exists"
msgstr "Serie Nummer {0} finns inte "
-#: erpnext/public/js/utils/barcode_scanner.js:402
+#: erpnext/public/js/utils/barcode_scanner.js:436
msgid "Serial No {0} is already added"
msgstr "Serie Nummer {0} har redan lagts till"
@@ -48691,7 +48762,7 @@ msgstr "Serie Nummer {0} hittades inte"
msgid "Serial No: {0} has already been transacted into another POS Invoice."
msgstr "Serie Nummer: {0} har redan använts i annan Kassa Faktura."
-#: erpnext/public/js/utils/barcode_scanner.js:271
+#: erpnext/public/js/utils/barcode_scanner.js:297
#: erpnext/public/js/utils/serial_no_batch_selector.js:16
#: erpnext/public/js/utils/serial_no_batch_selector.js:190
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:50
@@ -49188,8 +49259,8 @@ msgstr "Ange Bas Pris Manuellt"
msgid "Set Default Supplier"
msgstr "Ange Standard Leverantör"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:339
-#: erpnext/manufacturing/doctype/job_card/job_card.js:408
+#: erpnext/manufacturing/doctype/job_card/job_card.js:347
+#: erpnext/manufacturing/doctype/job_card/job_card.js:416
msgid "Set Finished Good Quantity"
msgstr "Ange Färdig Artikel Kvantitet"
@@ -49220,11 +49291,11 @@ msgstr "Ange Budget per Artikel Grupp för detta Distrikt. Man kan även inklude
msgid "Set Landed Cost Based on Purchase Invoice Rate"
msgstr "Ange Landad Kostnad baserat på Inköp Faktura Pris"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1130
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1139
msgid "Set Loyalty Program"
msgstr "Ange Lojalitet Program"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:312
msgid "Set New Release Date"
msgstr "Ange ny Frisläppande Datum"
@@ -49253,7 +49324,7 @@ msgstr "Ange Lösenord"
msgid "Set Posting Date"
msgstr "Ange Registrering Datum"
-#: erpnext/manufacturing/doctype/bom/bom.js:904
+#: erpnext/manufacturing/doctype/bom/bom.js:925
msgid "Set Process Loss Item Quantity"
msgstr "Ange Process Förlust Artikel Kvantitet"
@@ -49267,7 +49338,7 @@ msgstr "Ange Projekt Status"
msgid "Set Project and all Tasks to status {0}?"
msgstr "Ange Projekt och alla Uppgifter till status {0}?"
-#: erpnext/manufacturing/doctype/bom/bom.js:905
+#: erpnext/manufacturing/doctype/bom/bom.js:926
msgid "Set Quantity"
msgstr "Bekräfta"
@@ -49374,7 +49445,7 @@ msgstr "Ange Standard {0} konto för Ej Lager Artiklar"
msgid "Set fieldname from which you want to fetch the data from the parent form."
msgstr "Ange fältnamn från vilket data ska hämtas från överordnad formulär."
-#: erpnext/manufacturing/doctype/bom/bom.js:894
+#: erpnext/manufacturing/doctype/bom/bom.js:915
msgid "Set quantity of process loss item:"
msgstr "Ange kvantitet för Process Förlust Artikel:"
@@ -49404,15 +49475,15 @@ msgstr "Ange status manuellt."
msgid "Set this if the customer is a Public Administration company."
msgstr "Ange detta om Kund är Offentlig Administration."
-#: erpnext/assets/doctype/asset/asset.py:750
+#: erpnext/assets/doctype/asset/asset.py:766
msgid "Set {0} in asset category {1} for company {2}"
msgstr "Ange {0} i Tillgång Kategori {1} för Bolag {2}"
-#: erpnext/assets/doctype/asset/asset.py:1083
+#: erpnext/assets/doctype/asset/asset.py:1099
msgid "Set {0} in asset category {1} or company {2}"
msgstr "Ange {0} i Tillgång Kategori {1} eller Bolag {2}"
-#: erpnext/assets/doctype/asset/asset.py:1080
+#: erpnext/assets/doctype/asset/asset.py:1096
msgid "Set {0} in company {1}"
msgstr "Ange {0} i Bolag {1}"
@@ -49479,7 +49550,7 @@ msgstr "Ange konto som Bolag Konto för Bank Avstämmning"
msgid "Setting up company"
msgstr "Konfigurerar Bolag"
-#: erpnext/manufacturing/doctype/bom/bom.py:1051
+#: erpnext/manufacturing/doctype/bom/bom.py:1088
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr "Inställning av {0} erfordras"
@@ -49612,7 +49683,7 @@ msgid "Shift Name"
msgstr "Skift Benämning"
#. Name of a DocType
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:243
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:249
#: erpnext/stock/doctype/shipment/shipment.json
msgid "Shipment"
msgstr "Leverans"
@@ -49663,7 +49734,7 @@ msgstr "Leverans Typ"
msgid "Shipment details"
msgstr "Leverans Detaljer"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:787
msgid "Shipments"
msgstr "Leveranser"
@@ -50349,7 +50420,7 @@ msgstr "Källdokument"
msgid "Source Document Name"
msgstr "Käll DocType Namn"
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:478
msgid "Source Document No"
msgstr "Källdokument Nummer"
@@ -50399,7 +50470,7 @@ msgstr "Käll Typ"
#. Label of the s_warehouse (Link) field in DocType 'Stock Entry Detail'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/manufacturing/doctype/bom/bom.js:403
+#: erpnext/manufacturing/doctype/bom/bom.js:424
#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
@@ -50427,7 +50498,7 @@ msgstr " Från Lager Adress"
msgid "Source Warehouse Address Link"
msgstr "Från Lager Adress"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1154
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr "Från Lager erfordras för artikel {0}."
@@ -50523,7 +50594,7 @@ msgstr "Delad Ärende"
msgid "Split Qty"
msgstr "Dela Kvantitet"
-#: erpnext/assets/doctype/asset/asset.py:1222
+#: erpnext/assets/doctype/asset/asset.py:1238
msgid "Split Quantity must be less than Asset Quantity"
msgstr "Delad Kvantitet måste vara lägre än Tillgång Kvantitet"
@@ -50716,7 +50787,7 @@ msgstr "Starta Borttagning"
msgid "Start Import"
msgstr "Starta Import"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:180
+#: erpnext/manufacturing/doctype/job_card/job_card.js:188
#: erpnext/manufacturing/doctype/workstation/workstation.js:124
msgid "Start Job"
msgstr "Starta Jobb"
@@ -51025,14 +51096,14 @@ msgstr "Stat/Provins"
#: erpnext/setup/doctype/driver/driver.json
#: erpnext/setup/doctype/employee/employee.json
#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:323
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:358
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:329
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:364
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_trip/delivery_trip.json
#: erpnext/stock/doctype/material_request/material_request.json
#: erpnext/stock/doctype/pick_list/pick_list.json
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:276
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:305
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:283
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:312
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
#: erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
@@ -51111,8 +51182,8 @@ msgstr "Lager"
#: erpnext/accounts/doctype/account/account.json
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:50
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:73
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1337
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1363
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1339
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1365
#: erpnext/accounts/report/account_balance/account_balance.js:58
msgid "Stock Adjustment"
msgstr "Lager Justering"
@@ -51269,7 +51340,7 @@ msgstr "Lager Post Artikel"
msgid "Stock Entry Type"
msgstr "Lager Post Typ"
-#: erpnext/stock/doctype/pick_list/pick_list.py:1384
+#: erpnext/stock/doctype/pick_list/pick_list.py:1396
msgid "Stock Entry has been already created against this Pick List"
msgstr "Lager Post är redan skapad mot denna Plocklista"
@@ -51503,14 +51574,14 @@ msgstr "Lager Omregistrering Inställningar"
#: erpnext/stock/doctype/pick_list/pick_list.js:166
#: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12
#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:714
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:666
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1225
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1563
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1576
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1590
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1604
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1618
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1635
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:668
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1227
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1565
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1578
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1592
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1606
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1620
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1637
#: erpnext/stock/doctype/stock_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51519,13 +51590,13 @@ msgstr "Lager Omregistrering Inställningar"
msgid "Stock Reservation"
msgstr "Lager Reservation"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1746
msgid "Stock Reservation Entries Cancelled"
msgstr "Lager Reservation Poster Annullerade"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2156
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1698
msgid "Stock Reservation Entries Created"
msgstr "Lager Reservation Poster Skapade"
@@ -51533,25 +51604,25 @@ msgstr "Lager Reservation Poster Skapade"
#: erpnext/public/js/stock_reservation.js:308
#: erpnext/selling/doctype/sales_order/sales_order.js:444
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:352
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:354
#: erpnext/stock/report/reserved_stock/reserved_stock.js:53
#: erpnext/stock/report/reserved_stock/reserved_stock.py:171
msgid "Stock Reservation Entry"
msgstr "Lager Reservation Post"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:528
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:530
msgid "Stock Reservation Entry cannot be updated as it has been delivered."
msgstr "Lager Reservation Post kan inte uppdateras eftersom den är levererad. "
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:522
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:524
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 "Lager Reservation Post skapad mot Plocklista kan inte uppdateras. Om man behöver göra ändringar rekommenderas att man anullerar befintlig post och skapar ny. "
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:549
msgid "Stock Reservation Warehouse Mismatch"
msgstr "Lager Reservation för Lager stämmer inte"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:675
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:677
msgid "Stock Reservation can only be created against {0}."
msgstr "Lager Reservation kan endast skapas mot {0}."
@@ -51586,7 +51657,7 @@ msgstr "Lager Reserverad Kvantitet (Lager Enhet)"
#. Label of a Link in the Stock Workspace
#: erpnext/setup/doctype/company/company.json
#: erpnext/setup/workspace/settings/settings.json
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:667
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:669
#: erpnext/stock/doctype/stock_settings/stock_settings.json
#: erpnext/stock/workspace/stock/stock.json
msgid "Stock Settings"
@@ -51792,11 +51863,11 @@ msgstr "Lager & Produktion"
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr "Lager kan inte reserveras i grupp lager {0}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1510
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr "Lager kan inte reserveras i grupp lager {0}."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:727
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:729
msgid "Stock cannot be updated against Purchase Receipt {0}"
msgstr "Lager kan inte uppdateras mot Inköp Följesedel {0}"
@@ -51808,11 +51879,11 @@ msgstr "Lager kan inte uppdateras mot följande Försäljning Följesedel {0}"
msgid "Stock cannot be updated because the invoice contains a drop shipping item. Please disable 'Update Stock' or remove the drop shipping item."
msgstr "Lager kan inte uppdateras eftersom fakturan innehåller en direkt leverans artikel. Inaktivera \"Uppdatera lager\" eller ta bort direkt leverans artikel."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1121
msgid "Stock has been unreserved for work order {0}."
msgstr "Lager reservation är ångrad för arbetsorder {0}."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:323
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:325
msgid "Stock not available for Item {0} in Warehouse {1}."
msgstr "Lager ej tillgängligt för Artikel {0} i Lager {1}."
@@ -52124,7 +52195,7 @@ msgstr "Underleverantör Order Service Artikel"
msgid "Subcontracting Order Supplied Item"
msgstr "Underleverantör Order Levererad Artikel"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:943
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:965
msgid "Subcontracting Order {0} created."
msgstr "Underleverantör Order {0} skapad"
@@ -52214,7 +52285,7 @@ msgstr "Ämne"
msgid "Submit"
msgstr "Godkänn"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:939
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:961
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:910
msgid "Submit Action Failed"
msgstr "Godkännande Misslyckades"
@@ -52665,7 +52736,7 @@ msgstr "Levererad Kvantitet"
#: erpnext/selling/doctype/customer/customer.js:230
#: erpnext/selling/doctype/party_specific_item/party_specific_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:160
-#: erpnext/selling/doctype/sales_order/sales_order.js:1231
+#: erpnext/selling/doctype/sales_order/sales_order.js:1235
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/doctype/sms_center/sms_center.json
#: erpnext/setup/workspace/home/home.json
@@ -52676,7 +52747,7 @@ msgstr "Levererad Kvantitet"
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
#: erpnext/stock/doctype/shipment/shipment.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:462
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:505
#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr "Leverantör"
@@ -52801,7 +52872,7 @@ msgstr "Leverantör Faktura"
msgid "Supplier Invoice Date"
msgstr "Leverantör Faktura Datum"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1730
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1732
msgid "Supplier Invoice Date cannot be greater than Posting Date"
msgstr "Leverantör Faktura Datum kan inte vara senare än Registrering Datum"
@@ -52811,12 +52882,12 @@ msgstr "Leverantör Faktura Datum kan inte vara senare än Registrering Datum"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:59
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/report/general_ledger/general_ledger.html:104
-#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/general_ledger/general_ledger.py:780
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr "Leverantör Faktura Nummer"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1757
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1759
msgid "Supplier Invoice No exists in Purchase Invoice {0}"
msgstr "Leverantör Faktura Nummer finns i Inköp Faktura {0}"
@@ -53044,7 +53115,7 @@ msgstr "Leverantör Typ"
#. 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:62
+#: erpnext/manufacturing/doctype/job_card/job_card.js:70
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
msgid "Supplier Warehouse"
msgstr "Leverantör Lager"
@@ -53378,7 +53449,7 @@ msgstr "TDS Belopp"
msgid "TDS Computation Summary"
msgstr "TDS Beräkning Översikt"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1514
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1516
msgid "TDS Deducted"
msgstr "TDS Avdragen"
@@ -54233,7 +54304,7 @@ msgstr "Television"
msgid "Template"
msgstr "Mall"
-#: erpnext/manufacturing/doctype/bom/bom.js:355
+#: erpnext/manufacturing/doctype/bom/bom.js:376
msgid "Template Item"
msgstr "Mall Artikel"
@@ -54469,7 +54540,7 @@ msgstr "Regler och Villkor Mall"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:182
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:68
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:221
-#: erpnext/accounts/report/gross_profit/gross_profit.py:399
+#: erpnext/accounts/report/gross_profit/gross_profit.py:411
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js:8
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:21
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:263
@@ -54568,7 +54639,7 @@ msgstr "Åtkomst till Inköp Offert från Portal är inaktiverad. För att till
msgid "The BOM which will be replaced"
msgstr "Stycklista före"
-#: erpnext/stock/serial_batch_bundle.py:1378
+#: erpnext/stock/serial_batch_bundle.py:1394
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr "Parti {0} har negativ kvantitet {1} i lager {2}. Korrigera kvantitet."
@@ -54683,7 +54754,7 @@ msgstr "Från Aktieägare fält kan inte vara tom"
msgid "The field To Shareholder cannot be blank"
msgstr "Till Aktieägare fält kan inte vara tom"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:399
msgid "The field {0} in row {1} is not set"
msgstr "Fält {0} i rad {1} är inte angiven"
@@ -54752,6 +54823,10 @@ msgstr "Jobbkort {0} är i {1} tillstånd och du kan inte slutföra."
msgid "The job card {0} is in {1} state and you cannot start it again."
msgstr "Jobbkort {0} är i {1} tillstånd och du kan inte starta det igen."
+#: erpnext/public/js/utils/barcode_scanner.js:533
+msgid "The last scanned warehouse has been cleared and won't be set in the subsequently scanned items"
+msgstr "Senast skannad lager är rensad och kommer inte att anges i efterföljande skannade artiklar"
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.py:46
msgid "The lowest tier must have a minimum spent amount of 0. Customers need to be part of a tier as soon as they are enrolled in the program."
msgstr "Lägsta nivån måste ha minsta spenderat belopp på 0. Kunder ska vara del av nivå så snart de är registrerade."
@@ -54830,7 +54905,7 @@ msgstr "Konto Klass {0} måste vara grupp"
msgid "The selected BOMs are not for the same item"
msgstr "Valda Stycklistor är inte för samma Artikel"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:493
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:494
msgid "The selected change account {} doesn't belongs to Company {}."
msgstr "Vald Kassa Växel Konto {} tillhör inte Bolag {}."
@@ -54964,7 +55039,7 @@ msgstr "{0} {1} används för att beräkna grund kostnad för färdig artikel {2
msgid "Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc."
msgstr "Därefter filtreras prisreglerna utifrån kund, kundgrupp, distrikt, leverantör, leverantörstyp, kampanj, försäljningspartner etc."
-#: erpnext/assets/doctype/asset/asset.py:579
+#: erpnext/assets/doctype/asset/asset.py:595
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr "Det finns aktivt service eller reparationer mot tillgång. Du måste slutföra alla före annullering av tillgång."
@@ -55067,7 +55142,7 @@ msgstr "Artikel är variant av {0} (Mall)."
msgid "This Month's Summary"
msgstr "Månads Översikt"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:952
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:974
msgid "This PO has been fully subcontracted."
msgstr "Detta Inköp Order har helt lagts ut på underleverantörer."
@@ -55091,7 +55166,7 @@ msgstr "Denna åtgärd stoppar framtida fakturering.Fortsätt?"
msgid "This action will unlink this account from any external service integrating ERPNext with your bank accounts. It cannot be undone. Are you certain ?"
msgstr "Detta åtgärd kommer att koppla bort detta konto från alla externa tjänster som integrerar System med Bank Konto. Det kan inte bli ogjort. Fortsätt ?"
-#: erpnext/assets/doctype/asset/asset.py:359
+#: erpnext/assets/doctype/asset/asset.py:360
msgid "This asset category is marked as non-depreciable. Please disable depreciation calculation or choose a different category."
msgstr "Denna tillgång kategori är angiven som ej avskrivningsbar. Inaktivera avskrivning beräkning eller välj annan kategori."
@@ -55103,7 +55178,7 @@ msgstr "Detta täcker alla resultatkort kopplade till denna inställning"
msgid "This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?"
msgstr "Detta dokument är över gräns med {0} {1} för post {4}. Skapa annan {3} mot samma {2}?"
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:483
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:489
msgid "This field is used to set the 'Customer'."
msgstr "Detta fält används för att ange 'Kund'."
@@ -55113,11 +55188,11 @@ msgstr "Detta fält används för att ange 'Kund'."
msgid "This filter will be applied to Journal Entry."
msgstr "Detta filter kommer att tillämpas på Journal Post"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:812
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:813
msgid "This invoice has already been paid."
msgstr "Faktura är redan betald."
-#: erpnext/manufacturing/doctype/bom/bom.js:219
+#: erpnext/manufacturing/doctype/bom/bom.js:240
msgid "This is a Template BOM and will be used to make the work order for {0} of the item {1}"
msgstr "Detta är Stycklista Mall och kommer att användas för att skapa arbetsorder för {0} av artikel {1}"
@@ -55190,7 +55265,7 @@ msgstr "Detta baseras på transaktioner mot denna Säljare. Se tidslinje nedan f
msgid "This is considered dangerous from accounting point of view."
msgstr "Detta anses vara farligt ur bokföring synpunkt."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:531
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:533
msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice"
msgstr "Detta görs för att hantera bokföring i fall där Inköp Följesedel skapas efter Inköp Faktura"
@@ -55206,7 +55281,7 @@ msgstr "Detta är för råmaterial artiklar som kommer att användas för att sk
msgid "This item filter has already been applied for the {0}"
msgstr "Detta artikel filter har redan tillämpats för {0}"
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:496
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:502
msgid "This option can be checked to edit the 'Posting Date' and 'Posting Time' fields."
msgstr "Detta alternativ kan väljas för att redigera fält 'Registrering Datum' och 'Registrering Tid'."
@@ -55242,7 +55317,7 @@ msgstr "Detta schema skapades när Tillgång {0} returnerades via Försäljning
msgid "This schedule was created when Asset {0} was scrapped."
msgstr "Detta schema skapades när Tillgång {0} skrotades."
-#: erpnext/assets/doctype/asset/asset.py:1356
+#: erpnext/assets/doctype/asset/asset.py:1372
msgid "This schedule was created when Asset {0} was {1} into new Asset {2}."
msgstr "Detta schema skapades när tillgång {0} var {1} till ny tillgång {2}."
@@ -55264,7 +55339,7 @@ msgstr "Detta schema skapades när Tillgång {0} Skift justerades genom Tillgån
msgid "This section allows the user to set the Body and Closing text of the Dunning Letter for the Dunning Type based on language, which can be used in Print."
msgstr "Detta sektion gör det möjligt för Användare att ange Huvud och Avslutningtext för Påminnelse Brev för Påminnelse Typ baserad på språk, som kan användas i Utskrift."
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:489
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:495
msgid "This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc."
msgstr "Denna tabell används för att ange detaljer om 'Artikel', 'Kvantitet', 'Bas Pris', etc."
@@ -55464,7 +55539,7 @@ msgstr "Tidur överskred angivna timmar."
#. Name of a DocType
#. Label of a Link in the Projects Workspace
#. Label of a shortcut in the Projects Workspace
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1014
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1023
#: erpnext/projects/doctype/timesheet/timesheet.json
#: erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py:26
#: erpnext/projects/report/timesheet_billing_summary/timesheet_billing_summary.py:59
@@ -55579,7 +55654,7 @@ msgstr "Benämning"
#. Label of the to_uom (Link) field in DocType 'UOM Conversion Factor'
#. Label of the to (Data) field in DocType 'Call Log'
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1046
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1055
#: erpnext/setup/doctype/uom_conversion_factor/uom_conversion_factor.json
#: erpnext/telephony/doctype/call_log/call_log.json
#: erpnext/templates/pages/projects.html:68
@@ -55950,7 +56025,7 @@ msgstr "Till Lager"
msgid "To Warehouse (Optional)"
msgstr "Till Lager (valfritt)"
-#: erpnext/manufacturing/doctype/bom/bom.js:872
+#: erpnext/manufacturing/doctype/bom/bom.js:893
msgid "To add Operations tick the 'With Operations' checkbox."
msgstr "Att lägga till Åtgärder kryssa i rutan 'Med Åtgärder'."
@@ -56025,11 +56100,11 @@ msgstr "Att åsidosätta detta, aktivera {0} i bolag {1}"
msgid "To still proceed with editing this Attribute Value, enable {0} in Item Variant Settings."
msgstr "Att ändå fortsätta att redigera egenskap värde, aktivera {0} i Artikel Variant Inställningar."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:621
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:623
msgid "To submit the invoice without purchase order please set {0} as {1} in {2}"
msgstr "Att godkänna faktura utan inköp order, ange {0} som {1} i {2}"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:642
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:644
msgid "To submit the invoice without purchase receipt please set {0} as {1} in {2}"
msgstr "Att godkänna faktura utan inköp följesedel ange {0} som {1} i {2}"
@@ -56039,7 +56114,7 @@ msgid "To use a different finance book, please uncheck 'Include Default FB Asset
msgstr "Att använda annan finans register, inaktivera \"Inkludera Standard Finans Register Tillgångar\""
#: erpnext/accounts/report/financial_statements.py:603
-#: erpnext/accounts/report/general_ledger/general_ledger.py:304
+#: erpnext/accounts/report/general_ledger/general_ledger.py:310
#: erpnext/accounts/report/trial_balance/trial_balance.py:292
msgid "To use a different finance book, please uncheck 'Include Default FB Entries'"
msgstr "Att använda annan finans register, inaktivera \"Inkludera Standard Finans Register Tillgångar\""
@@ -56133,7 +56208,7 @@ msgstr "Torr"
#: erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py:229
#: erpnext/accounts/report/financial_statements.py:699
#: erpnext/accounts/report/general_ledger/general_ledger.html:132
-#: erpnext/accounts/report/general_ledger/general_ledger.py:378
+#: erpnext/accounts/report/general_ledger/general_ledger.py:398
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:699
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:93
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:98
@@ -56942,7 +57017,7 @@ msgstr "Totalt bidrag procentsats ska vara lika med 100%"
msgid "Total hours: {0}"
msgstr "Totalt timmar: {0}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:523
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:524
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:536
msgid "Total payments amount can't be greater than {}"
msgstr "Totalt betalning belopp kan inte vara högre än {}"
@@ -57602,7 +57677,7 @@ msgstr "UAE VAT Inställningar"
#: erpnext/quality_management/doctype/quality_review_objective/quality_review_objective.json
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
#: erpnext/selling/doctype/quotation_item/quotation_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1225
+#: erpnext/selling/doctype/sales_order/sales_order.js:1228
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:43
#: erpnext/selling/report/sales_analytics/sales_analytics.py:138
@@ -57676,7 +57751,7 @@ msgstr "Enhet Konvertering Detalj"
msgid "UOM Conversion Factor"
msgstr "Enhet Konvertering Faktor"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1387
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1404
msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}"
msgstr "Enhet Konvertering Faktor ({0} -> {1}) hittades inte för Artikel: {2}"
@@ -58060,11 +58135,11 @@ msgstr "Kommande Kalender Händelser"
#: erpnext/accounts/doctype/account/account.js:204
#: erpnext/accounts/doctype/cost_center/cost_center.js:107
-#: erpnext/manufacturing/doctype/job_card/job_card.js:338
-#: erpnext/manufacturing/doctype/job_card/job_card.js:407
+#: erpnext/manufacturing/doctype/job_card/job_card.js:346
+#: erpnext/manufacturing/doctype/job_card/job_card.js:415
#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:500
#: erpnext/public/js/utils.js:608 erpnext/public/js/utils.js:912
-#: erpnext/public/js/utils/barcode_scanner.js:183
+#: erpnext/public/js/utils/barcode_scanner.js:209
#: erpnext/public/js/utils/serial_no_batch_selector.js:17
#: erpnext/public/js/utils/serial_no_batch_selector.js:191
#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js:179
@@ -58165,7 +58240,7 @@ msgstr "Uppdatera Förbrukad Material Kostnad i Projekt"
#. Option for the 'Update Type' (Select) field in DocType 'BOM Update Log'
#. Label of the update_cost_section (Section Break) field in DocType 'BOM
#. Update Tool'
-#: erpnext/manufacturing/doctype/bom/bom.js:135
+#: erpnext/manufacturing/doctype/bom/bom.js:156
#: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.json
#: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json
msgid "Update Cost"
@@ -58259,7 +58334,7 @@ msgstr "Projekt Uppdatering Intervall"
msgid "Update latest price in all BOMs"
msgstr "Uppdatera till senaste pris i alla Stycklistor"
-#: erpnext/assets/doctype/asset/asset.py:401
+#: erpnext/assets/doctype/asset/asset.py:402
msgid "Update stock must be enabled for the purchase invoice {0}"
msgstr "Uppdatera Lager måste vara aktiverat för Inköp Faktura {0}"
@@ -58275,7 +58350,7 @@ msgstr "Uppdatera ändrad tidsstämpel på ny konversation mottagen i Potentiell
msgid "Update timestamp on new communication"
msgstr "Uppdatera tidsstämpel på ny kommunikation"
-#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:534
+#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:539
msgid "Updated successfully"
msgstr "Uppdaterad"
@@ -58383,7 +58458,7 @@ msgstr "Använd Artikel baserad Ompostering "
#. Label of the use_multi_level_bom (Check) field in DocType 'Work Order'
#. Label of the use_multi_level_bom (Check) field in DocType 'Stock Entry'
-#: erpnext/manufacturing/doctype/bom/bom.js:337
+#: erpnext/manufacturing/doctype/bom/bom.js:358
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Use Multi-Level BOM"
@@ -58713,7 +58788,7 @@ msgstr "Giltig från och giltig till fält erfordras för kumulativ"
msgid "Valid till Date cannot be before Transaction Date"
msgstr "Giltigt till datum kan inte vara före Transaktion Datum"
-#: erpnext/selling/doctype/quotation/quotation.py:154
+#: erpnext/selling/doctype/quotation/quotation.py:156
msgid "Valid till date cannot be before transaction date"
msgstr "Giltigt till datum kan inte vara före Transaktion Datum"
@@ -58775,7 +58850,7 @@ msgstr "Giltighet och Användning"
msgid "Validity in Days"
msgstr "Giltighet i Dagar"
-#: erpnext/selling/doctype/quotation/quotation.py:361
+#: erpnext/selling/doctype/quotation/quotation.py:363
msgid "Validity period of this quotation has ended."
msgstr "Giltighet Tid för denna Försäljning Offert har upphört."
@@ -58824,7 +58899,7 @@ msgstr "Värdering Sätt"
#. Label of the valuation_rate (Currency) field in DocType 'Stock
#. Reconciliation Item'
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:323
+#: erpnext/accounts/report/gross_profit/gross_profit.py:329
#: erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
#: erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json
#: erpnext/manufacturing/doctype/bom/bom.json
@@ -59053,7 +59128,7 @@ msgstr "Variant Egenskap Fel"
msgid "Variant Attributes"
msgstr "Variant Egenskaper"
-#: erpnext/manufacturing/doctype/bom/bom.js:176
+#: erpnext/manufacturing/doctype/bom/bom.js:197
msgid "Variant BOM"
msgstr "Variant Stycklista"
@@ -59075,8 +59150,8 @@ msgstr "Variant Detaljer Rapport"
msgid "Variant Field"
msgstr "Variant Fält"
-#: erpnext/manufacturing/doctype/bom/bom.js:291
-#: erpnext/manufacturing/doctype/bom/bom.js:370
+#: erpnext/manufacturing/doctype/bom/bom.js:312
+#: erpnext/manufacturing/doctype/bom/bom.js:391
msgid "Variant Item"
msgstr "Variant Artikel"
@@ -59210,7 +59285,7 @@ msgstr "Video Inställningar"
#: erpnext/accounts/doctype/cost_center/cost_center_tree.js:56
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js:205
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:76
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:14
#: erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:24
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:167
@@ -59234,8 +59309,8 @@ msgstr "Video Inställningar"
#: erpnext/stock/doctype/item/item.js:142
#: erpnext/stock/doctype/item/item.js:150
#: erpnext/stock/doctype/item/item.js:158
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:228
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:239
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:232
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:243
#: erpnext/stock/doctype/stock_entry/stock_entry.js:297
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:46
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:62
@@ -59263,7 +59338,7 @@ msgstr "Visa Bokföring Register"
msgid "View Leads"
msgstr "Visa Potentiella Kunder"
-#: erpnext/accounts/doctype/account/account_tree.js:275
+#: erpnext/accounts/doctype/account/account_tree.js:270
#: erpnext/stock/doctype/batch/batch.js:18
msgid "View Ledger"
msgstr "Visa Bokföring Register"
@@ -59401,7 +59476,7 @@ msgstr "Verifikat Namn"
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:209
#: erpnext/accounts/report/general_ledger/general_ledger.js:49
-#: erpnext/accounts/report/general_ledger/general_ledger.py:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:735
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js:41
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:33
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:65
@@ -59440,7 +59515,7 @@ msgstr "Kvantitet"
#. Label of the voucher_subtype (Small Text) field in DocType 'GL Entry'
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:729
msgid "Voucher Subtype"
msgstr "Verifikat Undertyp"
@@ -59472,7 +59547,7 @@ msgstr "Verifikat Undertyp"
#: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1184
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:200
-#: erpnext/accounts/report/general_ledger/general_ledger.py:707
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
@@ -59493,7 +59568,7 @@ msgstr "Verifikat Undertyp"
#: erpnext/stock/report/reserved_stock/reserved_stock.py:145
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:40
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:107
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:429
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:472
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:27
#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:114
#: erpnext/stock/report/stock_ledger/stock_ledger.py:320
@@ -59627,7 +59702,7 @@ msgstr "Besök"
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/gross_profit/gross_profit.js:56
-#: erpnext/accounts/report/gross_profit/gross_profit.py:308
+#: erpnext/accounts/report/gross_profit/gross_profit.py:314
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:41
#: erpnext/accounts/report/purchase_register/purchase_register.js:52
#: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py:28
@@ -59677,7 +59752,7 @@ msgstr "Besök"
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:350
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:352
#: erpnext/stock/doctype/warehouse/warehouse.json
#: erpnext/stock/page/stock_balance/stock_balance.js:11
#: erpnext/stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:25
@@ -59703,7 +59778,7 @@ msgstr "Besök"
#: erpnext/stock/report/reserved_stock/reserved_stock.py:96
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:34
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:138
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:442
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:485
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:21
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:47
#: erpnext/stock/report/stock_ageing/stock_ageing.js:30
@@ -59825,7 +59900,7 @@ msgid "Warehouse not found against the account {0}"
msgstr "Lager hittades inte mot konto {0}"
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1160
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:426
msgid "Warehouse required for stock Item {0}"
msgstr "Lager erfodras för Lager Artikel {0}"
@@ -60014,6 +60089,10 @@ msgstr "Garanti/Service Avtal Status"
msgid "Warranty Claim"
msgstr "Garanti Ärende"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:525
+msgid "Warranty Expiry (Serial)"
+msgstr "Garanti Utgång (Serienummer)"
+
#. Label of the warranty_expiry_date (Date) field in DocType 'Serial No'
#. Label of the warranty_expiry_date (Date) field in DocType 'Warranty Claim'
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -60437,7 +60516,7 @@ msgstr "Pågående Arbete Lager"
#. Entry'
#. Option for the 'From Voucher Type' (Select) field in DocType 'Stock
#. Reservation Entry'
-#: erpnext/manufacturing/doctype/bom/bom.js:167
+#: erpnext/manufacturing/doctype/bom/bom.js:188
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
@@ -60459,7 +60538,7 @@ msgstr "Pågående Arbete Lager"
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:455
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:498
#: erpnext/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr "Arbetsorder"
@@ -60523,7 +60602,7 @@ msgstr "Arbetsorder kan inte skapas mot Artikel Mall"
msgid "Work Order has been {0}"
msgstr "Arbetsorder har varit {0}"
-#: erpnext/selling/doctype/sales_order/sales_order.js:823
+#: erpnext/selling/doctype/sales_order/sales_order.js:826
msgid "Work Order not created"
msgstr "Arbetsorder inte skapad"
@@ -60536,7 +60615,7 @@ msgstr "Arbetsorder {0}: Jobbkort hittades inte för Åtgärd {1}"
msgid "Work Orders"
msgstr "Arbetsordrar"
-#: erpnext/selling/doctype/sales_order/sales_order.js:908
+#: erpnext/selling/doctype/sales_order/sales_order.js:911
msgid "Work Orders Created: {0}"
msgstr "Arbetsordrar Skapade: {0}"
@@ -60976,7 +61055,7 @@ msgid "You can only have Plans with the same billing cycle in a Subscription"
msgstr "Du kan bara ha planer med samma fakturering tid i prenumeration"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:412
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:876
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:885
msgid "You can only redeem max {0} points in this order."
msgstr "Du kan bara lösa in maximala {0} poäng i denna följd."
@@ -61004,7 +61083,7 @@ msgstr "Du kan inte behandla serienummer {0} eftersom det redan har använts i S
msgid "You can't redeem Loyalty Points having more value than the Total Amount."
msgstr "Du kan inte lösa in Lojalitetspoäng som har ett högre värde än total belopp."
-#: erpnext/manufacturing/doctype/bom/bom.js:653
+#: erpnext/manufacturing/doctype/bom/bom.js:674
msgid "You cannot change the rate if BOM is mentioned against any Item."
msgstr "Du kan inte ändra pris om Stycklista är angiven mot någon artikel."
@@ -61104,7 +61183,7 @@ msgstr "Du har inte skapat {0} än"
msgid "You must select a customer before adding an item."
msgstr "Välj Kund före Artikel."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:267
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:268
msgid "You need to cancel POS Closing Entry {} to be able to cancel this document."
msgstr "Annullera Kassa Stängning Post {} för att annullera detta dokument."
@@ -61201,7 +61280,7 @@ msgstr "som Beskrivning"
msgid "as Title"
msgstr "som Benämning"
-#: erpnext/manufacturing/doctype/bom/bom.js:896
+#: erpnext/manufacturing/doctype/bom/bom.js:917
msgid "as a percentage of finished item quantity"
msgstr "som procentsats av färdig artikel kvantitet"
@@ -61221,7 +61300,7 @@ msgstr "av {}"
msgid "cannot be greater than 100"
msgstr "Rabatt kan inte vara högre än 100%"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:331
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:333
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1046
msgid "dated {0}"
msgstr "daterad {0}"
@@ -61594,7 +61673,7 @@ msgstr "{0} konto tillhör inte bolag {1}"
msgid "{0} account is not of type {1}"
msgstr "{0} konto är inte av typ {1}"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:496
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:498
msgid "{0} account not found while submitting purchase receipt"
msgstr "{0} konto hittades inte när vid godkänande av Inköp Följesedel"
@@ -61618,7 +61697,7 @@ msgstr "{0} mot Försäljning Order {1}"
msgid "{0} already has a Parent Procedure {1}."
msgstr "{0} har redan Överordnad Förfarande {1}."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:544
msgid "{0} and {1}"
msgstr "{0} och {1}"
@@ -61789,6 +61868,10 @@ msgstr "{0} är öppen. Stäng Kassa eller avbryt befintlig Kassa Öppning Post
msgid "{0} is required"
msgstr "{0} är erfodrad"
+#: erpnext/assets/doctype/asset/asset.py:431
+msgid "{0} is still in Draft. Please submit it before saving the Asset."
+msgstr "{0} är fortfarande i utkast. Godkänn det innan Tillgång sparas."
+
#: erpnext/manufacturing/doctype/work_order/work_order.js:454
msgid "{0} items in progress"
msgstr "{0} artiklar pågår"
@@ -61874,6 +61957,10 @@ msgstr "{0} varianter skapade."
msgid "{0} will be given as discount."
msgstr "{0} kommer att ges som rabatt."
+#: erpnext/public/js/utils/barcode_scanner.js:523
+msgid "{0} will be set as the {1} in subsequently scanned items"
+msgstr "{0} kommer att anges som {1} i efterföljande skannade artiklar"
+
#: erpnext/manufacturing/doctype/job_card/job_card.py:883
msgid "{0} {1}"
msgstr "{0} {1}"
@@ -61886,7 +61973,7 @@ msgstr "{0} {1} Manuellt"
msgid "{0} {1} Partially Reconciled"
msgstr "{0} {1} Delvis Avstämd"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:516
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:518
msgid "{0} {1} cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr "{0} {1} kan inte uppdateras. Om du behöver göra ändringar rekommenderar vi att du annullerar befintlig post och skapar ny."
diff --git a/erpnext/locale/th.po b/erpnext/locale/th.po
index badaa1c274b..55430d7b820 100644
--- a/erpnext/locale/th.po
+++ b/erpnext/locale/th.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: frappe\n"
"Report-Msgid-Bugs-To: hello@frappe.io\n"
-"POT-Creation-Date: 2025-08-10 09:37+0000\n"
-"PO-Revision-Date: 2025-08-11 17:06\n"
+"POT-Creation-Date: 2025-08-17 09:36+0000\n"
+"PO-Revision-Date: 2025-08-17 18:14\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Thai\n"
"MIME-Version: 1.0\n"
@@ -143,7 +143,7 @@ msgstr "% สมบูรณ์"
msgid "% Delivered"
msgstr "% จัดส่งแล้ว"
-#: erpnext/manufacturing/doctype/bom/bom.js:892
+#: erpnext/manufacturing/doctype/bom/bom.js:913
#, python-format
msgid "% Finished Item Quantity"
msgstr "% จำนวนสินค้าที่ทำสำเร็จ"
@@ -988,6 +988,10 @@ msgstr ""
msgid "ACC-PINV-.YYYY.-"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:531
+msgid "AMC Expiry (Serial)"
+msgstr ""
+
#. Label of the amc_expiry_date (Date) field in DocType 'Serial No'
#. Label of the amc_expiry_date (Date) field in DocType 'Warranty Claim'
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -1215,7 +1219,7 @@ msgstr ""
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:30
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:190
#: erpnext/accounts/report/general_ledger/general_ledger.js:38
-#: erpnext/accounts/report/general_ledger/general_ledger.py:652
+#: erpnext/accounts/report/general_ledger/general_ledger.py:672
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js:30
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:30
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
@@ -1426,7 +1430,7 @@ msgstr ""
msgid "Account is not set for the dashboard chart {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:755
+#: erpnext/assets/doctype/asset/asset.py:771
msgid "Account not Found"
msgstr ""
@@ -1808,8 +1812,8 @@ msgstr ""
msgid "Accounting Entries"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:789
-#: erpnext/assets/doctype/asset/asset.py:804
+#: erpnext/assets/doctype/asset/asset.py:805
+#: erpnext/assets/doctype/asset/asset.py:820
#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:559
msgid "Accounting Entry for Asset"
msgstr ""
@@ -1823,29 +1827,29 @@ msgstr ""
msgid "Accounting Entry for Landed Cost Voucher for SCR {0}"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:814
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:816
msgid "Accounting Entry for Service"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:999
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1020
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1038
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1059
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1080
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1104
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1211
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1447
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1469
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1001
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1022
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1040
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1061
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1082
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1106
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1213
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1449
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1471
#: erpnext/controllers/stock_controller.py:579
#: erpnext/controllers/stock_controller.py:596
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:909
#: erpnext/stock/doctype/stock_entry/stock_entry.py:1627
#: erpnext/stock/doctype/stock_entry/stock_entry.py:1641
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:613
msgid "Accounting Entry for Stock"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:716
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:718
msgid "Accounting Entry for {0}"
msgstr ""
@@ -2388,9 +2392,9 @@ msgstr ""
#: erpnext/buying/doctype/supplier/supplier.js:128
#: erpnext/buying/doctype/supplier/supplier.js:137
#: erpnext/buying/doctype/supplier_scorecard_scoring_standing/supplier_scorecard_scoring_standing.json
-#: erpnext/manufacturing/doctype/bom/bom.js:139
-#: erpnext/manufacturing/doctype/bom/bom.js:150
-#: erpnext/manufacturing/doctype/bom/bom.js:161
+#: erpnext/manufacturing/doctype/bom/bom.js:160
+#: erpnext/manufacturing/doctype/bom/bom.js:171
+#: erpnext/manufacturing/doctype/bom/bom.js:182
#: erpnext/projects/doctype/project/project.js:87
#: erpnext/projects/doctype/project/project.js:95
#: erpnext/projects/doctype/project/project.js:151
@@ -2679,7 +2683,7 @@ msgstr ""
#: erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json
#: erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
#: erpnext/crm/doctype/lead/lead.js:85
-#: erpnext/manufacturing/doctype/bom/bom.js:922
+#: erpnext/manufacturing/doctype/bom/bom.js:943
#: erpnext/manufacturing/doctype/plant_floor/stock_summary_template.html:55
#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:235
#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:264
@@ -2696,7 +2700,7 @@ msgstr ""
msgid "Add / Edit Prices"
msgstr ""
-#: erpnext/accounts/doctype/account/account_tree.js:252
+#: erpnext/accounts/doctype/account/account_tree.js:248
msgid "Add Child"
msgstr ""
@@ -2792,7 +2796,7 @@ msgid "Add Quote"
msgstr ""
#. Label of the add_raw_materials (Button) field in DocType 'BOM Operation'
-#: erpnext/manufacturing/doctype/bom/bom.js:920
+#: erpnext/manufacturing/doctype/bom/bom.js:941
#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
msgid "Add Raw Materials"
msgstr ""
@@ -3369,11 +3373,11 @@ msgstr ""
msgid "Adjust Asset Value"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1078
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1087
msgid "Adjustment Against"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:644
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:646
msgid "Adjustment based on Purchase Invoice rate"
msgstr ""
@@ -3563,7 +3567,7 @@ msgstr ""
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
#: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:39
#: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:91
-#: erpnext/accounts/report/general_ledger/general_ledger.py:721
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Account"
msgstr ""
@@ -3582,7 +3586,7 @@ msgstr ""
msgid "Against Customer Order {0}"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:1191
+#: erpnext/selling/doctype/sales_order/sales_order.js:1194
msgid "Against Default Supplier"
msgstr ""
@@ -3674,13 +3678,13 @@ msgstr ""
msgid "Against Stock Entry"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:329
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:331
msgid "Against Supplier Invoice {0}"
msgstr ""
#. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry'
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:741
+#: erpnext/accounts/report/general_ledger/general_ledger.py:774
msgid "Against Voucher"
msgstr ""
@@ -3704,7 +3708,7 @@ msgstr ""
#: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/general_ledger/general_ledger.py:772
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr ""
@@ -3995,11 +3999,11 @@ msgstr ""
msgid "All items are already requested"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1335
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1342
msgid "All items have already been Invoiced/Returned"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1196
msgid "All items have already been received"
msgstr ""
@@ -4025,7 +4029,7 @@ msgstr ""
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:840
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:847
msgid "All these items have already been Invoiced/Returned"
msgstr ""
@@ -4090,7 +4094,7 @@ msgstr ""
#: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json
#: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
#: erpnext/accounts/doctype/unreconcile_payment_entries/unreconcile_payment_entries.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:378
+#: erpnext/accounts/report/gross_profit/gross_profit.py:384
#: erpnext/public/js/utils/unreconcile.js:87
msgid "Allocated Amount"
msgstr ""
@@ -4572,7 +4576,7 @@ msgstr ""
msgid "Also you can't switch back to FIFO after setting the valuation method to Moving Average for this item."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:200
+#: erpnext/manufacturing/doctype/bom/bom.js:221
#: erpnext/manufacturing/doctype/work_order/work_order.js:151
#: erpnext/manufacturing/doctype/work_order/work_order.js:166
#: erpnext/public/js/utils.js:518
@@ -5668,11 +5672,11 @@ msgstr "เนื่องจากมีสต็อกติดลบ คุ
msgid "As there are reserved stock, you cannot disable {0}."
msgstr "เนื่องจากมีสต็อกที่ถูกจองไว้ คุณไม่สามารถปิดใช้งาน {0} ได้"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1031
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1046
msgid "As there are sufficient Sub Assembly Items, Work Order is not required for Warehouse {0}."
msgstr "เนื่องจากมีรายการชิ้นส่วนย่อยเพียงพอ จึงไม่จำเป็นต้องมีคำสั่งงานสำหรับคลังสินค้า {0}"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1743
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1760
msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}."
msgstr "เนื่องจากมีวัตถุดิบเพียงพอ จึงไม่จำเป็นต้องมีคำขอวัสดุสำหรับคลังสินค้า {0}"
@@ -5722,7 +5726,7 @@ msgstr "รายการชิ้นส่วนประกอบ"
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/workspace/assets/assets.json
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:221
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:225
#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Asset"
msgstr "สินทรัพย์"
@@ -5840,7 +5844,7 @@ msgstr "ตารางค่าเสื่อมราคาสินทรั
msgid "Asset Depreciation Schedule {0} for Asset {1} and Finance Book {2} already exists."
msgstr "ตารางค่าเสื่อมราคาสินทรัพย์ {0} สำหรับสินทรัพย์ {1} และสมุดการเงิน {2} มีอยู่แล้ว"
-#: erpnext/assets/doctype/asset/asset.py:176
+#: erpnext/assets/doctype/asset/asset.py:177
msgid "Asset Depreciation Schedules created/updated:
{0}
Please check, edit if needed, and submit the Asset."
msgstr "ตารางค่าเสื่อมราคาสินทรัพย์ที่สร้าง/อัปเดต:
{0}
โปรดตรวจสอบ แก้ไขหากจำเป็น และส่งสินทรัพย์"
@@ -5913,7 +5917,7 @@ msgstr "ทีมบำรุงรักษาสินทรัพย์"
#. Label of a Link in the Assets Workspace
#: erpnext/assets/doctype/asset_movement/asset_movement.json
#: erpnext/assets/workspace/assets/assets.json
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:232
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:236
msgid "Asset Movement"
msgstr "การเคลื่อนย้ายสินทรัพย์"
@@ -5922,7 +5926,7 @@ msgstr "การเคลื่อนย้ายสินทรัพย์"
msgid "Asset Movement Item"
msgstr "รายการการเคลื่อนย้ายสินทรัพย์"
-#: erpnext/assets/doctype/asset/asset.py:1035
+#: erpnext/assets/doctype/asset/asset.py:1051
msgid "Asset Movement record {0} created"
msgstr "สร้างบันทึกการเคลื่อนย้ายสินทรัพย์ {0} แล้ว"
@@ -6051,11 +6055,11 @@ msgstr "ไม่สามารถบันทึกการปรับมู
msgid "Asset Value Analytics"
msgstr "การวิเคราะห์มูลค่าสินทรัพย์"
-#: erpnext/assets/doctype/asset/asset.py:208
+#: erpnext/assets/doctype/asset/asset.py:209
msgid "Asset cancelled"
msgstr "สินทรัพย์ถูกยกเลิก"
-#: erpnext/assets/doctype/asset/asset.py:584
+#: erpnext/assets/doctype/asset/asset.py:600
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr "ไม่สามารถยกเลิกสินทรัพย์ได้ เนื่องจากมันอยู่ในสถานะ {0} แล้ว"
@@ -6067,15 +6071,15 @@ msgstr "ไม่สามารถทิ้งสินทรัพย์ได
msgid "Asset capitalized after Asset Capitalization {0} was submitted"
msgstr "สินทรัพย์ถูกเพิ่มมูลค่าหลังจากการส่งการเพิ่มมูลค่าสินทรัพย์ {0}"
-#: erpnext/assets/doctype/asset/asset.py:217
+#: erpnext/assets/doctype/asset/asset.py:218
msgid "Asset created"
msgstr "สินทรัพย์ถูกสร้าง"
-#: erpnext/assets/doctype/asset/asset.py:1275
+#: erpnext/assets/doctype/asset/asset.py:1291
msgid "Asset created after being split from Asset {0}"
msgstr "สินทรัพย์ถูกสร้างหลังจากแยกออกจากสินทรัพย์ {0}"
-#: erpnext/assets/doctype/asset/asset.py:220
+#: erpnext/assets/doctype/asset/asset.py:221
msgid "Asset deleted"
msgstr "สินทรัพย์ถูกลบ"
@@ -6116,7 +6120,7 @@ msgstr "สินทรัพย์ถูกทิ้งผ่านรายก
msgid "Asset sold"
msgstr "สินทรัพย์ถูกขาย"
-#: erpnext/assets/doctype/asset/asset.py:195
+#: erpnext/assets/doctype/asset/asset.py:196
msgid "Asset submitted"
msgstr "สินทรัพย์ถูกส่ง"
@@ -6124,7 +6128,7 @@ msgstr "สินทรัพย์ถูกส่ง"
msgid "Asset transferred to Location {0}"
msgstr "สินทรัพย์ถูกย้ายไปยังตำแหน่ง {0}"
-#: erpnext/assets/doctype/asset/asset.py:1284
+#: erpnext/assets/doctype/asset/asset.py:1300
msgid "Asset updated after being split into Asset {0}"
msgstr "สินทรัพย์ถูกอัปเดตหลังจากแยกออกเป็นสินทรัพย์ {0}"
@@ -6215,7 +6219,7 @@ msgstr "สินทรัพย์ไม่ได้ถูกสร้างส
msgid "Assets {assets_link} created for {item_code}"
msgstr "สินทรัพย์ {assets_link} ถูกสร้างสำหรับ {item_code}"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:193
+#: erpnext/manufacturing/doctype/job_card/job_card.js:201
msgid "Assign Job to Employee"
msgstr ""
@@ -6265,11 +6269,11 @@ msgstr ""
msgid "At least one account with exchange gain or loss is required"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:1141
+#: erpnext/assets/doctype/asset/asset.py:1157
msgid "At least one asset has to be selected."
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:930
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:965
msgid "At least one invoice has to be selected."
msgstr ""
@@ -6277,7 +6281,7 @@ msgstr ""
msgid "At least one item should be entered with negative quantity in return document"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:484
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:485
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:540
msgid "At least one mode of payment is required for POS invoice."
msgstr ""
@@ -6827,7 +6831,7 @@ msgstr ""
msgid "Available Stock for Packing Items"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:313
+#: erpnext/assets/doctype/asset/asset.py:314
msgid "Available for use date is required"
msgstr ""
@@ -6844,7 +6848,7 @@ msgstr ""
msgid "Available-for-use Date"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:418
+#: erpnext/assets/doctype/asset/asset.py:419
msgid "Available-for-use Date should be after purchase date"
msgstr ""
@@ -6899,7 +6903,7 @@ msgstr ""
msgid "Avg. Selling Price List Rate"
msgstr ""
-#: erpnext/accounts/report/gross_profit/gross_profit.py:316
+#: erpnext/accounts/report/gross_profit/gross_profit.py:322
msgid "Avg. Selling Rate"
msgstr ""
@@ -6954,7 +6958,7 @@ msgstr ""
#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js:5
#: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:109
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1005
+#: erpnext/selling/doctype/sales_order/sales_order.js:1008
#: erpnext/stock/doctype/material_request/material_request.js:334
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/stock/doctype/stock_entry/stock_entry.js:633
@@ -6968,7 +6972,7 @@ msgstr ""
msgid "BOM 1"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1519
+#: erpnext/manufacturing/doctype/bom/bom.py:1556
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr "BOM 1 {0} และ BOM 2 {1} ไม่ควรเหมือนกัน"
@@ -7187,7 +7191,7 @@ msgstr "รายการ BOM บนเว็บไซต์"
msgid "BOM Website Operation"
msgstr "การดำเนินการ BOM บนเว็บไซต์"
-#: erpnext/stock/doctype/stock_entry/stock_entry.js:1208
+#: erpnext/stock/doctype/stock_entry/stock_entry.js:1214
msgid "BOM and Manufacturing Quantity are required"
msgstr "ต้องการ BOM และปริมาณการผลิต"
@@ -7210,19 +7214,19 @@ msgstr "การวนซ้ำ BOM: {0} ไม่สามารถเป็
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr "การวนซ้ำ BOM: {1} ไม่สามารถเป็นพ่อแม่หรือลูกของ {0} ได้"
-#: erpnext/manufacturing/doctype/bom/bom.py:1332
+#: erpnext/manufacturing/doctype/bom/bom.py:1369
msgid "BOM {0} does not belong to Item {1}"
msgstr "BOM {0} ไม่ได้เป็นของรายการ {1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1314
+#: erpnext/manufacturing/doctype/bom/bom.py:1351
msgid "BOM {0} must be active"
msgstr "BOM {0} ต้องเปิดใช้งาน"
-#: erpnext/manufacturing/doctype/bom/bom.py:1317
+#: erpnext/manufacturing/doctype/bom/bom.py:1354
msgid "BOM {0} must be submitted"
msgstr "BOM {0} ต้องถูกส่ง"
-#: erpnext/manufacturing/doctype/bom/bom.py:734
+#: erpnext/manufacturing/doctype/bom/bom.py:765
msgid "BOM {0} not found for the item {1}"
msgstr "ไม่พบ BOM {0} สำหรับรายการ {1}"
@@ -7293,7 +7297,7 @@ msgstr ""
msgid "Balance (Dr - Cr)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:673
+#: erpnext/accounts/report/general_ledger/general_ledger.py:693
msgid "Balance ({0})"
msgstr ""
@@ -7685,7 +7689,7 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
-#: erpnext/public/js/utils/barcode_scanner.js:282
+#: erpnext/public/js/utils/barcode_scanner.js:308
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#: erpnext/stock/doctype/item_barcode/item_barcode.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -7906,6 +7910,7 @@ msgid "Batch Details"
msgstr ""
#: erpnext/stock/doctype/batch/batch.py:197
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:455
msgid "Batch Expiry Date"
msgstr ""
@@ -7958,7 +7963,7 @@ msgstr ""
#: 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:2446
-#: erpnext/public/js/utils/barcode_scanner.js:260
+#: erpnext/public/js/utils/barcode_scanner.js:286
#: erpnext/public/js/utils/serial_no_batch_selector.js:438
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#: erpnext/stock/doctype/item_price/item_price.json
@@ -7979,7 +7984,7 @@ msgstr ""
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:81
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:160
#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:19
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:416
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:448
#: erpnext/stock/report/stock_ledger/stock_ledger.js:78
#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
#: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
@@ -7994,7 +7999,7 @@ msgstr ""
msgid "Batch No {0} does not exists"
msgstr ""
-#: erpnext/stock/utils.py:632
+#: erpnext/stock/utils.py:638
msgid "Batch No {0} is linked with Item {1} which has serial no. Please scan serial no instead."
msgstr ""
@@ -8062,7 +8067,7 @@ msgstr ""
msgid "Batch not created for item {} since it does not have a batch series."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:348
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:350
msgid "Batch {0} and Warehouse"
msgstr ""
@@ -8139,7 +8144,7 @@ msgstr ""
#. Label of a Card Break in the Manufacturing Workspace
#. Label of a Link in the Manufacturing Workspace
-#: erpnext/manufacturing/doctype/bom/bom.py:1188
+#: erpnext/manufacturing/doctype/bom/bom.py:1225
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8453,7 +8458,7 @@ msgid "Blanket Order Rate"
msgstr ""
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:268
msgid "Block Invoice"
msgstr ""
@@ -8651,7 +8656,7 @@ msgstr ""
#: erpnext/accounts/doctype/pricing_rule_brand/pricing_rule_brand.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:300
+#: erpnext/accounts/report/gross_profit/gross_profit.py:306
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:53
#: erpnext/accounts/report/sales_register/sales_register.js:64
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -8724,7 +8729,7 @@ msgstr ""
msgid "Brokerage"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:143
+#: erpnext/manufacturing/doctype/bom/bom.js:164
msgid "Browse BOM"
msgstr ""
@@ -8946,7 +8951,7 @@ msgstr ""
msgid "Buying & Selling Settings"
msgstr ""
-#: erpnext/accounts/report/gross_profit/gross_profit.py:337
+#: erpnext/accounts/report/gross_profit/gross_profit.py:343
msgid "Buying Amount"
msgstr ""
@@ -9617,11 +9622,11 @@ msgstr ""
msgid "Cannot covert to Group because Account Type is selected."
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:988
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:990
msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts."
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.py:1758
+#: erpnext/selling/doctype/sales_order/sales_order.py:1774
#: erpnext/stock/doctype/pick_list/pick_list.py:199
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 ""
@@ -9634,15 +9639,11 @@ msgstr ""
msgid "Cannot create return for consolidated invoice {0}."
msgstr ""
-#: erpnext/accounts/doctype/account/account_tree.js:241
-msgid "Cannot create root account."
-msgstr ""
-
-#: erpnext/manufacturing/doctype/bom/bom.py:1044
+#: erpnext/manufacturing/doctype/bom/bom.py:1081
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr ""
-#: erpnext/crm/doctype/opportunity/opportunity.py:277
+#: erpnext/crm/doctype/opportunity/opportunity.py:282
msgid "Cannot declare as lost, because Quotation has been made."
msgstr ""
@@ -9672,7 +9673,11 @@ msgstr ""
msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No."
msgstr ""
-#: erpnext/public/js/utils/barcode_scanner.js:54
+#: erpnext/public/js/utils/barcode_scanner.js:62
+msgid "Cannot find Item or Warehouse with this Barcode"
+msgstr ""
+
+#: erpnext/public/js/utils/barcode_scanner.js:63
msgid "Cannot find Item with this Barcode"
msgstr ""
@@ -9723,7 +9728,7 @@ msgstr ""
msgid "Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row"
msgstr ""
-#: erpnext/selling/doctype/quotation/quotation.py:283
+#: erpnext/selling/doctype/quotation/quotation.py:285
msgid "Cannot set as Lost as Sales Order is made."
msgstr ""
@@ -9910,7 +9915,7 @@ msgstr ""
msgid "Cash In Hand"
msgstr "เงินสดในมือ"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:321
msgid "Cash or Bank Account is mandatory for making payment entry"
msgstr ""
@@ -10536,8 +10541,8 @@ msgstr ""
#: erpnext/selling/doctype/sales_order/sales_order.js:591
#: erpnext/selling/doctype/sales_order/sales_order.js:623
#: erpnext/selling/doctype/sales_order/sales_order_list.js:66
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:319
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:276
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:325
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:283
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:170
#: erpnext/support/doctype/issue/issue.js:23
msgid "Close"
@@ -10642,7 +10647,7 @@ msgstr ""
msgid "Closing (Dr)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:379
+#: erpnext/accounts/report/general_ledger/general_ledger.py:399
msgid "Closing (Opening + Total)"
msgstr ""
@@ -11502,7 +11507,7 @@ msgstr ""
msgid "Company name not same"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:261
+#: erpnext/assets/doctype/asset/asset.py:262
msgid "Company of asset {0} and purchase document {1} doesn't matches."
msgstr ""
@@ -11545,7 +11550,7 @@ msgstr ""
msgid "Company {} does not exist yet. Taxes setup aborted."
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:528
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:529
msgid "Company {} does not match with POS Profile Company {}"
msgstr ""
@@ -11582,7 +11587,7 @@ msgstr ""
msgid "Complete"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:230
+#: erpnext/manufacturing/doctype/job_card/job_card.js:238
#: erpnext/manufacturing/doctype/workstation/workstation.js:151
msgid "Complete Job"
msgstr ""
@@ -11715,8 +11720,8 @@ msgstr ""
msgid "Completed Qty cannot be greater than 'Qty to Manufacture'"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:278
-#: erpnext/manufacturing/doctype/job_card/job_card.js:373
+#: erpnext/manufacturing/doctype/job_card/job_card.js:286
+#: erpnext/manufacturing/doctype/job_card/job_card.js:381
#: erpnext/manufacturing/doctype/workstation/workstation.js:296
msgid "Completed Quantity"
msgstr ""
@@ -12608,13 +12613,13 @@ msgstr "การแก้ไข"
msgid "Corrective Action"
msgstr "การดำเนินการแก้ไข"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:430
+#: erpnext/manufacturing/doctype/job_card/job_card.js:438
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:437
+#: erpnext/manufacturing/doctype/job_card/job_card.js:445
#: erpnext/manufacturing/doctype/job_card/job_card.json
msgid "Corrective Operation"
msgstr "การดำเนินการแก้ไข"
@@ -12758,9 +12763,9 @@ msgstr "ต้นทุน"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:197
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98
#: erpnext/accounts/report/general_ledger/general_ledger.js:153
-#: erpnext/accounts/report/general_ledger/general_ledger.py:734
+#: erpnext/accounts/report/general_ledger/general_ledger.py:767
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
-#: erpnext/accounts/report/gross_profit/gross_profit.py:364
+#: erpnext/accounts/report/gross_profit/gross_profit.py:370
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
#: erpnext/accounts/report/purchase_register/purchase_register.js:46
#: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py:29
@@ -12845,8 +12850,8 @@ msgstr "ศูนย์ต้นทุนสำหรับแถวรายก
msgid "Cost Center is a part of Cost Center Allocation, hence cannot be converted to a group"
msgstr "ศูนย์ต้นทุนเป็นส่วนหนึ่งของการจัดสรรศูนย์ต้นทุน ดังนั้นจึงไม่สามารถแปลงเป็นกลุ่มได้"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1412
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:873
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1414
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:875
msgid "Cost Center is required in row {0} in Taxes table for type {1}"
msgstr "ต้องการศูนย์ต้นทุนในแถว {0} ในตารางภาษีสำหรับประเภท {1}"
@@ -12866,11 +12871,11 @@ msgstr "ศูนย์ต้นทุนที่มีธุรกรรมอ
msgid "Cost Center {0} cannot be used for allocation as it is used as main cost center in other allocation record."
msgstr "ศูนย์ต้นทุน {0} ไม่สามารถใช้สำหรับการจัดสรรได้เนื่องจากใช้เป็นศูนย์ต้นทุนหลักในบันทึกการจัดสรรอื่น"
-#: erpnext/assets/doctype/asset/asset.py:289
+#: erpnext/assets/doctype/asset/asset.py:290
msgid "Cost Center {} doesn't belong to Company {}"
msgstr "ศูนย์ต้นทุน {} ไม่ได้เป็นของบริษัท {}"
-#: erpnext/assets/doctype/asset/asset.py:296
+#: erpnext/assets/doctype/asset/asset.py:297
msgid "Cost Center {} is a group cost center and group cost centers cannot be used in transactions"
msgstr "ศูนย์ต้นทุน {} เป็นศูนย์ต้นทุนกลุ่มและศูนย์ต้นทุนกลุ่มไม่สามารถใช้ในธุรกรรมได้"
@@ -12986,11 +12991,11 @@ msgstr ""
msgid "Could Not Delete Demo Data"
msgstr ""
-#: erpnext/selling/doctype/quotation/quotation.py:584
+#: erpnext/selling/doctype/quotation/quotation.py:606
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:674
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr ""
@@ -13119,9 +13124,9 @@ msgstr ""
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:127
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:135
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:146
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:222
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:659
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:683
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:228
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:665
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:689
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13161,14 +13166,14 @@ msgstr ""
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:34
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:48
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:64
-#: erpnext/manufacturing/doctype/bom/bom.js:171
-#: erpnext/manufacturing/doctype/bom/bom.js:180
-#: erpnext/manufacturing/doctype/bom/bom.js:190
-#: erpnext/manufacturing/doctype/bom/bom.js:194
-#: erpnext/manufacturing/doctype/bom/bom.js:438
+#: erpnext/manufacturing/doctype/bom/bom.js:192
+#: erpnext/manufacturing/doctype/bom/bom.js:201
+#: erpnext/manufacturing/doctype/bom/bom.js:211
+#: erpnext/manufacturing/doctype/bom/bom.js:215
+#: erpnext/manufacturing/doctype/bom/bom.js:459
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.js:99
-#: erpnext/manufacturing/doctype/job_card/job_card.js:137
-#: erpnext/manufacturing/doctype/job_card/job_card.js:151
+#: erpnext/manufacturing/doctype/job_card/job_card.js:145
+#: erpnext/manufacturing/doctype/job_card/job_card.js:159
#: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:268
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:145
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:159
@@ -13180,7 +13185,7 @@ msgstr ""
#: erpnext/projects/doctype/task/task_tree.js:81
#: erpnext/public/js/communication.js:19 erpnext/public/js/communication.js:31
#: erpnext/public/js/communication.js:41
-#: erpnext/public/js/controllers/transaction.js:361
+#: erpnext/public/js/controllers/transaction.js:362
#: erpnext/public/js/controllers/transaction.js:2494
#: erpnext/selling/doctype/customer/customer.js:181
#: erpnext/selling/doctype/quotation/quotation.js:125
@@ -13199,18 +13204,18 @@ msgstr ""
#: erpnext/selling/doctype/sales_order/sales_order.js:759
#: erpnext/selling/doctype/sales_order/sales_order.js:766
#: erpnext/selling/doctype/sales_order/sales_order.js:770
-#: erpnext/selling/doctype/sales_order/sales_order.js:917
-#: erpnext/selling/doctype/sales_order/sales_order.js:1056
+#: erpnext/selling/doctype/sales_order/sales_order.js:920
+#: erpnext/selling/doctype/sales_order/sales_order.js:1059
#: erpnext/stock/doctype/delivery_note/delivery_note.js:96
#: erpnext/stock/doctype/delivery_note/delivery_note.js:98
#: erpnext/stock/doctype/delivery_note/delivery_note.js:121
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:247
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:261
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:271
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:281
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:300
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:305
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:347
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:253
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:277
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:287
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:306
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:311
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:353
#: erpnext/stock/doctype/item/item.js:167
#: erpnext/stock/doctype/item/item.js:174
#: erpnext/stock/doctype/item/item.js:182
@@ -13234,15 +13239,15 @@ msgstr ""
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:70
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:82
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:108
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:279
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:284
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:286
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:291
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:297
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:300
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:298
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:304
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:307
#: erpnext/stock/doctype/stock_entry/stock_entry.js:170
#: erpnext/stock/doctype/stock_entry/stock_entry.js:172
#: erpnext/stock/doctype/stock_entry/stock_entry.js:247
-#: erpnext/stock/doctype/stock_entry/stock_entry.js:1283
+#: erpnext/stock/doctype/stock_entry/stock_entry.js:1289
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:231
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:264
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:277
@@ -13367,7 +13372,7 @@ msgstr ""
msgid "Create Payment Entry"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:806
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:807
msgid "Create Payment Entry for Consolidated POS Invoices."
msgstr ""
@@ -13383,7 +13388,7 @@ msgstr ""
msgid "Create Prospect"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:1238
+#: erpnext/selling/doctype/sales_order/sales_order.js:1242
#: erpnext/utilities/activation.py:106
msgid "Create Purchase Order"
msgstr ""
@@ -13515,7 +13520,7 @@ msgstr ""
msgid "Creating Accounts..."
msgstr "กำลังสร้างบัญชี..."
-#: erpnext/selling/doctype/sales_order/sales_order.js:1133
+#: erpnext/selling/doctype/sales_order/sales_order.js:1136
msgid "Creating Delivery Note ..."
msgstr ""
@@ -13535,11 +13540,11 @@ msgstr ""
msgid "Creating Purchase Invoices ..."
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:1258
+#: erpnext/selling/doctype/sales_order/sales_order.js:1262
msgid "Creating Purchase Order ..."
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:746
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13608,11 +13613,11 @@ msgstr ""
msgid "Credit"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:691
+#: erpnext/accounts/report/general_ledger/general_ledger.py:711
msgid "Credit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:666
+#: erpnext/accounts/report/general_ledger/general_ledger.py:686
msgid "Credit ({0})"
msgstr ""
@@ -13755,14 +13760,14 @@ msgstr ""
msgid "Credit Note will update it's own outstanding amount, even if 'Return Against' is specified."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:671
msgid "Credit Note {0} has been created automatically"
msgstr ""
#. Label of the credit_to (Link) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:369
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:377
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:371
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:379
#: erpnext/controllers/accounts_controller.py:2282
msgid "Credit To"
msgstr ""
@@ -13961,7 +13966,7 @@ msgstr ""
#: erpnext/accounts/report/financial_statements.html:29
#: erpnext/accounts/report/financial_statements.py:678
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
-#: erpnext/accounts/report/gross_profit/gross_profit.py:427
+#: erpnext/accounts/report/gross_profit/gross_profit.py:443
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
@@ -14062,7 +14067,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2319
+#: erpnext/accounts/utils.py:2323
msgid "Currency for {0} must be {1}"
msgstr ""
@@ -14328,13 +14333,13 @@ msgstr ""
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:286
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:289
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/accounts/doctype/sales_invoice_reference/sales_invoice_reference.json
#: erpnext/accounts/doctype/tax_rule/tax_rule.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:38
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:29
-#: erpnext/accounts/report/gross_profit/gross_profit.py:385
+#: erpnext/accounts/report/gross_profit/gross_profit.py:391
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:37
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:22
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:225
@@ -14397,8 +14402,8 @@ msgstr ""
#: erpnext/setup/doctype/customer_group/customer_group.json
#: erpnext/setup/doctype/territory/territory.json
#: erpnext/setup/workspace/home/home.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:215
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:482
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:218
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:488
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
#: erpnext/stock/doctype/item/item.json
@@ -14412,7 +14417,7 @@ msgstr ""
#: erpnext/stock/report/delayed_item_report/delayed_item_report.py:121
#: erpnext/stock/report/delayed_order_report/delayed_order_report.js:36
#: erpnext/stock/report/delayed_order_report/delayed_order_report.py:46
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:469
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:512
#: erpnext/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14590,7 +14595,7 @@ msgstr "ข้อเสนอแนะจากลูกค้า"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:185
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:56
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:228
-#: erpnext/accounts/report/gross_profit/gross_profit.py:392
+#: erpnext/accounts/report/gross_profit/gross_profit.py:398
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:212
#: erpnext/accounts/report/sales_register/sales_register.js:27
#: erpnext/accounts/report/sales_register/sales_register.py:202
@@ -14698,6 +14703,7 @@ msgstr "หมายเลขมือถือของลูกค้า"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:156
#: 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
+#: erpnext/accounts/report/gross_profit/gross_profit.py:405
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:232
#: erpnext/accounts/report/sales_register/sales_register.py:193
#: erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -14845,7 +14851,7 @@ msgstr "จำเป็นต้องมีลูกค้าสำหรับ
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1087
#: erpnext/selling/doctype/sales_order/sales_order.py:373
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:418
msgid "Customer {0} does not belong to project {1}"
msgstr "ลูกค้า {0} ไม่ได้เป็นของโครงการ {1}"
@@ -15334,11 +15340,11 @@ msgstr "เรียน ผู้จัดการระบบ,"
msgid "Debit"
msgstr "เดบิต"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:684
+#: erpnext/accounts/report/general_ledger/general_ledger.py:704
msgid "Debit (Transaction)"
msgstr "เดบิต (ธุรกรรม)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:659
+#: erpnext/accounts/report/general_ledger/general_ledger.py:679
msgid "Debit ({0})"
msgstr "เดบิต ({0})"
@@ -16280,7 +16286,7 @@ msgstr "การจัดส่ง"
#. Label of the delivery_date (Date) field in DocType 'Sales Order'
#. Label of the delivery_date (Date) field in DocType 'Sales Order Item'
#: erpnext/public/js/utils.js:813
-#: erpnext/selling/doctype/sales_order/sales_order.js:1076
+#: erpnext/selling/doctype/sales_order/sales_order.js:1079
#: erpnext/selling/doctype/sales_order/sales_order.json
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:321
@@ -16315,7 +16321,7 @@ msgstr "ผู้จัดการการจัดส่ง"
#. Label of a Link in the Stock Workspace
#. Label of a shortcut in the Stock Workspace
#: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:306
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:312
#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:36
#: 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
@@ -16422,7 +16428,7 @@ msgstr "จัดส่งถึง"
#. Label of the delivery_trip (Link) field in DocType 'Delivery Note'
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:277
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:283
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_trip/delivery_trip.json
#: erpnext/stock/workspace/stock/stock.json
@@ -16612,7 +16618,7 @@ msgstr ""
msgid "Depreciation Entry Posting Status"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:1109
+#: erpnext/assets/doctype/asset/asset.py:1125
msgid "Depreciation Entry against asset {0}"
msgstr ""
@@ -16659,11 +16665,11 @@ msgstr ""
msgid "Depreciation Posting Date cannot be before Available-for-use Date"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:318
+#: erpnext/assets/doctype/asset/asset.py:319
msgid "Depreciation Row {0}: Depreciation Posting Date cannot be before Available-for-use Date"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:569
+#: erpnext/assets/doctype/asset/asset.py:585
msgid "Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1}"
msgstr ""
@@ -16690,7 +16696,7 @@ msgstr ""
msgid "Depreciation Schedule View"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:412
+#: erpnext/assets/doctype/asset/asset.py:413
msgid "Depreciation cannot be calculated for fully depreciated assets"
msgstr ""
@@ -16868,7 +16874,7 @@ msgstr ""
#: erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
#: erpnext/accounts/doctype/share_type/share_type.json
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:72
-#: erpnext/accounts/report/gross_profit/gross_profit.py:302
+#: erpnext/accounts/report/gross_profit/gross_profit.py:308
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:175
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:196
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:72
@@ -17161,7 +17167,7 @@ msgstr ""
msgid "Difference Value"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:491
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:497
msgid "Different 'Source Warehouse' and 'Target Warehouse' can be set for each row."
msgstr ""
@@ -17931,7 +17937,7 @@ msgstr ""
msgid "Do you want to submit the material request"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:76
+#: erpnext/manufacturing/doctype/job_card/job_card.js:84
msgid "Do you want to submit the stock entry?"
msgstr ""
@@ -18438,7 +18444,7 @@ msgstr "กลุ่มลูกค้าที่ซ้ำกัน"
msgid "Duplicate Entry. Please check Authorization Rule {0}"
msgstr "รายการซ้ำ โปรดตรวจสอบกฎการอนุญาต {0}"
-#: erpnext/assets/doctype/asset/asset.py:342
+#: erpnext/assets/doctype/asset/asset.py:343
msgid "Duplicate Finance Book"
msgstr "สมุดการเงินซ้ำ"
@@ -18631,7 +18637,7 @@ msgstr "แก้ไขบันทึก"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:495
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:501
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -19069,7 +19075,7 @@ msgstr "ว่างเปล่า"
msgid "Ems(Pica)"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1642
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr "เปิดใช้งานอนุญาตการจองบางส่วนในการตั้งค่าสต็อกเพื่อจองสต็อกบางส่วน"
@@ -19306,8 +19312,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:311
-#: erpnext/manufacturing/doctype/job_card/job_card.js:380
+#: erpnext/manufacturing/doctype/job_card/job_card.js:319
+#: erpnext/manufacturing/doctype/job_card/job_card.js:388
#: 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
@@ -19398,8 +19404,8 @@ msgstr "ป้อนหมายเลขซีเรียล"
msgid "Enter Supplier"
msgstr "ป้อนผู้จัดจำหน่าย"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:337
-#: erpnext/manufacturing/doctype/job_card/job_card.js:406
+#: erpnext/manufacturing/doctype/job_card/job_card.js:345
+#: erpnext/manufacturing/doctype/job_card/job_card.js:414
#: erpnext/manufacturing/doctype/workstation/workstation.js:312
msgid "Enter Value"
msgstr "ป้อนค่า"
@@ -19440,7 +19446,7 @@ msgstr "ป้อนหมายเลขโทรศัพท์ของลู
msgid "Enter date to scrap asset"
msgstr "ป้อนวันที่เพื่อทิ้งสินทรัพย์"
-#: erpnext/assets/doctype/asset/asset.py:410
+#: erpnext/assets/doctype/asset/asset.py:411
msgid "Enter depreciation details"
msgstr "ป้อนรายละเอียดค่าเสื่อมราคา"
@@ -19473,7 +19479,7 @@ msgstr "ป้อนชื่อธนาคารหรือสถาบัน
msgid "Enter the opening stock units."
msgstr "ป้อนหน่วยสต็อกเริ่มต้น"
-#: erpnext/manufacturing/doctype/bom/bom.js:865
+#: erpnext/manufacturing/doctype/bom/bom.js:886
msgid "Enter the quantity of the Item that will be manufactured from this Bill of Materials."
msgstr "ป้อนปริมาณของสินค้าที่จะผลิตจากใบรายการวัสดุนี้"
@@ -19829,7 +19835,7 @@ msgstr "อัตราแลกเปลี่ยนต้องเหมือ
msgid "Excise Entry"
msgstr "รายการภาษีสรรพสามิต"
-#: erpnext/stock/doctype/stock_entry/stock_entry.js:1276
+#: erpnext/stock/doctype/stock_entry/stock_entry.js:1282
msgid "Excise Invoice"
msgstr "ใบแจ้งหนี้ภาษีสรรพสามิต"
@@ -20001,7 +20007,7 @@ msgstr "มูลค่าที่คาดหวังหลังจากอ
#: erpnext/accounts/doctype/cashier_closing/cashier_closing.json
#: erpnext/accounts/doctype/ledger_merge/ledger_merge.json
#: erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:596
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:598
#: erpnext/accounts/report/account_balance/account_balance.js:28
#: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:89
#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:178
@@ -20069,13 +20075,13 @@ msgstr "การเรียกร้องค่าใช้จ่าย"
msgid "Expense Head"
msgstr "หัวข้อค่าใช้จ่าย"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:490
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:514
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:534
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:492
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:516
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:536
msgid "Expense Head Changed"
msgstr "หัวข้อค่าใช้จ่ายเปลี่ยนแปลง"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:592
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:594
msgid "Expense account is mandatory for item {0}"
msgstr "บัญชีค่าใช้จ่ายเป็นสิ่งจำเป็นสำหรับรายการ {0}"
@@ -20216,6 +20222,11 @@ msgstr "ใหญ่มาก"
msgid "Extra Small"
msgstr "เล็กมาก"
+#. Label of the finished_good (Link) field in DocType 'BOM Operation'
+#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
+msgid "FG / Semi FG Item"
+msgstr ""
+
#. Option for the 'Valuation Method' (Select) field in DocType 'Item'
#. Option for the 'Default Valuation Method' (Select) field in DocType 'Stock
#. Settings'
@@ -20424,7 +20435,7 @@ msgstr "ดึงข้อมูลตาม"
msgid "Fetch Customers"
msgstr "ดึงข้อมูลลูกค้า"
-#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js:76
+#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js:77
msgid "Fetch Items from Warehouse"
msgstr "ดึงรายการจากคลังสินค้า"
@@ -20440,7 +20451,7 @@ msgstr "ดึงการชำระเงินที่เกินกำห
msgid "Fetch Subscription Updates"
msgstr "ดึงการอัปเดตการสมัครสมาชิก"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1017
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1026
msgid "Fetch Timesheet"
msgstr "ดึงตารางเวลางาน"
@@ -20832,11 +20843,6 @@ msgstr ""
msgid "Finished Goods"
msgstr ""
-#. Label of the finished_good (Link) field in DocType 'BOM Operation'
-#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
-msgid "Finished Goods / Semi Finished Goods Item"
-msgstr ""
-
#. Label of the fg_based_section_section (Section Break) field in DocType 'BOM'
#: erpnext/manufacturing/doctype/bom/bom.json
msgid "Finished Goods Based Operating Cost"
@@ -20847,11 +20853,6 @@ msgstr ""
msgid "Finished Goods Item"
msgstr ""
-#. Label of the finished_good_qty (Float) field in DocType 'BOM Operation'
-#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
-msgid "Finished Goods Qty"
-msgstr ""
-
#. Label of the fg_reference_id (Data) field in DocType 'BOM Creator Item'
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
msgid "Finished Goods Reference"
@@ -21015,7 +21016,7 @@ msgstr "สินทรัพย์ถาวร"
#. Capitalization Asset Item'
#. Label of the fixed_asset_account (Link) field in DocType 'Asset Category
#. Account'
-#: erpnext/assets/doctype/asset/asset.py:751
+#: erpnext/assets/doctype/asset/asset.py:767
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
#: erpnext/assets/doctype/asset_category_account/asset_category_account.json
msgid "Fixed Asset Account"
@@ -21181,7 +21182,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:450
+#: erpnext/manufacturing/doctype/job_card/job_card.js:458
#: erpnext/manufacturing/doctype/job_card/job_card.json
msgid "For Operation"
msgstr ""
@@ -21230,7 +21231,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:466
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:997
+#: erpnext/selling/doctype/sales_order/sales_order.js:1000
#: erpnext/stock/doctype/material_request/material_request.js:344
#: erpnext/templates/form_grid/material_request_grid.html:36
msgid "For Warehouse"
@@ -21300,7 +21301,7 @@ msgstr "สำหรับการอ้างอิง"
msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included"
msgstr "สำหรับแถว {0} ใน {1} เพื่อรวม {2} ในอัตรารายการ ต้องรวมแถว {3} ด้วย"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1635
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1652
msgid "For row {0}: Enter Planned Qty"
msgstr "สำหรับแถว {0}: ป้อนปริมาณที่วางแผนไว้"
@@ -21475,7 +21476,7 @@ msgstr "วันศุกร์"
#. Label of the from_uom (Link) field in DocType 'UOM Conversion Factor'
#. Label of the from (Data) field in DocType 'Call Log'
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1020
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1029
#: erpnext/setup/doctype/uom_conversion_factor/uom_conversion_factor.json
#: erpnext/telephony/doctype/call_log/call_log.json
#: erpnext/templates/pages/projects.html:67
@@ -22079,7 +22080,7 @@ msgstr ""
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:644
+#: erpnext/accounts/report/general_ledger/general_ledger.py:664
msgid "GL Entry"
msgstr ""
@@ -22345,12 +22346,12 @@ msgid "Get Items"
msgstr ""
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:170
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:192
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:270
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:299
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:330
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1073
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:173
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:198
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:273
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:305
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:339
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1082
#: erpnext/buying/doctype/purchase_order/purchase_order.js:612
#: erpnext/buying/doctype/purchase_order/purchase_order.js:632
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:366
@@ -22366,13 +22367,13 @@ msgstr ""
#: erpnext/public/js/controllers/buying.js:296
#: erpnext/selling/doctype/quotation/quotation.js:167
#: erpnext/selling/doctype/sales_order/sales_order.js:174
-#: erpnext/selling/doctype/sales_order/sales_order.js:798
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:187
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:236
+#: erpnext/selling/doctype/sales_order/sales_order.js:801
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:190
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:242
#: erpnext/stock/doctype/material_request/material_request.js:126
#: erpnext/stock/doctype/material_request/material_request.js:221
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:156
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:270
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:160
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:277
#: erpnext/stock/doctype/stock_entry/stock_entry.js:319
#: erpnext/stock/doctype/stock_entry/stock_entry.js:366
#: erpnext/stock/doctype/stock_entry/stock_entry.js:395
@@ -22500,7 +22501,7 @@ msgstr ""
msgid "Get Suppliers By"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1069
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1078
msgid "Get Timesheets"
msgstr ""
@@ -22818,7 +22819,7 @@ msgstr ""
#. Label of the gross_profit (Currency) field in DocType 'Quotation Item'
#. Label of the gross_profit (Currency) field in DocType 'Sales Order Item'
#: erpnext/accounts/report/gross_profit/gross_profit.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:344
+#: erpnext/accounts/report/gross_profit/gross_profit.py:350
#: erpnext/accounts/workspace/financial_reports/financial_reports.json
#: erpnext/selling/doctype/quotation_item/quotation_item.json
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -22829,7 +22830,7 @@ msgstr "กำไรขั้นต้น"
msgid "Gross Profit / Loss"
msgstr "กำไร/ขาดทุนขั้นต้น"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:351
+#: erpnext/accounts/report/gross_profit/gross_profit.py:357
msgid "Gross Profit Percent"
msgstr "เปอร์เซ็นต์กำไรขั้นต้น"
@@ -22841,11 +22842,11 @@ msgstr "เปอร์เซ็นต์กำไรขั้นต้น"
msgid "Gross Purchase Amount"
msgstr "จำนวนเงินซื้อรวม"
-#: erpnext/assets/doctype/asset/asset.py:380
+#: erpnext/assets/doctype/asset/asset.py:381
msgid "Gross Purchase Amount is mandatory"
msgstr "จำนวนเงินซื้อรวมเป็นสิ่งจำเป็น"
-#: erpnext/assets/doctype/asset/asset.py:425
+#: erpnext/assets/doctype/asset/asset.py:441
msgid "Gross Purchase Amount should be equal to purchase amount of one single Asset."
msgstr "จำนวนเงินซื้อรวมควร เท่ากับ จำนวนเงินซื้อของสินทรัพย์เดียว"
@@ -23887,11 +23888,11 @@ msgstr "หากคุณเก็บสต็อกของรายการ
msgid "If you need to reconcile particular transactions against each other, then please select accordingly. If not, all the transactions will be allocated in FIFO order."
msgstr "หากคุณต้องการกระทบยอดธุรกรรมเฉพาะระหว่างกัน โปรดเลือกตามนั้น หากไม่ใช่ ธุรกรรมทั้งหมดจะถูกจัดสรรตามลำดับ FIFO"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1036
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1051
msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox."
msgstr "หากคุณยังต้องการดำเนินการต่อ โปรดยกเลิกการเลือกช่องทำเครื่องหมาย 'ข้ามรายการประกอบย่อยที่มีอยู่'"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1748
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1765
msgid "If you still want to proceed, please enable {0}."
msgstr "หากคุณยังต้องการดำเนินการต่อ โปรดเปิดใช้งาน {0}"
@@ -23965,11 +23966,11 @@ msgstr "ละเว้นสต็อกว่างเปล่า"
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:980
+#: erpnext/selling/doctype/sales_order/sales_order.js:983
msgid "Ignore Existing Ordered Qty"
msgstr "ละเว้นปริมาณที่สั่งซื้อที่มีอยู่"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1740
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1757
msgid "Ignore Existing Projected Quantity"
msgstr "ละเว้นปริมาณที่คาดการณ์ที่มีอยู่"
@@ -24614,7 +24615,7 @@ msgstr "รวมแบทช์ที่หมดอายุ"
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:976
+#: erpnext/selling/doctype/sales_order/sales_order.js:979
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -24813,7 +24814,7 @@ msgstr "การตรวจสอบในคลังสินค้า (ก
msgid "Incorrect Component Quantity"
msgstr "ปริมาณส่วนประกอบไม่ถูกต้อง"
-#: erpnext/assets/doctype/asset/asset.py:321
+#: erpnext/assets/doctype/asset/asset.py:322
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py:56
msgid "Incorrect Date"
msgstr "วันที่ไม่ถูกต้อง"
@@ -25059,7 +25060,7 @@ msgstr "วันที่ติดตั้ง"
#. 'Installation Note'
#. Label of a Link in the Stock Workspace
#: erpnext/selling/doctype/installation_note/installation_note.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:257
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:263
#: erpnext/stock/workspace/stock/stock.json
msgid "Installation Note"
msgstr "บันทึกการติดตั้ง"
@@ -25069,7 +25070,7 @@ msgstr "บันทึกการติดตั้ง"
msgid "Installation Note Item"
msgstr "รายการบันทึกการติดตั้ง"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:625
msgid "Installation Note {0} has already been submitted"
msgstr "บันทึกการติดตั้ง {0} ได้ถูกส่งแล้ว"
@@ -25127,7 +25128,7 @@ msgstr "สิทธิ์ไม่เพียงพอ"
#: erpnext/stock/doctype/pick_list/pick_list.py:132
#: erpnext/stock/doctype/pick_list/pick_list.py:1003
#: erpnext/stock/doctype/stock_entry/stock_entry.py:788
-#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1103 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr "สต็อกไม่เพียงพอ"
@@ -25221,6 +25222,10 @@ msgstr "การอ้างอิงรายการบัญชีระห
msgid "Inter Company Order Reference"
msgstr "การอ้างอิงคำสั่งซื้อระหว่างบริษัท"
+#: erpnext/selling/doctype/sales_order/sales_order.js:742
+msgid "Inter Company Purchase Order"
+msgstr ""
+
#. Label of the inter_company_reference (Link) field in DocType 'Delivery Note'
#. Label of the inter_company_reference (Link) field in DocType 'Purchase
#. Receipt'
@@ -25229,6 +25234,10 @@ msgstr "การอ้างอิงคำสั่งซื้อระหว
msgid "Inter Company Reference"
msgstr "การอ้างอิงระหว่างบริษัท"
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:485
+msgid "Inter Company Sales Order"
+msgstr ""
+
#. Label of the inter_transfer_reference_section (Section Break) field in
#. DocType 'Sales Order Item'
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -25270,10 +25279,18 @@ msgstr "ลูกค้าภายใน"
msgid "Internal Customer for company {0} already exists"
msgstr "ลูกค้าภายในสำหรับบริษัท {0} มีอยู่แล้ว"
+#: erpnext/selling/doctype/sales_order/sales_order.js:741
+msgid "Internal Purchase Order"
+msgstr ""
+
#: erpnext/controllers/accounts_controller.py:731
msgid "Internal Sale or Delivery Reference missing."
msgstr "การอ้างอิงการขายหรือการจัดส่งภายในหายไป"
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:484
+msgid "Internal Sales Order"
+msgstr ""
+
#: erpnext/controllers/accounts_controller.py:733
msgid "Internal Sales Reference Missing"
msgstr "การอ้างอิงการขายภายในหายไป"
@@ -25342,8 +25359,8 @@ msgstr "การแนะนำ"
msgid "Invalid"
msgstr "ไม่ถูกต้อง"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:370
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:378
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:372
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:380
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:961
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:971
#: erpnext/assets/doctype/asset_category/asset_category.py:69
@@ -25386,8 +25403,8 @@ msgstr "กระบวนการย่อยไม่ถูกต้อง"
msgid "Invalid Company for Inter Company Transaction."
msgstr "บริษัทไม่ถูกต้องสำหรับธุรกรรมระหว่างบริษัท"
-#: erpnext/assets/doctype/asset/asset.py:292
-#: erpnext/assets/doctype/asset/asset.py:299
+#: erpnext/assets/doctype/asset/asset.py:293
+#: erpnext/assets/doctype/asset/asset.py:300
#: erpnext/controllers/accounts_controller.py:3037
msgid "Invalid Cost Center"
msgstr "ศูนย์ต้นทุนไม่ถูกต้อง"
@@ -25417,7 +25434,7 @@ msgstr "ประเภทเอกสารไม่ถูกต้อง"
msgid "Invalid Formula"
msgstr "สูตรไม่ถูกต้อง"
-#: erpnext/assets/doctype/asset/asset.py:430
+#: erpnext/assets/doctype/asset/asset.py:446
msgid "Invalid Gross Purchase Amount"
msgstr "จำนวนเงินซื้อรวมไม่ถูกต้อง"
@@ -25425,7 +25442,7 @@ msgstr "จำนวนเงินซื้อรวมไม่ถูกต้
msgid "Invalid Group By"
msgstr "จัดกลุ่มตามไม่ถูกต้อง"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:453
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:454
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:914
msgid "Invalid Item"
msgstr "รายการไม่ถูกต้อง"
@@ -25468,7 +25485,7 @@ msgstr "บทบาทหลักไม่ถูกต้อง"
msgid "Invalid Priority"
msgstr "ลำดับความสำคัญไม่ถูกต้อง"
-#: erpnext/manufacturing/doctype/bom/bom.py:1093
+#: erpnext/manufacturing/doctype/bom/bom.py:1130
msgid "Invalid Process Loss Configuration"
msgstr "การกำหนดค่าการสูญเสียกระบวนการไม่ถูกต้อง"
@@ -25496,8 +25513,8 @@ msgstr "การคืนไม่ถูกต้อง"
msgid "Invalid Sales Invoices"
msgstr "ใบแจ้งหนี้ขายไม่ถูกต้อง"
-#: erpnext/assets/doctype/asset/asset.py:515
-#: erpnext/assets/doctype/asset/asset.py:534
+#: erpnext/assets/doctype/asset/asset.py:531
+#: erpnext/assets/doctype/asset/asset.py:550
msgid "Invalid Schedule"
msgstr "ตารางเวลาไม่ถูกต้อง"
@@ -25530,7 +25547,7 @@ msgstr "จำนวนเงินไม่ถูกต้องในราย
msgid "Invalid condition expression"
msgstr "นิพจน์เงื่อนไขไม่ถูกต้อง"
-#: erpnext/selling/doctype/quotation/quotation.py:270
+#: erpnext/selling/doctype/quotation/quotation.py:272
msgid "Invalid lost reason {0}, please create a new lost reason"
msgstr "เหตุผลที่สูญหายไม่ถูกต้อง {0} โปรดสร้างเหตุผลที่สูญหายใหม่"
@@ -25676,7 +25693,7 @@ msgstr ""
msgid "Invoice Number"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:812
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:813
msgid "Invoice Paid"
msgstr ""
@@ -26270,6 +26287,14 @@ msgstr "เป็นมาตรฐาน"
msgid "Is Stock Item"
msgstr "เป็นรายการสต็อก"
+#. Label of the is_sub_assembly_item (Check) field in DocType 'BOM Explosion
+#. Item'
+#. Label of the is_sub_assembly_item (Check) field in DocType 'BOM Item'
+#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
+#: erpnext/manufacturing/doctype/bom_item/bom_item.json
+msgid "Is Sub Assembly Item"
+msgstr ""
+
#. Label of the is_subcontracted (Check) field in DocType 'Purchase Invoice'
#. Label of the is_subcontracted (Check) field in DocType 'Purchase Order'
#. Label of the is_subcontracted (Check) field in DocType 'Supplier Quotation'
@@ -26496,7 +26521,7 @@ msgstr "ไม่สามารถกระจายค่าใช้จ่า
#: erpnext/buying/workspace/buying/buying.json
#: erpnext/controllers/taxes_and_totals.py:1123
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.json
-#: erpnext/manufacturing/doctype/bom/bom.js:944
+#: erpnext/manufacturing/doctype/bom/bom.js:979
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109
#: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:25
@@ -26517,7 +26542,7 @@ msgstr "ไม่สามารถกระจายค่าใช้จ่า
#: erpnext/public/js/stock_analytics.js:92
#: erpnext/selling/doctype/party_specific_item/party_specific_item.json
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1203
+#: erpnext/selling/doctype/sales_order/sales_order.js:1206
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:46
#: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.js:14
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.js:36
@@ -26720,10 +26745,10 @@ msgstr "ตะกร้ารายการ"
#: erpnext/accounts/doctype/pricing_rule_item_code/pricing_rule_item_code.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1026
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1035
#: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:68
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:37
-#: erpnext/accounts/report/gross_profit/gross_profit.py:281
+#: erpnext/accounts/report/gross_profit/gross_profit.py:287
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:150
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:171
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:37
@@ -26780,8 +26805,8 @@ msgstr "ตะกร้ารายการ"
#: erpnext/selling/doctype/quotation_item/quotation_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:345
#: erpnext/selling/doctype/sales_order/sales_order.js:453
-#: erpnext/selling/doctype/sales_order/sales_order.js:839
-#: erpnext/selling/doctype/sales_order/sales_order.js:990
+#: erpnext/selling/doctype/sales_order/sales_order.js:842
+#: erpnext/selling/doctype/sales_order/sales_order.js:993
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py:29
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:27
@@ -26824,7 +26849,7 @@ msgstr "ตะกร้ารายการ"
#: erpnext/stock/report/item_price_stock/item_price_stock.py:18
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:125
#: 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:396
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:419
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:7
#: erpnext/stock/report/stock_ageing/stock_ageing.py:130
#: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:104
@@ -26851,7 +26876,7 @@ msgstr ""
msgid "Item Code cannot be changed for Serial No."
msgstr "ไม่สามารถเปลี่ยนรหัสรายการสำหรับหมายเลขซีเรียลได้"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:445
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:447
msgid "Item Code required at Row No {0}"
msgstr "ต้องการรหัสรายการที่แถวที่ {0}"
@@ -26956,7 +26981,7 @@ msgstr "รายละเอียดของรายการ"
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/doctype/tax_rule/tax_rule.json
#: erpnext/accounts/report/gross_profit/gross_profit.js:44
-#: erpnext/accounts/report/gross_profit/gross_profit.py:294
+#: erpnext/accounts/report/gross_profit/gross_profit.py:300
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js:21
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:28
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:28
@@ -27168,7 +27193,7 @@ msgstr "ผู้ผลิตรายการ"
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:74
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:71
-#: erpnext/accounts/report/gross_profit/gross_profit.py:288
+#: erpnext/accounts/report/gross_profit/gross_profit.py:294
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:33
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:156
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:177
@@ -27217,7 +27242,7 @@ msgstr "ผู้ผลิตรายการ"
#: erpnext/public/js/controllers/transaction.js:2414
#: erpnext/public/js/utils.js:756
#: erpnext/selling/doctype/quotation_item/quotation_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:845
+#: erpnext/selling/doctype/sales_order/sales_order.js:848
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py:35
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:33
@@ -27251,7 +27276,7 @@ msgstr "ผู้ผลิตรายการ"
#: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143
#: 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:131
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:403
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:426
#: erpnext/stock/report/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -27300,7 +27325,7 @@ msgstr "การตั้งค่าราคาของรายการ"
msgid "Item Price Stock"
msgstr "ราคาสต็อกของรายการ"
-#: erpnext/stock/get_item_details.py:1063
+#: erpnext/stock/get_item_details.py:1058
msgid "Item Price added for {0} in Price List {1}"
msgstr "เพิ่มราคาของรายการ {0} ในรายการราคา {1}"
@@ -27308,7 +27333,7 @@ msgstr "เพิ่มราคาของรายการ {0} ในรา
msgid "Item Price appears multiple times based on Price List, Supplier/Customer, Currency, Item, Batch, UOM, Qty, and Dates."
msgstr "ราคาของรายการปรากฏหลายครั้งตามรายการราคา ผู้จัดจำหน่าย/ลูกค้า สกุลเงิน รายการ แบทช์ หน่วยวัด ปริมาณ และวันที่"
-#: erpnext/stock/get_item_details.py:1042
+#: erpnext/stock/get_item_details.py:1037
msgid "Item Price updated for {0} in Price List {1}"
msgstr "อัปเดตราคาของรายการ {0} ในรายการราคา {1}"
@@ -27456,8 +27481,8 @@ msgstr "รายการที่จะผลิต"
msgid "Item UOM"
msgstr "หน่วยวัดของรายการ"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:409
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:416
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:410
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:417
msgid "Item Unavailable"
msgstr "รายการไม่พร้อมใช้งาน"
@@ -27573,7 +27598,7 @@ msgid "Item must be added using 'Get Items from Purchase Receipts' button"
msgstr "ต้องเพิ่มรายการโดยใช้ปุ่ม 'ดึงรายการจากใบรับซื้อ'"
#: erpnext/buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:42
-#: erpnext/selling/doctype/sales_order/sales_order.js:1210
+#: erpnext/selling/doctype/sales_order/sales_order.js:1213
msgid "Item name"
msgstr "ชื่อรายการ"
@@ -27620,7 +27645,7 @@ msgstr "ไม่สามารถเพิ่มรายการ {0} เป
msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}."
msgstr "ไม่สามารถสั่งซื้อรายการ {0} ได้มากกว่า {1} ต่อคำสั่งซื้อแบบครอบคลุม {2}"
-#: erpnext/assets/doctype/asset/asset.py:274
+#: erpnext/assets/doctype/asset/asset.py:275
#: erpnext/stock/doctype/item/item.py:634
msgid "Item {0} does not exist"
msgstr "รายการ {0} ไม่มีอยู่"
@@ -27641,7 +27666,7 @@ msgstr "รายการ {0} ถูกป้อนหลายครั้ง"
msgid "Item {0} has already been returned"
msgstr "รายการ {0} ถูกคืนแล้ว"
-#: erpnext/assets/doctype/asset/asset.py:276
+#: erpnext/assets/doctype/asset/asset.py:277
msgid "Item {0} has been disabled"
msgstr "รายการ {0} ถูกปิดใช้งาน"
@@ -27657,7 +27682,7 @@ msgstr "รายการ {0} ถึงจุดสิ้นสุดของ
msgid "Item {0} ignored since it is not a stock item"
msgstr "ละเว้นรายการ {0} เนื่องจากไม่ใช่รายการสต็อก"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:565
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:567
msgid "Item {0} is already reserved/delivered against Sales Order {1}."
msgstr "รายการ {0} ถูกจอง/จัดส่งแล้วต่อคำสั่งขาย {1}"
@@ -27685,7 +27710,7 @@ msgstr "รายการ {0} ไม่ใช่รายการที่จ
msgid "Item {0} is not active or end of life has been reached"
msgstr "รายการ {0} ไม่ได้ใช้งานหรือถึงจุดสิ้นสุดของอายุการใช้งานแล้ว"
-#: erpnext/assets/doctype/asset/asset.py:278
+#: erpnext/assets/doctype/asset/asset.py:279
msgid "Item {0} must be a Fixed Asset Item"
msgstr "รายการ {0} ต้องเป็นรายการสินทรัพย์ถาวร"
@@ -27697,7 +27722,7 @@ msgstr "รายการ {0} ต้องเป็นรายการที
msgid "Item {0} must be a Sub-contracted Item"
msgstr "รายการ {0} ต้องเป็นรายการที่จ้างช่วง"
-#: erpnext/assets/doctype/asset/asset.py:280
+#: erpnext/assets/doctype/asset/asset.py:281
msgid "Item {0} must be a non-stock item"
msgstr "รายการ {0} ต้องเป็นรายการที่ไม่ใช่สต็อก"
@@ -27754,7 +27779,7 @@ msgstr "ประวัติการขายสินค้าตามรา
msgid "Item-wise Sales Register"
msgstr "ทะเบียนการขายสินค้าตามรายการ"
-#: erpnext/stock/get_item_details.py:703
+#: erpnext/stock/get_item_details.py:698
msgid "Item/Item Code required to get Item Tax Template."
msgstr ""
@@ -27812,11 +27837,11 @@ msgstr "รายการ: {0} ไม่มีอยู่ในระบบ"
#: erpnext/selling/doctype/installation_note/installation_note.json
#: erpnext/selling/doctype/product_bundle/product_bundle.json
#: erpnext/selling/doctype/quotation/quotation.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:831
+#: erpnext/selling/doctype/sales_order/sales_order.js:834
#: erpnext/selling/doctype/sales_order/sales_order.json
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:19
#: erpnext/setup/doctype/item_group/item_group.js:87
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:487
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:493
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/material_request/material_request.json
#: erpnext/stock/doctype/packing_slip/packing_slip.json
@@ -27846,8 +27871,8 @@ msgstr ""
msgid "Items Filter"
msgstr "ตัวกรองรายการ"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1601
-#: erpnext/selling/doctype/sales_order/sales_order.js:1246
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1618
+#: erpnext/selling/doctype/sales_order/sales_order.js:1250
msgid "Items Required"
msgstr "ต้องการรายการ"
@@ -27867,7 +27892,7 @@ msgstr ""
msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}."
msgstr "ไม่สามารถอัปเดตรายการได้เนื่องจากมีการสร้างคำสั่งจ้างช่วงต่อใบสั่งซื้อ {0}"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1026
+#: erpnext/selling/doctype/sales_order/sales_order.js:1029
msgid "Items for Raw Material Request"
msgstr "รายการสำหรับคำขอวัตถุดิบ"
@@ -27881,7 +27906,7 @@ msgstr "อัตรารายการถูกอัปเดตเป็น
msgid "Items to Be Repost"
msgstr "รายการที่จะโพสต์ใหม่"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1600
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1617
msgid "Items to Manufacture are required to pull the Raw Materials associated with it."
msgstr "ต้องการรายการที่จะผลิตเพื่อดึงวัตถุดิบที่เกี่ยวข้องกับมัน"
@@ -28378,7 +28403,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:685
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:104
#: erpnext/stock/workspace/stock/stock.json
@@ -28490,6 +28515,35 @@ msgstr "วันที่คำสั่งซื้อครั้งล่า
msgid "Last Purchase Rate"
msgstr "อัตราการซื้อครั้งล่าสุด"
+#. Label of the last_scanned_warehouse (Data) field in DocType 'POS Invoice'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Purchase
+#. Invoice'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Sales Invoice'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Purchase Order'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Quotation'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Sales Order'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Delivery Note'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Material
+#. Request'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Purchase
+#. Receipt'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Stock Entry'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Stock
+#. Reconciliation'
+#: 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/buying/doctype/purchase_order/purchase_order.json
+#: erpnext/selling/doctype/quotation/quotation.json
+#: erpnext/selling/doctype/sales_order/sales_order.json
+#: erpnext/stock/doctype/delivery_note/delivery_note.json
+#: erpnext/stock/doctype/material_request/material_request.json
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+#: erpnext/stock/doctype/stock_entry/stock_entry.json
+#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
+msgid "Last Scanned Warehouse"
+msgstr ""
+
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:328
msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}."
msgstr "ธุรกรรมสต็อกครั้งล่าสุดสำหรับรายการ {0} ภายใต้คลังสินค้า {1} คือวันที่ {2}"
@@ -29292,7 +29346,7 @@ msgstr "คะแนนสะสม: {0}"
#: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.json
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1121
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1130
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/selling/doctype/customer/customer.json
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:952
@@ -29615,7 +29669,7 @@ msgstr "วิชาเอก/วิชาเลือก"
#. Label of the make (Data) field in DocType 'Vehicle'
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:109
-#: erpnext/manufacturing/doctype/job_card/job_card.js:471
+#: erpnext/manufacturing/doctype/job_card/job_card.js:479
#: erpnext/setup/doctype/vehicle/vehicle.json
msgid "Make"
msgstr "สร้าง"
@@ -29649,7 +29703,7 @@ msgstr "สร้างใบแจ้งหนี้ซื้อ"
msgid "Make Quotation"
msgstr "สร้างใบเสนอราคา"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:356
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:363
msgid "Make Return Entry"
msgstr "สร้างรายการคืน"
@@ -29664,12 +29718,12 @@ msgstr "สร้างใบแจ้งหนี้ขาย"
msgid "Make Serial No / Batch from Work Order"
msgstr "สร้างหมายเลขซีเรียล / แบทช์จากคำสั่งงาน"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:74
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:282
+#: erpnext/manufacturing/doctype/job_card/job_card.js:82
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:289
msgid "Make Stock Entry"
msgstr "สร้างรายการสต็อก"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:345
+#: erpnext/manufacturing/doctype/job_card/job_card.js:353
msgid "Make Subcontracting PO"
msgstr "สร้างใบสั่งซื้อจ้างช่วง"
@@ -29739,18 +29793,18 @@ msgstr ""
#: erpnext/accounts/doctype/pos_field/pos_field.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:147
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:76
-#: erpnext/manufacturing/doctype/bom/bom.js:85
-#: erpnext/manufacturing/doctype/bom/bom.js:603
+#: erpnext/manufacturing/doctype/bom/bom.js:87
+#: erpnext/manufacturing/doctype/bom/bom.js:624
#: erpnext/manufacturing/doctype/bom/bom.py:261
#: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py:71
#: erpnext/public/js/controllers/accounts.js:249
#: erpnext/public/js/controllers/transaction.js:2812
#: erpnext/public/js/utils/party.js:321
#: erpnext/stock/doctype/delivery_note/delivery_note.js:164
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:203
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:206
#: erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:138
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:250
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:254
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:101
msgid "Mandatory"
msgstr "จำเป็น"
@@ -29781,15 +29835,15 @@ msgstr "จำเป็นสำหรับงบดุล"
msgid "Mandatory For Profit and Loss Account"
msgstr "จำเป็นสำหรับบัญชีกำไรขาดทุน"
-#: erpnext/selling/doctype/quotation/quotation.py:588
+#: erpnext/selling/doctype/quotation/quotation.py:610
msgid "Mandatory Missing"
msgstr "ขาดสิ่งจำเป็น"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:628
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:630
msgid "Mandatory Purchase Order"
msgstr "ใบสั่งซื้อที่จำเป็น"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:649
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:651
msgid "Mandatory Purchase Receipt"
msgstr "ใบรับซื้อที่จำเป็น"
@@ -30054,7 +30108,7 @@ msgstr "ประเภทการผลิต"
msgid "Manufacturing User"
msgstr "ผู้ใช้การผลิต"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:179
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:183
msgid "Mapping Purchase Receipt ..."
msgstr ""
@@ -30290,7 +30344,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:133
+#: erpnext/manufacturing/doctype/job_card/job_card.js:141
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:155
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
#: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
@@ -30386,7 +30440,7 @@ msgstr ""
msgid "Material Request Type"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.py:1704
+#: erpnext/selling/doctype/sales_order/sales_order.py:1720
msgid "Material Request not created, as quantity for Raw Materials already available."
msgstr ""
@@ -30404,7 +30458,7 @@ msgstr ""
msgid "Material Request {0} is cancelled or stopped"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:1042
+#: erpnext/selling/doctype/sales_order/sales_order.js:1045
msgid "Material Request {0} submitted."
msgstr ""
@@ -30441,7 +30495,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:147
+#: erpnext/manufacturing/doctype/job_card/job_card.js:155
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:90
#: erpnext/stock/doctype/item/item.json
@@ -30612,7 +30666,7 @@ msgstr "ค่ามากที่สุด"
msgid "Maximum discount for Item {0} is {1}%"
msgstr ""
-#: erpnext/public/js/utils/barcode_scanner.js:99
+#: erpnext/public/js/utils/barcode_scanner.js:125
msgid "Maximum quantity scanned for item {0}."
msgstr "ปริมาณสูงสุดที่สแกนสำหรับรายการ {0}"
@@ -31083,7 +31137,7 @@ msgstr "หายไป"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:87
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:184
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:588
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:590
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2249
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
#: erpnext/assets/doctype/asset_category/asset_category.py:116
@@ -31095,7 +31149,7 @@ msgid "Missing Asset"
msgstr "สินทรัพย์ที่หายไป"
#: erpnext/accounts/doctype/gl_entry/gl_entry.py:178
-#: erpnext/assets/doctype/asset/asset.py:308
+#: erpnext/assets/doctype/asset/asset.py:309
msgid "Missing Cost Center"
msgstr "ศูนย์ต้นทุนที่หายไป"
@@ -31103,11 +31157,11 @@ msgstr "ศูนย์ต้นทุนที่หายไป"
msgid "Missing Default in Company"
msgstr "ค่าเริ่มต้นที่หายไปในบริษัท"
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:44
msgid "Missing Filters"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:350
+#: erpnext/assets/doctype/asset/asset.py:351
msgid "Missing Finance Book"
msgstr "สมุดการเงินที่หายไป"
@@ -31139,7 +31193,7 @@ msgstr "ค่าที่จำเป็นหายไป"
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr "ไม่มีแม่แบบอีเมลสำหรับการจัดส่ง โปรดตั้งค่าในการตั้งค่าการจัดส่ง"
-#: erpnext/manufacturing/doctype/bom/bom.py:1052
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr "ค่าที่หายไป"
@@ -31377,7 +31431,7 @@ msgstr "เดือนหลังจากสิ้นสุดเดือน
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:62
#: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:75
-#: erpnext/accounts/report/gross_profit/gross_profit.py:406
+#: erpnext/accounts/report/gross_profit/gross_profit.py:418
#: erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json
#: erpnext/buying/report/purchase_analytics/purchase_analytics.js:61
#: erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
@@ -31805,7 +31859,7 @@ msgstr "ก๊าซธรรมชาติ"
msgid "Needs Analysis"
msgstr "การวิเคราะห์ความต้องการ"
-#: erpnext/stock/serial_batch_bundle.py:1381
+#: erpnext/stock/serial_batch_bundle.py:1397
msgid "Negative Batch Quantity"
msgstr "ปริมาณแบทช์ติดลบ"
@@ -32246,7 +32300,7 @@ msgstr "หมายเลขซีเรียลใหม่ไม่สาม
msgid "New Task"
msgstr "งานใหม่"
-#: erpnext/manufacturing/doctype/bom/bom.js:156
+#: erpnext/manufacturing/doctype/bom/bom.js:177
msgid "New Version"
msgstr "เวอร์ชันใหม่"
@@ -32273,7 +32327,7 @@ msgstr ""
msgid "New invoices will be generated as per schedule even if current invoices are unpaid or past due date"
msgstr "ใบแจ้งหนี้ใหม่จะถูกสร้างตามกำหนดการแม้ว่าใบแจ้งหนี้ปัจจุบันจะยังไม่ได้ชำระหรือเกินกำหนดชำระ"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:258
msgid "New release date should be in the future"
msgstr "วันที่เผยแพร่ใหม่ควรอยู่ในอนาคต"
@@ -32355,8 +32409,8 @@ msgstr "อีเมลถัดไปจะถูกส่งใน:"
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:625
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:646
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:627
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:648
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/buying/doctype/buying_settings/buying_settings.json
#: erpnext/projects/doctype/project/project.json
@@ -32415,11 +32469,11 @@ msgstr ""
msgid "No Items selected for transfer."
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:824
+#: erpnext/selling/doctype/sales_order/sales_order.js:827
msgid "No Items with Bill of Materials to Manufacture"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:962
+#: erpnext/selling/doctype/sales_order/sales_order.js:965
msgid "No Items with Bill of Materials."
msgstr ""
@@ -32435,7 +32489,7 @@ msgstr ""
msgid "No Outstanding Invoices found for this party"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:623
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:624
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr ""
@@ -32455,7 +32509,7 @@ msgstr ""
msgid "No Records for these settings."
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:334
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:336
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1049
msgid "No Remarks"
msgstr ""
@@ -32484,7 +32538,7 @@ msgstr ""
msgid "No Tax Withholding data found for the current posting date."
msgstr ""
-#: erpnext/accounts/report/gross_profit/gross_profit.py:857
+#: erpnext/accounts/report/gross_profit/gross_profit.py:874
msgid "No Terms"
msgstr ""
@@ -32500,7 +32554,7 @@ msgstr ""
msgid "No Work Orders were created"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:803
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:805
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:742
msgid "No accounting entries for the following warehouses"
msgstr ""
@@ -32747,7 +32801,7 @@ msgstr "หมวดหมู่ที่ไม่สามารถหักค
msgid "Non Profit"
msgstr "ไม่แสวงหากำไร"
-#: erpnext/manufacturing/doctype/bom/bom.py:1420
+#: erpnext/manufacturing/doctype/bom/bom.py:1457
msgid "Non stock items"
msgstr "รายการที่ไม่ใช่สต็อก"
@@ -32766,19 +32820,19 @@ msgid "None of the items have any change in quantity or value."
msgstr "ไม่มีรายการใดที่มีการเปลี่ยนแปลงในปริมาณหรือมูลค่า"
#. Name of a UOM
-#: erpnext/setup/setup_wizard/data/uom_data.json erpnext/stock/utils.py:681
-#: erpnext/stock/utils.py:683
+#: erpnext/setup/setup_wizard/data/uom_data.json erpnext/stock/utils.py:703
+#: erpnext/stock/utils.py:705
msgid "Nos"
msgstr "จำนวน"
#: erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py:66
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:270
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:271
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:556
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:568
#: erpnext/assets/doctype/asset/asset.js:618
#: erpnext/assets/doctype/asset/asset.js:633
#: erpnext/controllers/buying_controller.py:269
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:72
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:73
#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:80
msgid "Not Allowed"
msgstr "ไม่อนุญาต"
@@ -32813,7 +32867,7 @@ msgstr "ไม่ได้ส่งมอบ"
msgid "Not Initiated"
msgstr "ไม่ได้เริ่มต้น"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:812
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:823
#: erpnext/templates/pages/material_request_info.py:21
#: erpnext/templates/pages/order.py:37 erpnext/templates/pages/rfq.py:46
msgid "Not Permitted"
@@ -32887,7 +32941,7 @@ msgstr "ไม่มีในสต็อก"
#: erpnext/manufacturing/doctype/work_order/work_order.py:2041
#: erpnext/manufacturing/doctype/work_order/work_order.py:2110
#: erpnext/selling/doctype/sales_order/sales_order.py:826
-#: erpnext/selling/doctype/sales_order/sales_order.py:1685
+#: erpnext/selling/doctype/sales_order/sales_order.py:1701
msgid "Not permitted"
msgstr "ไม่ได้รับอนุญาต"
@@ -32897,12 +32951,12 @@ msgstr "ไม่ได้รับอนุญาต"
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:288
#: erpnext/crm/doctype/crm_note/crm_note.json
#: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py:100
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1040
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1750
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1055
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1767
#: erpnext/projects/doctype/timesheet/timesheet.json
#: erpnext/public/js/controllers/buying.js:477
#: erpnext/selling/doctype/customer/customer.py:129
-#: erpnext/selling/doctype/sales_order/sales_order.js:1180
+#: erpnext/selling/doctype/sales_order/sales_order.js:1183
#: erpnext/stock/doctype/item/item.js:526
#: erpnext/stock/doctype/item/item.py:571
#: erpnext/stock/doctype/item_price/item_price.json
@@ -33578,7 +33632,7 @@ msgstr ""
msgid "Open a new ticket"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:377
+#: erpnext/accounts/report/general_ledger/general_ledger.py:397
#: erpnext/public/js/stock_analytics.js:97
msgid "Opening"
msgstr ""
@@ -33675,7 +33729,7 @@ msgstr ""
msgid "Opening Invoice Item"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1628
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1836
msgid "Opening Invoice has rounding adjustment of {0}.
'{1}' account is required to post these values. Please set it in Company: {2}.
Or, '{3}' can be enabled to not post any rounding adjustment."
msgstr ""
@@ -33750,7 +33804,7 @@ msgstr ""
msgid "Operating Cost Per BOM Quantity"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1436
+#: erpnext/manufacturing/doctype/bom/bom.py:1473
msgid "Operating Cost as per Work Order / BOM"
msgstr ""
@@ -33780,7 +33834,7 @@ msgstr ""
#. Label of the operation (Link) field in DocType 'Work Order Item'
#. Label of the operation (Link) field in DocType 'Work Order Operation'
#. Label of a Link in the Manufacturing Workspace
-#: erpnext/manufacturing/doctype/bom/bom.js:409
+#: erpnext/manufacturing/doctype/bom/bom.js:430
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
@@ -33872,7 +33926,7 @@ msgstr "การดำเนินการเสร็จสิ้นสำห
msgid "Operation time does not depend on quantity to produce"
msgstr "เวลาในการดำเนินการไม่ได้ขึ้นอยู่กับปริมาณที่จะผลิต"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:513
+#: erpnext/manufacturing/doctype/job_card/job_card.js:521
msgid "Operation {0} added multiple times in the work order {1}"
msgstr "การดำเนินการ {0} ถูกเพิ่มหลายครั้งในคำสั่งงาน {1}"
@@ -33906,7 +33960,7 @@ msgstr "การดำเนินการ"
msgid "Operations Routing"
msgstr "การกำหนดเส้นทางการดำเนินการ"
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1098
msgid "Operations cannot be left blank"
msgstr "การดำเนินการไม่สามารถเว้นว่างได้"
@@ -34480,7 +34534,7 @@ msgstr "ขาออก"
msgid "Over Billing Allowance (%)"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1260
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1262
msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%"
msgstr ""
@@ -34974,7 +35028,7 @@ msgstr "รายการบรรจุ"
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:293
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:299
#: erpnext/stock/doctype/packing_slip/packing_slip.json
#: erpnext/stock/workspace/stock/stock.json
msgid "Packing Slip"
@@ -34985,7 +35039,7 @@ msgstr "ใบบรรจุ"
msgid "Packing Slip Item"
msgstr "รายการใบบรรจุ"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:641
msgid "Packing Slip(s) cancelled"
msgstr "ใบบรรจุถูกยกเลิก"
@@ -35116,7 +35170,7 @@ msgstr "ชำระจากประเภทบัญชี"
msgid "Paid To Account Type"
msgstr "ชำระไปยังประเภทบัญชี"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:324
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:326
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1095
msgid "Paid amount + Write Off Amount can not be greater than Grand Total"
msgstr "จำนวนเงินที่ชำระ + จำนวนเงินที่ตัดบัญชีไม่สามารถมากกว่ายอดรวมได้"
@@ -35271,11 +35325,11 @@ msgstr "รายการผู้ปกครอง"
msgid "Parent Item Group"
msgstr "กลุ่มรายการผู้ปกครอง"
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:80
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:81
msgid "Parent Item {0} must not be a Fixed Asset"
msgstr "รายการผู้ปกครอง {0} ต้องไม่เป็นสินทรัพย์ถาวร"
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:78
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:79
msgid "Parent Item {0} must not be a Stock Item"
msgstr "รายการผู้ปกครอง {0} ต้องไม่เป็นรายการสต็อก"
@@ -35295,7 +35349,7 @@ msgstr "กระบวนการผู้ปกครอง"
msgid "Parent Row No"
msgstr "หมายเลขแถวผู้ปกครอง"
-#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:496
+#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:499
msgid "Parent Row No not found for {0}"
msgstr "ไม่พบหมายเลขแถวผู้ปกครองสำหรับ {0}"
@@ -35346,7 +35400,7 @@ msgstr "โอนวัสดุบางส่วน"
msgid "Partial Payment in POS Transactions are not allowed."
msgstr "ไม่อนุญาตให้ชำระเงินบางส่วนในธุรกรรม POS"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1645
msgid "Partial Stock Reservation"
msgstr "การจองสต็อกบางส่วน"
@@ -35540,7 +35594,7 @@ msgstr ""
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:147
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:228
#: erpnext/accounts/report/general_ledger/general_ledger.js:74
-#: erpnext/accounts/report/general_ledger/general_ledger.py:723
+#: erpnext/accounts/report/general_ledger/general_ledger.py:743
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:161
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46
@@ -35645,6 +35699,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:110
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: erpnext/crm/doctype/contract/contract.json
#: erpnext/selling/doctype/party_specific_item/party_specific_item.json
#: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22
@@ -35703,7 +35758,7 @@ msgstr "รายการเฉพาะคู่สัญญา"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:141
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:219
#: erpnext/accounts/report/general_ledger/general_ledger.js:65
-#: erpnext/accounts/report/general_ledger/general_ledger.py:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:742
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:157
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35
@@ -35798,7 +35853,7 @@ msgstr "เส้นทาง"
msgid "Pause"
msgstr "หยุดชั่วคราว"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:216
+#: erpnext/manufacturing/doctype/job_card/job_card.js:224
msgid "Pause Job"
msgstr "หยุดงานชั่วคราว"
@@ -36294,7 +36349,7 @@ msgstr "สถานะการชำระเงิน"
#: 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:1200
-#: erpnext/accounts/report/gross_profit/gross_profit.py:412
+#: erpnext/accounts/report/gross_profit/gross_profit.py:424
#: erpnext/accounts/workspace/accounting/accounting.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:30
msgid "Payment Term"
@@ -36407,7 +36462,7 @@ msgstr "ข้อผิดพลาดในการยกเลิกการ
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr "การชำระเงินกับ {0} {1} ไม่สามารถมากกว่ายอดค้างชำระ {2}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:748
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:749
msgid "Payment amount cannot be less than or equal to 0"
msgstr "จำนวนเงินที่ชำระไม่สามารถน้อยกว่าหรือเท่ากับ 0"
@@ -36424,7 +36479,7 @@ msgstr "การชำระเงิน {0} ได้รับสำเร็
msgid "Payment of {0} received successfully. Waiting for other requests to complete..."
msgstr "การชำระเงิน {0} ได้รับสำเร็จ กำลังรอคำขออื่น ๆ ให้เสร็จสิ้น..."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:378
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:379
msgid "Payment related to {0} is not completed"
msgstr "การชำระเงินที่เกี่ยวข้องกับ {0} ยังไม่เสร็จสิ้น"
@@ -36567,7 +36622,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
#: erpnext/manufacturing/doctype/work_order/work_order.js:312
#: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:183
-#: erpnext/selling/doctype/sales_order/sales_order.js:1217
+#: erpnext/selling/doctype/sales_order/sales_order.js:1220
#: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:45
msgid "Pending Qty"
msgstr ""
@@ -36946,7 +37001,7 @@ msgstr "หมายเลขโทรศัพท์"
#. Reservation Entry'
#. Label of a Link in the Stock Workspace
#: erpnext/selling/doctype/sales_order/sales_order.js:637
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:199
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:202
#: erpnext/stock/doctype/material_request/material_request.js:140
#: erpnext/stock/doctype/pick_list/pick_list.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -37265,12 +37320,12 @@ msgid "Please Select a Company."
msgstr "โปรดเลือกบริษัท"
#: erpnext/stock/doctype/delivery_note/delivery_note.js:165
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:204
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:207
msgid "Please Select a Customer"
msgstr "โปรดเลือกลูกค้า"
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:139
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:251
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:255
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:102
msgid "Please Select a Supplier"
msgstr "โปรดเลือกผู้จัดจำหน่าย"
@@ -37356,7 +37411,7 @@ msgstr "โปรดตรวจสอบตัวเลือกหลายส
msgid "Please check Process Deferred Accounting {0} and submit manually after resolving errors."
msgstr "โปรดตรวจสอบกระบวนการบัญชีเลื่อน {0} และส่งด้วยตนเองหลังจากแก้ไขข้อผิดพลาด"
-#: erpnext/manufacturing/doctype/bom/bom.js:84
+#: erpnext/manufacturing/doctype/bom/bom.js:86
msgid "Please check either with operations or FG Based Operating Cost."
msgstr "โปรดตรวจสอบกับการดำเนินการหรือค่าใช้จ่ายการดำเนินงานตาม FG"
@@ -37401,7 +37456,7 @@ msgstr "โปรดติดต่อผู้ดูแลระบบของ
msgid "Please convert the parent account in corresponding child company to a group account."
msgstr "โปรดแปลงบัญชีหลักในบริษัทลูกที่เกี่ยวข้องให้เป็นบัญชีกลุ่ม"
-#: erpnext/selling/doctype/quotation/quotation.py:586
+#: erpnext/selling/doctype/quotation/quotation.py:608
msgid "Please create Customer from Lead {0}."
msgstr "โปรดสร้างลูกค้าจากลูกค้าเป้าหมาย {0}"
@@ -37417,7 +37472,7 @@ msgstr "โปรดสร้างมิติการบัญชีใหม
msgid "Please create purchase from internal sale or delivery document itself"
msgstr "โปรดสร้างการซื้อจากการขายภายในหรือเอกสารการจัดส่งเอง"
-#: erpnext/assets/doctype/asset/asset.py:390
+#: erpnext/assets/doctype/asset/asset.py:391
msgid "Please create purchase receipt or purchase invoice for the item {0}"
msgstr "โปรดสร้างใบรับซื้อหรือใบแจ้งหนี้ซื้อสำหรับรายการ {0}"
@@ -37429,7 +37484,7 @@ msgstr "โปรดลบชุดผลิตภัณฑ์ {0} ก่อน
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr "โปรดปิดใช้งานเวิร์กโฟลว์ชั่วคราวสำหรับรายการบัญชี {0}"
-#: erpnext/assets/doctype/asset/asset.py:429
+#: erpnext/assets/doctype/asset/asset.py:445
msgid "Please do not book expense of multiple assets against one single Asset."
msgstr "โปรดอย่าบันทึกค่าใช้จ่ายของสินทรัพย์หลายรายการกับสินทรัพย์เดียว"
@@ -37459,7 +37514,7 @@ msgstr "โปรดเปิดใช้งานเฉพาะเมื่อ
msgid "Please enable pop-ups"
msgstr "โปรดเปิดใช้งานป๊อปอัป"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:665
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:667
msgid "Please enable {0} in the {1}."
msgstr "โปรดเปิดใช้งาน {0} ใน {1}"
@@ -37467,11 +37522,11 @@ msgstr "โปรดเปิดใช้งาน {0} ใน {1}"
msgid "Please enable {} in {} to allow same item in multiple rows"
msgstr "โปรดเปิดใช้งาน {} ใน {} เพื่ออนุญาตรายการเดียวกันในหลายแถว"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:367
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:369
msgid "Please ensure that the {0} account is a Balance Sheet account. You can change the parent account to a Balance Sheet account or select a different account."
msgstr "โปรดตรวจสอบว่าบัญชี {0} เป็นบัญชีงบดุล คุณสามารถเปลี่ยนบัญชีหลักเป็นบัญชีงบดุลหรือเลือกบัญชีอื่น"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:375
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:377
msgid "Please ensure that the {0} account {1} is a Payable account. You can change the account type to Payable or select a different account."
msgstr "โปรดตรวจสอบว่าบัญชี {0} {1} เป็นบัญชีเจ้าหนี้ คุณสามารถเปลี่ยนประเภทบัญชีเป็นเจ้าหนี้หรือเลือกบัญชีอื่น"
@@ -37487,7 +37542,7 @@ msgstr "โปรดตรวจสอบว่าบัญชี {} {} เป
msgid "Please enter Difference Account or set default Stock Adjustment Account for company {0}"
msgstr "โปรดป้อน บัญชีส่วนต่าง หรือกำหนดค่าเริ่มต้น บัญชีปรับปรุงสต็อก สำหรับบริษัท {0}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:508
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:509
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1188
msgid "Please enter Account for Change Amount"
msgstr "โปรดป้อนบัญชีสำหรับจำนวนเงินที่เปลี่ยนแปลง"
@@ -37569,7 +37624,7 @@ msgstr "โปรดป้อนข้อมูลพัสดุการจั
msgid "Please enter Warehouse and Date"
msgstr "โปรดป้อนคลังสินค้าและวันที่"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:653
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:655
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1184
msgid "Please enter Write Off Account"
msgstr "โปรดป้อนบัญชีตัดบัญชี"
@@ -37598,7 +37653,7 @@ msgstr "โปรดป้อนหมายเลขมือถือก่อ
msgid "Please enter parent cost center"
msgstr "โปรดป้อนศูนย์ต้นทุนหลัก"
-#: erpnext/public/js/utils/barcode_scanner.js:165
+#: erpnext/public/js/utils/barcode_scanner.js:191
msgid "Please enter quantity for item {0}"
msgstr "โปรดป้อนปริมาณสำหรับรายการ {0}"
@@ -37614,7 +37669,7 @@ msgstr "โปรดป้อนหมายเลขซีเรียล"
msgid "Please enter the company name to confirm"
msgstr "โปรดป้อนชื่อบริษัทเพื่อยืนยัน"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:751
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:752
msgid "Please enter the phone number first"
msgstr "โปรดป้อนหมายเลขโทรศัพท์ก่อน"
@@ -37717,7 +37772,7 @@ msgstr "กรุณาเลือก ประเภทเทมเพล
msgid "Please select Apply Discount On"
msgstr "โปรดเลือกใช้ส่วนลดใน"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1650
+#: erpnext/selling/doctype/sales_order/sales_order.py:1666
msgid "Please select BOM against item {0}"
msgstr "โปรดเลือก BOM สำหรับรายการ {0}"
@@ -37803,11 +37858,11 @@ msgstr "โปรดเลือกวันที่โพสต์ก่อน
msgid "Please select Posting Date first"
msgstr "โปรดเลือกวันที่โพสต์ก่อน"
-#: erpnext/manufacturing/doctype/bom/bom.py:1106
+#: erpnext/manufacturing/doctype/bom/bom.py:1143
msgid "Please select Price List"
msgstr "โปรดเลือกรายการราคา"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1652
+#: erpnext/selling/doctype/sales_order/sales_order.py:1668
msgid "Please select Qty against item {0}"
msgstr "โปรดเลือกปริมาณสำหรับรายการ {0}"
@@ -37815,7 +37870,7 @@ msgstr "โปรดเลือกปริมาณสำหรับราย
msgid "Please select Sample Retention Warehouse in Stock Settings first"
msgstr "โปรดเลือกคลังสินค้าสำหรับเก็บตัวอย่างในการตั้งค่าสต็อกก่อน"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:415
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:417
msgid "Please select Serial/Batch Nos to reserve or change Reservation Based On to Qty."
msgstr "โปรดเลือกหมายเลขซีเรียล/แบทช์เพื่อจองหรือเปลี่ยนการจองตามปริมาณ"
@@ -37835,17 +37890,17 @@ msgstr "โปรดเลือกคำสั่งจ้างช่วงแ
msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
msgstr "โปรดเลือกบัญชีกำไร/ขาดทุนที่ยังไม่รับรู้หรือเพิ่มบัญชีกำไร/ขาดทุนที่ยังไม่รับรู้เริ่มต้นสำหรับบริษัท {0}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1338
+#: erpnext/manufacturing/doctype/bom/bom.py:1375
msgid "Please select a BOM"
msgstr "โปรดเลือก BOM"
#: erpnext/accounts/party.py:430
-#: erpnext/stock/doctype/pick_list/pick_list.py:1551
+#: erpnext/stock/doctype/pick_list/pick_list.py:1563
msgid "Please select a Company"
msgstr "โปรดเลือกบริษัท"
#: erpnext/accounts/doctype/payment_entry/payment_entry.js:267
-#: erpnext/manufacturing/doctype/bom/bom.js:603
+#: erpnext/manufacturing/doctype/bom/bom.js:624
#: erpnext/manufacturing/doctype/bom/bom.py:261
#: erpnext/public/js/controllers/accounts.js:249
#: erpnext/public/js/controllers/transaction.js:2812
@@ -37925,11 +37980,11 @@ msgstr "โปรดเลือกค่าสำหรับ {0} quotation_to
msgid "Please select an item code before setting the warehouse."
msgstr "โปรดเลือกรหัสรายการก่อนตั้งค่าคลังสินค้า"
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:26
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:43
msgid "Please select at least one filter: Item Code, Batch, or Serial No."
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:886
+#: erpnext/selling/doctype/sales_order/sales_order.js:889
msgid "Please select atleast one item to continue"
msgstr ""
@@ -38014,7 +38069,7 @@ msgstr "โปรดเลือก {0}"
msgid "Please select {0} first"
msgstr "โปรดเลือก {0} ก่อน"
-#: erpnext/public/js/controllers/transaction.js:99
+#: erpnext/public/js/controllers/transaction.js:100
msgid "Please set 'Apply Additional Discount On'"
msgstr "โปรดตั้งค่า 'ใช้ส่วนลดเพิ่มเติมใน'"
@@ -38056,10 +38111,14 @@ msgstr "โปรดตั้งค่ามิติการบัญชี {}
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:58
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:68
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:78
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:756
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:765
msgid "Please set Company"
msgstr "โปรดตั้งค่าบริษัท"
+#: erpnext/regional/united_arab_emirates/utils.py:26
+msgid "Please set Customer Address to determine if the transaction is an export."
+msgstr ""
+
#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr "โปรดตั้งค่าบัญชีที่เกี่ยวข้องกับค่าเสื่อมราคาในหมวดสินทรัพย์ {0} หรือบริษัท {1}"
@@ -38082,7 +38141,7 @@ msgstr ""
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr "โปรดตั้งค่าบัญชีสินทรัพย์ถาวรในหมวดสินทรัพย์ {0}"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:585
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:587
msgid "Please set Fixed Asset Account in {} against {}."
msgstr "โปรดตั้งค่าบัญชีสินทรัพย์ถาวรใน {} กับ {}"
@@ -38108,7 +38167,7 @@ msgstr "โปรดตั้งค่าบัญชีกำไร/ขาด
msgid "Please set VAT Accounts in {0}"
msgstr "โปรดตั้งค่าบัญชี VAT ใน {0}"
-#: erpnext/regional/united_arab_emirates/utils.py:61
+#: erpnext/regional/united_arab_emirates/utils.py:83
msgid "Please set Vat Accounts for Company: \"{0}\" in UAE VAT Settings"
msgstr ""
@@ -38116,11 +38175,11 @@ msgstr ""
msgid "Please set a Company"
msgstr "โปรดตั้งค่าบริษัท"
-#: erpnext/assets/doctype/asset/asset.py:305
+#: erpnext/assets/doctype/asset/asset.py:306
msgid "Please set a Cost Center for the Asset or set an Asset Depreciation Cost Center for the Company {}"
msgstr "โปรดตั้งค่าศูนย์ต้นทุนสำหรับสินทรัพย์หรือศูนย์ต้นทุนค่าเสื่อมราคาสินทรัพย์สำหรับบริษัท {}"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1406
+#: erpnext/selling/doctype/sales_order/sales_order.py:1422
msgid "Please set a Supplier against the Items to be considered in the Purchase Order."
msgstr "โปรดตั้งค่าผู้จัดจำหน่ายสำหรับรายการที่จะพิจารณาในคำสั่งซื้อ"
@@ -38132,7 +38191,7 @@ msgstr "โปรดตั้งค่ารายการวันหยุด
msgid "Please set a default Holiday List for Employee {0} or Company {1}"
msgstr "โปรดตั้งค่ารายการวันหยุดเริ่มต้นสำหรับพนักงาน {0} หรือบริษัท {1}"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1095
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1097
msgid "Please set account in Warehouse {0}"
msgstr "โปรดตั้งค่าบัญชีในคลังสินค้า {0}"
@@ -38173,7 +38232,7 @@ msgstr "โปรดตั้งค่าบัญชีเงินสดหร
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr "โปรดตั้งค่าบัญชีเงินสดหรือธนาคารเริ่มต้นในโหมดการชำระเงิน {}"
-#: erpnext/accounts/utils.py:2314
+#: erpnext/accounts/utils.py:2318
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr "โปรดตั้งค่าบัญชีกำไร/ขาดทุนจากอัตราแลกเปลี่ยนเริ่มต้นในบริษัท {}"
@@ -38206,7 +38265,7 @@ msgstr "โปรดตั้งค่าตัวกรอง"
msgid "Please set one of the following:"
msgstr "โปรดตั้งค่าหนึ่งในสิ่งต่อไปนี้:"
-#: erpnext/assets/doctype/asset/asset.py:506
+#: erpnext/assets/doctype/asset/asset.py:522
msgid "Please set opening number of booked depreciations"
msgstr "โปรดตั้งค่าจำนวนการหักค่าเสื่อมราคาที่จองไว้"
@@ -38290,8 +38349,8 @@ msgid "Please specify Company"
msgstr "โปรดระบุบริษัท"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:447
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:503
msgid "Please specify Company to proceed"
msgstr "โปรดระบุบริษัทเพื่อดำเนินการต่อ"
@@ -38498,8 +38557,8 @@ msgstr "ค่าส่งไปรษณีย์"
#: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:61
#: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:66
#: erpnext/accounts/report/cheques_and_deposits_incorrectly_cleared/cheques_and_deposits_incorrectly_cleared.py:151
-#: erpnext/accounts/report/general_ledger/general_ledger.py:650
-#: erpnext/accounts/report/gross_profit/gross_profit.py:269
+#: erpnext/accounts/report/general_ledger/general_ledger.py:670
+#: erpnext/accounts/report/gross_profit/gross_profit.py:275
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:183
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:204
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
@@ -38531,7 +38590,7 @@ msgstr "ค่าส่งไปรษณีย์"
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:127
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:104
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:86
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:449
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:492
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:24
#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:112
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:144
@@ -38546,7 +38605,7 @@ msgstr "วันที่โพสต์"
msgid "Posting Date Inheritance for Exchange Gain / Loss"
msgstr "การสืบทอดวันที่โพสต์สำหรับกำไร/ขาดทุนจากอัตราแลกเปลี่ยน"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:254
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:256
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:130
msgid "Posting Date cannot be future date"
msgstr "วันที่โพสต์ไม่สามารถเป็นวันที่ในอนาคตได้"
@@ -38586,7 +38645,7 @@ msgstr "วันที่และเวลาที่โพสต์"
#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:275
+#: erpnext/accounts/report/gross_profit/gross_profit.py:281
#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -38885,7 +38944,7 @@ msgstr "ประเทศในรายการราคา"
msgid "Price List Currency"
msgstr "สกุลเงินในรายการราคา"
-#: erpnext/stock/get_item_details.py:1236
+#: erpnext/stock/get_item_details.py:1231
msgid "Price List Currency not selected"
msgstr "ไม่ได้เลือกสกุลเงินในรายการราคา"
@@ -39554,7 +39613,7 @@ msgstr "คำอธิบายกระบวนการ"
msgid "Process Loss"
msgstr "การสูญเสียกระบวนการ"
-#: erpnext/manufacturing/doctype/bom/bom.py:1089
+#: erpnext/manufacturing/doctype/bom/bom.py:1126
msgid "Process Loss Percentage cannot be greater than 100"
msgstr "เปอร์เซ็นต์การสูญเสียกระบวนการต้องไม่เกิน 100"
@@ -39573,7 +39632,7 @@ msgstr "เปอร์เซ็นต์การสูญเสียกระ
msgid "Process Loss Qty"
msgstr "ปริมาณการสูญเสียกระบวนการ"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:293
+#: erpnext/manufacturing/doctype/job_card/job_card.js:301
msgid "Process Loss Quantity"
msgstr "ปริมาณการสูญเสียกระบวนการ"
@@ -40038,15 +40097,15 @@ msgstr ""
#: erpnext/accounts/doctype/psoa_project/psoa_project.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1052
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1061
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:109
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:74
#: erpnext/accounts/report/general_ledger/general_ledger.js:164
-#: erpnext/accounts/report/general_ledger/general_ledger.py:727
+#: erpnext/accounts/report/general_ledger/general_ledger.py:760
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
-#: erpnext/accounts/report/gross_profit/gross_profit.py:357
+#: erpnext/accounts/report/gross_profit/gross_profit.py:363
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:274
#: erpnext/accounts/report/purchase_register/purchase_register.py:207
@@ -40579,7 +40638,7 @@ msgstr "รายละเอียดการซื้อ"
#: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
#: erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:134
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:289
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:296
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js:30
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
@@ -40613,16 +40672,16 @@ msgstr "รายการใบแจ้งหนี้ซื้อ"
msgid "Purchase Invoice Trends"
msgstr "แนวโน้มใบแจ้งหนี้ซื้อ"
-#: erpnext/assets/doctype/asset/asset.py:267
+#: erpnext/assets/doctype/asset/asset.py:268
msgid "Purchase Invoice cannot be made against an existing asset {0}"
msgstr "ไม่สามารถสร้างใบแจ้งหนี้ซื้อกับสินทรัพย์ที่มีอยู่ {0} ได้"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:431
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:445
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:433
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:447
msgid "Purchase Invoice {0} is already submitted"
msgstr "ใบแจ้งหนี้ซื้อ {0} ถูกส่งแล้ว"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:2011
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:2013
msgid "Purchase Invoices"
msgstr "ใบแจ้งหนี้ซื้อ"
@@ -40699,7 +40758,7 @@ msgstr "ผู้จัดการมาสเตอร์การซื้อ
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#: erpnext/stock/doctype/material_request/material_request.js:179
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:246
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:250
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -40775,11 +40834,11 @@ msgstr "รายการคำสั่งซื้อไม่ได้รั
msgid "Purchase Order Pricing Rule"
msgstr "กฎการตั้งราคาคำสั่งซื้อ"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:624
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:626
msgid "Purchase Order Required"
msgstr "ต้องการคำสั่งซื้อ"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:619
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:621
msgid "Purchase Order Required for item {}"
msgstr "ต้องการคำสั่งซื้อสำหรับรายการ {}"
@@ -40791,19 +40850,19 @@ msgstr "ต้องการคำสั่งซื้อสำหรับร
msgid "Purchase Order Trends"
msgstr "แนวโน้มคำสั่งซื้อ"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1179
+#: erpnext/selling/doctype/sales_order/sales_order.js:1182
msgid "Purchase Order already created for all Sales Order items"
msgstr "สร้างคำสั่งซื้อสำหรับรายการคำสั่งขายทั้งหมดแล้ว"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:320
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:322
msgid "Purchase Order number required for Item {0}"
msgstr "ต้องการหมายเลขคำสั่งซื้อสำหรับรายการ {0}"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:662
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:664
msgid "Purchase Order {0} is not submitted"
msgstr "คำสั่งซื้อ {0} ยังไม่ได้ส่ง"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:907
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:929
msgid "Purchase Orders"
msgstr "คำสั่งซื้อ"
@@ -40851,9 +40910,9 @@ msgstr "รายการราคาซื้อ"
#. Reservation Entry'
#. Label of a Link in the Stock Workspace
#. Label of a shortcut in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:174
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:655
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:665
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:177
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:661
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:671
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:49
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:246
@@ -40916,11 +40975,11 @@ msgstr "รายการใบรับซื้อ"
msgid "Purchase Receipt No"
msgstr "หมายเลขใบรับซื้อ"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:645
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:647
msgid "Purchase Receipt Required"
msgstr "ต้องการใบรับซื้อ"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:640
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:642
msgid "Purchase Receipt Required for item {}"
msgstr "ต้องการใบรับซื้อสำหรับรายการ {}"
@@ -40933,7 +40992,7 @@ msgstr "ต้องการใบรับซื้อสำหรับรา
msgid "Purchase Receipt Trends"
msgstr "แนวโน้มใบรับซื้อ"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:384
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:391
msgid "Purchase Receipt doesn't have any Item for which Retain Sample is enabled."
msgstr "ใบรับซื้อไม่มีรายการใดที่เปิดใช้งานการเก็บตัวอย่าง"
@@ -40941,7 +41000,7 @@ msgstr "ใบรับซื้อไม่มีรายการใดที
msgid "Purchase Receipt {0} created."
msgstr "สร้างใบรับซื้อ {0} แล้ว"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:669
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:671
msgid "Purchase Receipt {0} is not submitted"
msgstr "ใบรับซื้อ {0} ยังไม่ได้ส่ง"
@@ -40952,7 +41011,7 @@ msgstr "ใบรับซื้อ {0} ยังไม่ได้ส่ง"
msgid "Purchase Register"
msgstr "ทะเบียนการซื้อ"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:279
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:286
msgid "Purchase Return"
msgstr "การคืนสินค้า"
@@ -41148,14 +41207,14 @@ msgstr "มีกฎการจัดเก็บสำหรับรายก
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91
-#: erpnext/accounts/report/gross_profit/gross_profit.py:314
+#: erpnext/accounts/report/gross_profit/gross_profit.py:320
#: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json
#: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240
#: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:224
#: erpnext/controllers/trends.py:242 erpnext/controllers/trends.py:254
#: erpnext/controllers/trends.py:259
#: erpnext/crm/doctype/opportunity_item/opportunity_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:964
+#: erpnext/manufacturing/doctype/bom/bom.js:999
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
#: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
@@ -41175,8 +41234,8 @@ msgstr "มีกฎการจัดเก็บสำหรับรายก
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:367
#: erpnext/selling/doctype/sales_order/sales_order.js:471
-#: erpnext/selling/doctype/sales_order/sales_order.js:863
-#: erpnext/selling/doctype/sales_order/sales_order.js:1015
+#: erpnext/selling/doctype/sales_order/sales_order.js:866
+#: erpnext/selling/doctype/sales_order/sales_order.js:1018
#: 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_voucher/landed_cost_voucher.json
@@ -41260,7 +41319,7 @@ msgstr "ปริมาณต่อหน่วย"
#. Label of the for_quantity (Float) field in DocType 'Job Card'
#. Label of the qty (Float) field in DocType 'Work Order'
-#: erpnext/manufacturing/doctype/bom/bom.js:309
+#: erpnext/manufacturing/doctype/bom/bom.js:330
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/manufacturing/report/process_loss_report/process_loss_report.py:82
@@ -41375,7 +41434,7 @@ msgstr "ปริมาณที่จะส่งมอบ"
msgid "Qty to Fetch"
msgstr "ปริมาณที่จะดึง"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:265
+#: erpnext/manufacturing/doctype/job_card/job_card.js:273
#: erpnext/manufacturing/doctype/job_card/job_card.py:765
msgid "Qty to Manufacture"
msgstr "ปริมาณที่จะผลิต"
@@ -41388,6 +41447,8 @@ msgstr "ปริมาณที่จะผลิต"
msgid "Qty to Order"
msgstr "ปริมาณที่จะสั่งซื้อ"
+#. Label of the finished_good_qty (Float) field in DocType 'BOM Operation'
+#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
#: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:129
msgid "Qty to Produce"
msgstr "ปริมาณที่จะผลิต"
@@ -41514,7 +41575,7 @@ msgstr "วัตถุประสงค์เป้าหมายด้าน
#: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:186
+#: erpnext/manufacturing/doctype/bom/bom.js:207
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/quality_management/workspace/quality/quality.json
@@ -41589,7 +41650,7 @@ msgstr "แม่แบบการตรวจสอบคุณภาพ"
msgid "Quality Inspection Template Name"
msgstr "ชื่อแม่แบบการตรวจสอบคุณภาพ"
-#: erpnext/public/js/controllers/transaction.js:359
+#: erpnext/public/js/controllers/transaction.js:360
#: erpnext/stock/doctype/stock_entry/stock_entry.js:165
msgid "Quality Inspection(s)"
msgstr "การตรวจสอบคุณภาพ"
@@ -41707,7 +41768,7 @@ msgstr "วัตถุประสงค์การทบทวนคุณภ
#: erpnext/buying/report/purchase_analytics/purchase_analytics.js:28
#: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:213
#: erpnext/manufacturing/doctype/blanket_order_item/blanket_order_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:396
+#: erpnext/manufacturing/doctype/bom/bom.js:417
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.js:68
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.json
@@ -41734,7 +41795,7 @@ msgstr "วัตถุประสงค์การทบทวนคุณภ
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py:36
#: erpnext/stock/report/delayed_item_report/delayed_item_report.py:154
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:423
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:466
#: erpnext/stock/report/stock_analytics/stock_analytics.js:27
#: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
#: erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json
@@ -41856,8 +41917,8 @@ msgid "Quantity required for Item {0} in row {1}"
msgstr "ปริมาณที่ต้องการสำหรับรายการ {0} ในแถว {1}"
#: erpnext/manufacturing/doctype/bom/bom.py:604
-#: erpnext/manufacturing/doctype/job_card/job_card.js:321
-#: erpnext/manufacturing/doctype/job_card/job_card.js:390
+#: erpnext/manufacturing/doctype/job_card/job_card.js:329
+#: erpnext/manufacturing/doctype/job_card/job_card.js:398
#: erpnext/manufacturing/doctype/workstation/workstation.js:303
msgid "Quantity should be greater than 0"
msgstr "ปริมาณควรมากกว่า 0"
@@ -41886,7 +41947,7 @@ msgstr "ปริมาณที่จะผลิต"
msgid "Quantity to Produce should be greater than zero."
msgstr "ปริมาณที่จะผลิตควรมากกว่าศูนย์"
-#: erpnext/public/js/utils/barcode_scanner.js:236
+#: erpnext/public/js/utils/barcode_scanner.js:262
msgid "Quantity to Scan"
msgstr "ปริมาณที่จะสแกน"
@@ -42017,7 +42078,7 @@ msgstr ""
#. Label of the prevdoc_docname (Link) field in DocType 'Sales Order Item'
#. Label of a Link in the Selling Workspace
#. Option for the 'Transaction' (Select) field in DocType 'Authorization Rule'
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:277
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:280
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:36
#: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html:20
#: erpnext/crm/doctype/contract/contract.json
@@ -42084,7 +42145,7 @@ msgstr "ใบเสนอราคา {0} ถูกยกเลิก"
msgid "Quotation {0} not of type {1}"
msgstr "ใบเสนอราคา {0} ไม่ใช่ประเภท {1}"
-#: erpnext/selling/doctype/quotation/quotation.py:343
+#: erpnext/selling/doctype/quotation/quotation.py:345
#: erpnext/selling/page/sales_funnel/sales_funnel.py:57
msgid "Quotations"
msgstr "ใบเสนอราคา"
@@ -42536,8 +42597,8 @@ msgstr ""
#. Label of the materials_section (Section Break) field in DocType 'BOM'
#. Label of the section_break_8 (Section Break) field in DocType 'Job Card'
#. Label of the mr_items (Table) field in DocType 'Production Plan'
-#: erpnext/manufacturing/doctype/bom/bom.js:349
-#: erpnext/manufacturing/doctype/bom/bom.js:938
+#: erpnext/manufacturing/doctype/bom/bom.js:370
+#: erpnext/manufacturing/doctype/bom/bom.js:972
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
@@ -42700,7 +42761,7 @@ msgid "Reason"
msgstr "เหตุผล"
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:282
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr "เหตุผลในการพักการใช้งาน"
@@ -42711,7 +42772,7 @@ msgid "Reason for Failure"
msgstr "เหตุผลของความล้มเหลว"
#: erpnext/buying/doctype/purchase_order/purchase_order.js:748
-#: erpnext/selling/doctype/sales_order/sales_order.js:1338
+#: erpnext/selling/doctype/sales_order/sales_order.js:1341
msgid "Reason for Hold"
msgstr "เหตุผลในการพักการใช้งาน"
@@ -42720,7 +42781,7 @@ msgstr "เหตุผลในการพักการใช้งาน"
msgid "Reason for Leaving"
msgstr "เหตุผลในการออก"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1353
+#: erpnext/selling/doctype/sales_order/sales_order.js:1356
msgid "Reason for hold:"
msgstr "เหตุผลในการพักการใช้งาน:"
@@ -43090,7 +43151,7 @@ msgstr "การบันทึก URL"
msgid "Records"
msgstr ""
-#: erpnext/regional/united_arab_emirates/utils.py:171
+#: erpnext/regional/united_arab_emirates/utils.py:193
msgid "Recoverable Standard Rated expenses should not be set when Reverse Charge Applicable is Y"
msgstr "ค่าใช้จ่ายที่สามารถกู้คืนได้ในอัตรามาตรฐานไม่ควรถูกตั้งค่าเมื่อมีการใช้ Reverse Charge เป็น Y"
@@ -43532,11 +43593,11 @@ msgstr "อ้างอิง: {0}, รหัสสินค้า: {1} แล
msgid "References"
msgstr "การอ้างอิง"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:385
msgid "References to Sales Invoices are Incomplete"
msgstr "การอ้างอิงถึงใบแจ้งหนี้ขายไม่สมบูรณ์"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:380
msgid "References to Sales Orders are Incomplete"
msgstr "การอ้างอิงถึงคำสั่งขายไม่สมบูรณ์"
@@ -43681,14 +43742,14 @@ msgstr "ความสัมพันธ์"
#. Label of the release_date (Date) field in DocType 'Purchase Invoice'
#. Label of the release_date (Date) field in DocType 'Supplier'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:268
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:312
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:274
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:318
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
msgstr "วันที่ปล่อย"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:315
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:317
msgid "Release date must be in the future"
msgstr "วันที่ปล่อยต้องเป็นวันที่ในอนาคต"
@@ -43763,7 +43824,7 @@ msgstr "ข้อสังเกต"
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1254
#: erpnext/accounts/report/general_ledger/general_ledger.html:84
#: erpnext/accounts/report/general_ledger/general_ledger.html:110
-#: erpnext/accounts/report/general_ledger/general_ledger.py:752
+#: erpnext/accounts/report/general_ledger/general_ledger.py:785
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112
#: erpnext/accounts/report/purchase_register/purchase_register.py:296
#: erpnext/accounts/report/sales_register/sales_register.py:335
@@ -43860,8 +43921,8 @@ msgstr "เช่าแล้ว"
#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:58
#: erpnext/crm/doctype/opportunity/opportunity.js:130
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:354
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:305
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:360
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:312
#: erpnext/support/doctype/issue/issue.js:39
msgid "Reopen"
msgstr "เปิดใหม่"
@@ -44493,7 +44554,7 @@ msgstr ""
msgid "Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:606
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:608
msgid "Reserved Qty should be greater than Delivered Qty."
msgstr ""
@@ -44794,7 +44855,7 @@ msgstr "ฟิลด์ชื่อผลลัพธ์"
msgid "Resume"
msgstr "ดำเนินการต่อ"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:200
+#: erpnext/manufacturing/doctype/job_card/job_card.js:208
msgid "Resume Job"
msgstr "ดำเนินงานต่อ"
@@ -44824,7 +44885,7 @@ msgstr "เก็บตัวอย่าง"
msgid "Retained Earnings"
msgstr "กำไรสะสม"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:295
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:302
msgid "Retention Stock Entry"
msgstr "รายการสต็อกที่เก็บรักษา"
@@ -44918,13 +44979,13 @@ msgstr "คืนส่วนประกอบ"
msgid "Return Issued"
msgstr "ออกการคืน"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:355
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:362
msgid "Return Qty"
msgstr "ปริมาณที่คืน"
#. Label of the return_qty_from_rejected_warehouse (Check) field in DocType
#. 'Purchase Receipt Item'
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:331
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:338
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
msgid "Return Qty from Rejected Warehouse"
msgstr "ปริมาณที่คืนจากคลังสินค้าที่ถูกปฏิเสธ"
@@ -45390,12 +45451,12 @@ msgstr "แถว # {0}: รายการที่คืน {1} ไม่ม
msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:518
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1919
msgid "Row #{0} (Payment Table): Amount must be negative"
msgstr "แถว #{0} (ตารางการชำระเงิน): จำนวนเงินต้องเป็นค่าลบ"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:515
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:516
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr "แถว #{0} (ตารางการชำระเงิน): จำนวนเงินต้องเป็นค่าบวก"
@@ -45454,7 +45515,7 @@ msgstr "แถว #{0}: สินทรัพย์ {1} ถูกขายไป
msgid "Row #{0}: BOM is not specified for subcontracting item {0}"
msgstr "แถว #{0}: ไม่ได้ระบุ BOM สำหรับรายการจ้างช่วง {0}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:405
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:407
msgid "Row #{0}: Batch No {1} is already selected."
msgstr "แถว #{0}: หมายเลขแบทช์ {1} ถูกเลือกแล้ว"
@@ -45490,7 +45551,7 @@ msgstr "แถว #{0}: ไม่สามารถตั้งค่าอั
msgid "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}"
msgstr "แถว #{0}: ไม่สามารถโอนมากกว่าปริมาณที่ต้องการ {1} สำหรับรายการ {2} กับบัตรงาน {3}"
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:86
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:87
msgid "Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save"
msgstr "แถว #{0}: รายการย่อยไม่ควรเป็นชุดสินค้า โปรดลบรายการ {1} และบันทึก"
@@ -45530,7 +45591,7 @@ msgstr "แถว #{0}: วันที่ทับซ้อนกับแถ
msgid "Row #{0}: Default BOM not found for FG Item {1}"
msgstr "แถว #{0}: ไม่พบ BOM เริ่มต้นสำหรับรายการ FG {1}"
-#: erpnext/assets/doctype/asset/asset.py:533
+#: erpnext/assets/doctype/asset/asset.py:549
msgid "Row #{0}: Depreciation Start Date is required"
msgstr "แถว #{0}: ต้องการวันที่เริ่มต้นการหักค่าเสื่อมราคา"
@@ -45582,7 +45643,7 @@ msgstr "แถว #{0}: วันที่เริ่มต้นไม่ส
msgid "Row #{0}: From Time and To Time fields are required"
msgstr "แถว #{0}: ต้องการฟิลด์เวลาเริ่มต้นและเวลาสิ้นสุด"
-#: erpnext/public/js/utils/barcode_scanner.js:394
+#: erpnext/public/js/utils/barcode_scanner.js:428
msgid "Row #{0}: Item added"
msgstr "แถว #{0}: เพิ่มรายการแล้ว"
@@ -45590,7 +45651,7 @@ msgstr "แถว #{0}: เพิ่มรายการแล้ว"
msgid "Row #{0}: Item {1} does not exist"
msgstr "แถว #{0}: รายการ {1} ไม่มีอยู่"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1549
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr "แถว #{0}: รายการ {1} ถูกเลือกแล้ว โปรดจองสต็อกจากรายการเลือก"
@@ -45614,11 +45675,11 @@ msgstr "แถว #{0}: รายการ {1} ไม่ใช่รายกา
msgid "Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher"
msgstr "แถว #{0}: รายการสมุดรายวัน {1} ไม่มีบัญชี {2} หรือจับคู่กับใบสำคัญอื่นแล้ว"
-#: erpnext/assets/doctype/asset/asset.py:527
+#: erpnext/assets/doctype/asset/asset.py:543
msgid "Row #{0}: Next Depreciation Date cannot be before Available-for-use Date"
msgstr "แถว #{0}: วันที่หักค่าเสื่อมราคาครั้งถัดไปไม่สามารถก่อนวันที่พร้อมใช้งานได้"
-#: erpnext/assets/doctype/asset/asset.py:522
+#: erpnext/assets/doctype/asset/asset.py:538
msgid "Row #{0}: Next Depreciation Date cannot be before Purchase Date"
msgstr "แถว #{0}: วันที่หักค่าเสื่อมราคาครั้งถัดไปไม่สามารถก่อนวันที่ซื้อได้"
@@ -45626,11 +45687,11 @@ msgstr "แถว #{0}: วันที่หักค่าเสื่อม
msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
msgstr "แถว #{0}: ไม่อนุญาตให้เปลี่ยนผู้จัดจำหน่ายเนื่องจากมีคำสั่งซื้ออยู่แล้ว"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1632
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr "แถว #{0}: มีเพียง {1} ที่สามารถจองสำหรับรายการ {2}"
-#: erpnext/assets/doctype/asset/asset.py:499
+#: erpnext/assets/doctype/asset/asset.py:515
msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}"
msgstr "แถว #{0}: การหักค่าเสื่อมราคาสะสมเริ่มต้นต้องน้อยกว่าหรือเท่ากับ {1}"
@@ -45638,15 +45699,15 @@ msgstr "แถว #{0}: การหักค่าเสื่อมราค
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 "แถว #{0}: การดำเนินการ {1} ยังไม่เสร็จสิ้นสำหรับปริมาณ {2} ของสินค้าสำเร็จรูปในคำสั่งงาน {3} โปรดอัปเดตสถานะการดำเนินการผ่านบัตรงาน {4}"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1009
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1010
msgid "Row #{0}: Please select Item Code in Assembly Items"
msgstr "แถว #{0}: โปรดเลือกรหัสรายการในรายการประกอบ"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1012
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1013
msgid "Row #{0}: Please select the BOM No in Assembly Items"
msgstr "แถว #{0}: โปรดเลือกหมายเลข BOM ในรายการประกอบ"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1006
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1007
msgid "Row #{0}: Please select the Sub Assembly Warehouse"
msgstr "แถว #{0}: โปรดเลือกคลังสินค้าย่อย"
@@ -45658,7 +45719,7 @@ msgstr "แถว #{0}: โปรดตั้งค่าปริมาณก
msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master"
msgstr "โปรดอัปเดตบัญชีรายได้/ค่าใช้จ่ายรอตัดบัญชีในแถวรายการหรือบัญชีเริ่มต้นในมาสเตอร์บริษัท"
-#: erpnext/public/js/utils/barcode_scanner.js:392
+#: erpnext/public/js/utils/barcode_scanner.js:426
msgid "Row #{0}: Qty increased by {1}"
msgstr "ปริมาณเพิ่มขึ้น {1}"
@@ -45667,7 +45728,7 @@ msgstr "ปริมาณเพิ่มขึ้น {1}"
msgid "Row #{0}: Qty must be a positive number"
msgstr "ปริมาณต้องเป็นตัวเลขบวก"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:393
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:395
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 "ปริมาณควรน้อยกว่าหรือเท่ากับปริมาณที่สามารถจองได้ (ปริมาณจริง - ปริมาณที่จอง) {1} สำหรับรายการ {2} ในแบทช์ {3} ในคลังสินค้า {4}"
@@ -45683,12 +45744,16 @@ msgstr "การตรวจสอบคุณภาพ {1} ยังไม่
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr "การตรวจสอบคุณภาพ {1} ถูกปฏิเสธสำหรับรายการ {2}"
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:96
+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:1375
#: erpnext/controllers/accounts_controller.py:3663
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr "ปริมาณสำหรับรายการ {1} ไม่สามารถเป็นศูนย์ได้"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1617
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr "ปริมาณที่จะจองสำหรับรายการ {1} ควรมากกว่า 0"
@@ -45738,11 +45803,11 @@ msgstr ""
msgid "Row #{0}: Serial No {1} does not belong to Batch {2}"
msgstr "หมายเลขซีเรียล {1} ไม่ได้อยู่ในแบทช์ {2}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:342
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:344
msgid "Row #{0}: Serial No {1} for Item {2} is not available in {3} {4} or might be reserved in another {5}."
msgstr "หมายเลขซีเรียล {1} สำหรับรายการ {2} ไม่มีใน {3} {4} หรืออาจถูกจองใน {5} อื่น"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:358
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:360
msgid "Row #{0}: Serial No {1} is already selected."
msgstr "หมายเลขซีเรียล {1} ถูกเลือกแล้ว"
@@ -45762,6 +45827,10 @@ msgstr "ต้องการวันที่เริ่มต้นและ
msgid "Row #{0}: Set Supplier for item {1}"
msgstr "ตั้งค่าผู้จัดจำหน่ายสำหรับรายการ {1}"
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1017
+msgid "Row #{0}: Since 'Track Semi Finished Goods' is enabled, the BOM {1} cannot be used for Sub Assembly Items"
+msgstr ""
+
#: erpnext/manufacturing/doctype/workstation/workstation.py:92
msgid "Row #{0}: Start Time and End Time are required"
msgstr "ต้องการเวลาเริ่มต้นและเวลาสิ้นสุด"
@@ -45778,32 +45847,32 @@ msgstr "สถานะเป็นสิ่งจำเป็น"
msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}"
msgstr "สถานะต้องเป็น {1} สำหรับการลดราคาใบแจ้งหนี้ {2}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:367
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:369
msgid "Row #{0}: Stock cannot be reserved for Item {1} against a disabled Batch {2}."
msgstr "ไม่สามารถจองสต็อกสำหรับรายการ {1} ในแบทช์ที่ปิดใช้งาน {2} ได้"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1562
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr "ไม่สามารถจองสต็อกสำหรับรายการที่ไม่ใช่สต็อก {1} ได้"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1575
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr "ไม่สามารถจองสต็อกในคลังสินค้ากลุ่ม {1} ได้"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1589
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr "สต็อกถูกจองไว้แล้วสำหรับรายการ {1}"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:539
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr "สต็อกถูกจองสำหรับรายการ {1} ในคลังสินค้า {2}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:377
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:379
msgid "Row #{0}: Stock not available to reserve for Item {1} against Batch {2} in Warehouse {3}."
msgstr "ไม่มีสต็อกสำหรับจองสำหรับรายการ {1} ในแบทช์ {2} ในคลังสินค้า {3}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1224
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1603
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr "ไม่มีสต็อกสำหรับจองสำหรับรายการ {1} ในคลังสินค้า {2}"
@@ -45819,7 +45888,7 @@ msgstr "คลังสินค้า {1} ไม่ใช่คลังสิ
msgid "Row #{0}: Timings conflicts with row {1}"
msgstr "เวลาขัดแย้งกับแถว {1}"
-#: erpnext/assets/doctype/asset/asset.py:512
+#: erpnext/assets/doctype/asset/asset.py:528
msgid "Row #{0}: Total Number of Depreciations cannot be less than or equal to Opening Number of Booked Depreciations"
msgstr "จำนวนการหักค่าเสื่อมราคาทั้งหมดต้องไม่น้อยกว่าหรือเท่ากับจำนวนการหักค่าเสื่อมราคาที่จองไว้"
@@ -45891,11 +45960,11 @@ msgstr "{schedule_date} ไม่สามารถก่อน {transaction_dat
msgid "Row #{}: Currency of {} - {} doesn't matches company currency."
msgstr "สกุลเงินของ {} - {} ไม่ตรงกับสกุลเงินของบริษัท"
-#: erpnext/assets/doctype/asset/asset.py:349
+#: erpnext/assets/doctype/asset/asset.py:350
msgid "Row #{}: Finance Book should not be empty since you're using multiple."
msgstr "สมุดการเงินไม่ควรว่างเปล่าเนื่องจากคุณกำลังใช้หลายสมุด"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:406
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:407
msgid "Row #{}: Item Code: {} is not available under warehouse {}."
msgstr "รหัสรายการ: {} ไม่มีในคลังสินค้า {}"
@@ -45915,23 +45984,23 @@ msgstr "ใบแจ้งหนี้ POS {} ยังไม่ได้ส่
msgid "Row #{}: Please assign task to a member."
msgstr "โปรดมอบหมายงานให้กับสมาชิก"
-#: erpnext/assets/doctype/asset/asset.py:341
+#: erpnext/assets/doctype/asset/asset.py:342
msgid "Row #{}: Please use a different Finance Book."
msgstr "โปรดใช้สมุดการเงินที่แตกต่างกัน"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:477
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:478
msgid "Row #{}: Serial No {} cannot be returned since it was not transacted in original invoice {}"
msgstr "หมายเลขซีเรียล {} ไม่สามารถคืนได้เนื่องจากไม่ได้ทำธุรกรรมในใบแจ้งหนี้ต้นฉบับ {}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:413
-msgid "Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}. Available quantity {}."
-msgstr "ปริมาณสต็อกไม่เพียงพอสำหรับรหัสรายการ: {} ในคลังสินค้า {} ปริมาณที่มีอยู่ {}"
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:414
+msgid "Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}."
+msgstr ""
#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:104
msgid "Row #{}: The original Invoice {} of return invoice {} is not consolidated."
msgstr "ใบแจ้งหนี้ต้นฉบับ {} ของใบแจ้งหนี้คืน {} ยังไม่ได้รวม"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:450
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:451
msgid "Row #{}: You cannot add positive quantities in a return invoice. Please remove item {} to complete the return."
msgstr "คุณไม่สามารถเพิ่มปริมาณบวกในใบแจ้งหนี้คืน โปรดลบรายการ {} เพื่อดำเนินการคืนให้เสร็จสิ้น"
@@ -45952,7 +46021,7 @@ msgstr "{} {} ไม่มีอยู่"
msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}."
msgstr "{} {} ไม่ได้เป็นของบริษัท {} โปรดเลือก {} ที่ถูกต้อง"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:434
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:436
msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}"
msgstr ""
@@ -46061,19 +46130,19 @@ msgstr "แถว {0}: ต้องการการอ้างอิงรา
msgid "Row {0}: Exchange Rate is mandatory"
msgstr "แถว {0}: อัตราแลกเปลี่ยนเป็นสิ่งจำเป็น"
-#: erpnext/assets/doctype/asset/asset.py:474
+#: erpnext/assets/doctype/asset/asset.py:490
msgid "Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount"
msgstr "แถว {0}: มูลค่าที่คาดหวังหลังอายุการใช้งานต้องน้อยกว่าจำนวนเงินซื้อรวม"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:525
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:527
msgid "Row {0}: Expense Head changed to {1} as no Purchase Receipt is created against Item {2}."
msgstr "แถว {0}: หัวข้อค่าใช้จ่ายเปลี่ยนเป็น {1} เนื่องจากไม่มีการสร้างใบรับซื้อสำหรับรายการ {2}"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:482
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:484
msgid "Row {0}: Expense Head changed to {1} because account {2} is not linked to warehouse {3} or it is not the default inventory account"
msgstr "แถว {0}: หัวข้อค่าใช้จ่ายเปลี่ยนเป็น {1} เนื่องจากบัญชี {2} ไม่ได้เชื่อมโยงกับคลังสินค้า {3} หรือไม่ใช่บัญชีสินค้าคงคลังเริ่มต้น"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:507
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:509
msgid "Row {0}: Expense Head changed to {1} because expense is booked against this account in Purchase Receipt {2}"
msgstr "แถว {0}: หัวข้อค่าใช้จ่ายเปลี่ยนเป็น {1} เนื่องจากค่าใช้จ่ายถูกบันทึกในบัญชีนี้ในใบรับซื้อ {2}"
@@ -46126,7 +46195,7 @@ msgstr "แถว {0}: รายการ {1} ต้องเป็นราย
msgid "Row {0}: Item {1}'s quantity cannot be higher than the available quantity."
msgstr "แถว {0}: ปริมาณของรายการ {1} ไม่สามารถมากกว่าปริมาณที่มีอยู่ได้"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:596
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr "แถว {0}: ปริมาณที่บรรจุต้องเท่ากับปริมาณ {1}"
@@ -46242,7 +46311,7 @@ msgstr "แถว {0}: ในการตั้งค่าความถี่
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr "แถว {0}: ปัจจัยการแปลงหน่วยวัดเป็นสิ่งจำเป็น"
-#: erpnext/manufacturing/doctype/bom/bom.py:1072
+#: erpnext/manufacturing/doctype/bom/bom.py:1109
#: erpnext/manufacturing/doctype/work_order/work_order.py:277
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr "แถว {0}: สถานีงานหรือประเภทสถานีงานเป็นสิ่งจำเป็นสำหรับการดำเนินการ {1}"
@@ -46469,6 +46538,8 @@ msgstr "โหมดเงินเดือน"
#: erpnext/accounts/doctype/shipping_rule/shipping_rule_dashboard.py:10
#: erpnext/accounts/doctype/tax_category/tax_category_dashboard.py:9
#: erpnext/accounts/doctype/tax_rule/tax_rule.json
+#: erpnext/crm/doctype/opportunity/opportunity.js:288
+#: erpnext/crm/doctype/opportunity/opportunity.py:158
#: erpnext/projects/doctype/project/project_dashboard.py:15
#: erpnext/regional/report/vat_audit_report/vat_audit_report.py:185
#: erpnext/selling/doctype/quotation/quotation.json
@@ -46561,8 +46632,8 @@ msgstr "อัตราการขายที่เข้ามา"
#: erpnext/accounts/doctype/sales_invoice_reference/sales_invoice_reference.json
#: erpnext/accounts/print_format/sales_auditing_voucher/sales_auditing_voucher.html:5
#: erpnext/accounts/report/gross_profit/gross_profit.js:30
-#: erpnext/accounts/report/gross_profit/gross_profit.py:256
-#: erpnext/accounts/report/gross_profit/gross_profit.py:263
+#: erpnext/accounts/report/gross_profit/gross_profit.py:262
+#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: erpnext/accounts/workspace/accounting/accounting.json
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/crm/doctype/contract/contract.json
@@ -46574,7 +46645,7 @@ msgstr "อัตราการขายที่เข้ามา"
#: erpnext/selling/workspace/selling/selling.json
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/setup/workspace/home/home.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:343
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:349
#: erpnext/stock/doctype/delivery_note/delivery_note_list.js:65
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
msgid "Sales Invoice"
@@ -46652,11 +46723,11 @@ msgstr "ใบแจ้งหนี้ขายยังไม่ได้ส่
msgid "Sales Invoice isn't created by user {}"
msgstr "ใบแจ้งหนี้ขายไม่ได้ถูกสร้างโดยผู้ใช้ {}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:422
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:423
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr "โหมดใบแจ้งหนี้ขายถูกเปิดใช้งานใน POS โปรดสร้างใบแจ้งหนี้ขายแทน"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:616
msgid "Sales Invoice {0} has already been submitted"
msgstr "ใบแจ้งหนี้ขาย {0} ถูกส่งแล้ว"
@@ -46800,7 +46871,7 @@ msgstr "โอกาสการขายตามแหล่งที่มา
#: erpnext/selling/workspace/selling/selling.json
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.js:160
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:223
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:226
#: erpnext/stock/doctype/material_request/material_request.js:219
#: erpnext/stock/doctype/material_request_item/material_request_item.json
#: erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -46852,7 +46923,7 @@ msgstr "วันที่คำสั่งขาย"
#: erpnext/manufacturing/doctype/production_plan_item_reference/production_plan_item_reference.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/selling/doctype/sales_order/sales_order.js:313
-#: erpnext/selling/doctype/sales_order/sales_order.js:870
+#: erpnext/selling/doctype/sales_order/sales_order.js:873
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/stock/doctype/material_request_item/material_request_item.json
#: erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -46885,7 +46956,7 @@ msgstr "สถานะคำสั่งขาย"
msgid "Sales Order Trends"
msgstr "แนวโน้มคำสั่งขาย"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:268
msgid "Sales Order required for Item {0}"
msgstr "ต้องการคำสั่งขายสำหรับรายการ {0}"
@@ -47055,7 +47126,7 @@ msgstr "สรุปการชำระเงินการขาย"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:191
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:80
#: erpnext/accounts/report/gross_profit/gross_profit.js:50
-#: erpnext/accounts/report/gross_profit/gross_profit.py:371
+#: erpnext/accounts/report/gross_profit/gross_profit.py:377
#: erpnext/crm/workspace/crm/crm.json
#: erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
#: erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
@@ -47136,8 +47207,8 @@ msgstr "ทะเบียนการขาย"
msgid "Sales Representative"
msgstr ""
-#: erpnext/accounts/report/gross_profit/gross_profit.py:857
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:267
+#: erpnext/accounts/report/gross_profit/gross_profit.py:874
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:273
msgid "Sales Return"
msgstr "การคืนสินค้า"
@@ -47395,8 +47466,8 @@ msgstr "วันเสาร์"
#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js:119
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:628
#: erpnext/accounts/doctype/ledger_merge/ledger_merge.js:75
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:292
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:328
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47434,7 +47505,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/public/js/utils/barcode_scanner.js:215
+#: erpnext/public/js/utils/barcode_scanner.js:241
#: erpnext/selling/doctype/quotation/quotation.json
#: erpnext/selling/doctype/sales_order/sales_order.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -47466,7 +47537,7 @@ msgstr ""
msgid "Scan Serial No"
msgstr ""
-#: erpnext/public/js/utils/barcode_scanner.js:179
+#: erpnext/public/js/utils/barcode_scanner.js:205
msgid "Scan barcode for item {0}"
msgstr ""
@@ -47480,7 +47551,7 @@ msgstr ""
msgid "Scanned Cheque"
msgstr ""
-#: erpnext/public/js/utils/barcode_scanner.js:247
+#: erpnext/public/js/utils/barcode_scanner.js:273
msgid "Scanned Quantity"
msgstr ""
@@ -47772,7 +47843,7 @@ msgid "Segregate Serial / Batch Bundle"
msgstr ""
#: erpnext/buying/doctype/purchase_order/purchase_order.js:250
-#: erpnext/selling/doctype/sales_order/sales_order.js:1107
+#: erpnext/selling/doctype/sales_order/sales_order.js:1110
#: erpnext/selling/doctype/sales_order/sales_order_list.js:96
#: erpnext/selling/report/sales_analytics/sales_analytics.js:93
msgid "Select"
@@ -47794,15 +47865,15 @@ msgstr ""
msgid "Select Attribute Values"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:853
+#: erpnext/selling/doctype/sales_order/sales_order.js:856
msgid "Select BOM"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:834
+#: erpnext/selling/doctype/sales_order/sales_order.js:837
msgid "Select BOM and Qty for Production"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:985
+#: erpnext/selling/doctype/sales_order/sales_order.js:988
msgid "Select BOM, Qty and For Warehouse"
msgstr ""
@@ -47832,7 +47903,7 @@ msgstr ""
msgid "Select Company"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:468
+#: erpnext/manufacturing/doctype/job_card/job_card.js:476
msgid "Select Corrective Operation"
msgstr ""
@@ -47873,7 +47944,7 @@ msgstr ""
msgid "Select DocType"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:186
+#: erpnext/manufacturing/doctype/job_card/job_card.js:194
msgid "Select Employees"
msgstr ""
@@ -47881,12 +47952,12 @@ msgstr ""
msgid "Select Finished Good"
msgstr "เลือกสินค้าสำเร็จรูป"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1186
-#: erpnext/selling/doctype/sales_order/sales_order.js:1198
+#: erpnext/selling/doctype/sales_order/sales_order.js:1189
+#: erpnext/selling/doctype/sales_order/sales_order.js:1201
msgid "Select Items"
msgstr "เลือกรายการ"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1072
+#: erpnext/selling/doctype/sales_order/sales_order.js:1075
msgid "Select Items based on Delivery Date"
msgstr "เลือกรายการตามวันที่ส่งมอบ"
@@ -47897,7 +47968,7 @@ msgstr "เลือกรายการสำหรับการตรวจ
#. Label of the select_items_to_manufacture_section (Section Break) field in
#. DocType 'Production Plan'
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:881
+#: erpnext/selling/doctype/sales_order/sales_order.js:884
msgid "Select Items to Manufacture"
msgstr "เลือกรายการที่จะผลิต"
@@ -47911,7 +47982,7 @@ msgstr "เลือกรายการจนถึงวันที่ส่
msgid "Select Job Worker Address"
msgstr "เลือกที่อยู่ผู้ปฏิบัติงาน"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1118
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1127
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:955
msgid "Select Loyalty Program"
msgstr "เลือกโปรแกรมสะสมคะแนน"
@@ -48045,7 +48116,7 @@ msgstr "เลือกสมุดการเงินสำหรับรา
msgid "Select item group"
msgstr "เลือกกลุ่มรายการ"
-#: erpnext/manufacturing/doctype/bom/bom.js:376
+#: erpnext/manufacturing/doctype/bom/bom.js:397
msgid "Select template item"
msgstr "เลือกรายการแม่แบบ"
@@ -48062,7 +48133,7 @@ msgstr "เลือกสถานีงานเริ่มต้นที่
msgid "Select the Item to be manufactured."
msgstr "เลือกรายการที่จะผลิต"
-#: erpnext/manufacturing/doctype/bom/bom.js:858
+#: erpnext/manufacturing/doctype/bom/bom.js:879
msgid "Select the Item to be manufactured. The Item name, UoM, Company, and Currency will be fetched automatically."
msgstr "เลือกรายการที่จะผลิต ชื่อรายการ, หน่วยวัด, บริษัท และสกุลเงินจะถูกดึงมาโดยอัตโนมัติ"
@@ -48083,11 +48154,11 @@ msgstr "เลือกวันที่"
msgid "Select the date and your timezone"
msgstr "เลือกวันที่และเขตเวลาของคุณ"
-#: erpnext/manufacturing/doctype/bom/bom.js:877
+#: erpnext/manufacturing/doctype/bom/bom.js:898
msgid "Select the raw materials (Items) required to manufacture the Item"
msgstr "เลือกวัตถุดิบ (รายการ) ที่จำเป็นสำหรับการผลิตรายการ"
-#: erpnext/manufacturing/doctype/bom/bom.js:431
+#: erpnext/manufacturing/doctype/bom/bom.js:452
msgid "Select variant item code for the template item {0}"
msgstr "เลือกรหัสรายการตัวแปรสำหรับรายการแม่แบบ {0}"
@@ -48171,7 +48242,7 @@ msgstr "ขายสินทรัพย์"
msgid "Selling"
msgstr "การขาย"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:330
+#: erpnext/accounts/report/gross_profit/gross_profit.py:336
msgid "Selling Amount"
msgstr "จำนวนเงินการขาย"
@@ -48343,7 +48414,7 @@ msgstr ""
msgid "Serial / Batch Bundle"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:441
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:442
msgid "Serial / Batch Bundle Missing"
msgstr ""
@@ -48420,7 +48491,7 @@ msgstr ""
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:65
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:149
#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:37
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:409
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:436
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:38
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:60
#: erpnext/stock/report/stock_ledger/stock_ledger.py:336
@@ -48520,7 +48591,7 @@ msgstr ""
msgid "Serial No {0} already exists"
msgstr ""
-#: erpnext/public/js/utils/barcode_scanner.js:321
+#: erpnext/public/js/utils/barcode_scanner.js:347
msgid "Serial No {0} already scanned"
msgstr ""
@@ -48541,7 +48612,7 @@ msgstr ""
msgid "Serial No {0} does not exists"
msgstr ""
-#: erpnext/public/js/utils/barcode_scanner.js:402
+#: erpnext/public/js/utils/barcode_scanner.js:436
msgid "Serial No {0} is already added"
msgstr ""
@@ -48569,7 +48640,7 @@ msgstr ""
msgid "Serial No: {0} has already been transacted into another POS Invoice."
msgstr ""
-#: erpnext/public/js/utils/barcode_scanner.js:271
+#: erpnext/public/js/utils/barcode_scanner.js:297
#: erpnext/public/js/utils/serial_no_batch_selector.js:16
#: erpnext/public/js/utils/serial_no_batch_selector.js:190
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:50
@@ -49066,8 +49137,8 @@ msgstr "ตั้งค่าอัตราพื้นฐานด้วยต
msgid "Set Default Supplier"
msgstr "ตั้งค่าผู้จัดจำหน่ายเริ่มต้น"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:339
-#: erpnext/manufacturing/doctype/job_card/job_card.js:408
+#: erpnext/manufacturing/doctype/job_card/job_card.js:347
+#: erpnext/manufacturing/doctype/job_card/job_card.js:416
msgid "Set Finished Good Quantity"
msgstr "ตั้งค่าปริมาณสินค้าสำเร็จรูป"
@@ -49098,11 +49169,11 @@ msgstr "ตั้งค่างบประมาณตามกลุ่มร
msgid "Set Landed Cost Based on Purchase Invoice Rate"
msgstr "ตั้งค่าต้นทุนที่มาถึงตามอัตราใบแจ้งหนี้ซื้อ"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1130
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1139
msgid "Set Loyalty Program"
msgstr "ตั้งค่าโปรแกรมสะสมคะแนน"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:312
msgid "Set New Release Date"
msgstr "ตั้งค่าวันที่เผยแพร่ใหม่"
@@ -49131,7 +49202,7 @@ msgstr "ตั้งรหัสผ่าน"
msgid "Set Posting Date"
msgstr "ตั้งค่าวันที่โพสต์"
-#: erpnext/manufacturing/doctype/bom/bom.js:904
+#: erpnext/manufacturing/doctype/bom/bom.js:925
msgid "Set Process Loss Item Quantity"
msgstr "ตั้งค่าปริมาณรายการสูญเสียกระบวนการ"
@@ -49145,7 +49216,7 @@ msgstr "ตั้งค่าสถานะโครงการ"
msgid "Set Project and all Tasks to status {0}?"
msgstr "ตั้งค่าโครงการและงานทั้งหมดเป็นสถานะ {0}?"
-#: erpnext/manufacturing/doctype/bom/bom.js:905
+#: erpnext/manufacturing/doctype/bom/bom.js:926
msgid "Set Quantity"
msgstr "ตั้งค่าปริมาณ"
@@ -49252,7 +49323,7 @@ msgstr "ตั้งค่าบัญชี {0} เริ่มต้นสำ
msgid "Set fieldname from which you want to fetch the data from the parent form."
msgstr "ตั้งค่าชื่อฟิลด์ที่คุณต้องการดึงข้อมูลจากฟอร์มหลัก"
-#: erpnext/manufacturing/doctype/bom/bom.js:894
+#: erpnext/manufacturing/doctype/bom/bom.js:915
msgid "Set quantity of process loss item:"
msgstr "ตั้งค่าปริมาณของรายการสูญเสียกระบวนการ:"
@@ -49282,15 +49353,15 @@ msgstr "ตั้งค่าสถานะด้วยตนเอง"
msgid "Set this if the customer is a Public Administration company."
msgstr "ตั้งค่านี้หากลูกค้าเป็นบริษัทการบริหารสาธารณะ"
-#: erpnext/assets/doctype/asset/asset.py:750
+#: erpnext/assets/doctype/asset/asset.py:766
msgid "Set {0} in asset category {1} for company {2}"
msgstr "ตั้งค่า {0} ในหมวดหมู่สินทรัพย์ {1} สำหรับบริษัท {2}"
-#: erpnext/assets/doctype/asset/asset.py:1083
+#: erpnext/assets/doctype/asset/asset.py:1099
msgid "Set {0} in asset category {1} or company {2}"
msgstr "ตั้งค่า {0} ในหมวดหมู่สินทรัพย์ {1} หรือบริษัท {2}"
-#: erpnext/assets/doctype/asset/asset.py:1080
+#: erpnext/assets/doctype/asset/asset.py:1096
msgid "Set {0} in company {1}"
msgstr "ตั้งค่า {0} ในบริษัท {1}"
@@ -49357,7 +49428,7 @@ msgstr "การตั้งค่าบัญชีเป็นบัญชี
msgid "Setting up company"
msgstr "กำลังตั้งค่าบริษัท"
-#: erpnext/manufacturing/doctype/bom/bom.py:1051
+#: erpnext/manufacturing/doctype/bom/bom.py:1088
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr ""
@@ -49490,7 +49561,7 @@ msgid "Shift Name"
msgstr "ชื่อกะ"
#. Name of a DocType
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:243
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:249
#: erpnext/stock/doctype/shipment/shipment.json
msgid "Shipment"
msgstr "การจัดส่ง"
@@ -49541,7 +49612,7 @@ msgstr "ประเภทการจัดส่ง"
msgid "Shipment details"
msgstr "รายละเอียดการจัดส่ง"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:787
msgid "Shipments"
msgstr "การจัดส่ง"
@@ -50225,7 +50296,7 @@ msgstr ""
msgid "Source Document Name"
msgstr "ชื่อเอกสารต้นทาง"
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:478
msgid "Source Document No"
msgstr ""
@@ -50275,7 +50346,7 @@ msgstr "ประเภทต้นทาง"
#. Label of the s_warehouse (Link) field in DocType 'Stock Entry Detail'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/manufacturing/doctype/bom/bom.js:403
+#: erpnext/manufacturing/doctype/bom/bom.js:424
#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
@@ -50303,7 +50374,7 @@ msgstr "ที่อยู่คลังสินค้าต้นทาง"
msgid "Source Warehouse Address Link"
msgstr "ลิงก์ที่อยู่คลังสินค้าต้นทาง"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1154
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr "คลังสินค้าต้นทางเป็นสิ่งจำเป็นสำหรับรายการ {0}"
@@ -50399,7 +50470,7 @@ msgstr "แยกปัญหา"
msgid "Split Qty"
msgstr "แยกปริมาณ"
-#: erpnext/assets/doctype/asset/asset.py:1222
+#: erpnext/assets/doctype/asset/asset.py:1238
msgid "Split Quantity must be less than Asset Quantity"
msgstr "ปริมาณที่แยกต้องน้อยกว่าปริมาณสินทรัพย์"
@@ -50592,7 +50663,7 @@ msgstr ""
msgid "Start Import"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:180
+#: erpnext/manufacturing/doctype/job_card/job_card.js:188
#: erpnext/manufacturing/doctype/workstation/workstation.js:124
msgid "Start Job"
msgstr ""
@@ -50901,14 +50972,14 @@ msgstr ""
#: erpnext/setup/doctype/driver/driver.json
#: erpnext/setup/doctype/employee/employee.json
#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:323
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:358
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:329
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:364
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_trip/delivery_trip.json
#: erpnext/stock/doctype/material_request/material_request.json
#: erpnext/stock/doctype/pick_list/pick_list.json
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:276
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:305
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:283
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:312
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
#: erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
@@ -50987,8 +51058,8 @@ msgstr ""
#: erpnext/accounts/doctype/account/account.json
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:50
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:73
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1337
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1363
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1339
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1365
#: erpnext/accounts/report/account_balance/account_balance.js:58
msgid "Stock Adjustment"
msgstr "การปรับสต็อก"
@@ -51145,7 +51216,7 @@ msgstr ""
msgid "Stock Entry Type"
msgstr "ประเภทของรายการสต็อก"
-#: erpnext/stock/doctype/pick_list/pick_list.py:1384
+#: erpnext/stock/doctype/pick_list/pick_list.py:1396
msgid "Stock Entry has been already created against this Pick List"
msgstr "รายการสต็อกถูกสร้างขึ้นแล้วสำหรับรายการเลือกนี้"
@@ -51379,14 +51450,14 @@ msgstr "การตั้งค่าโพสต์สต็อกใหม่
#: erpnext/stock/doctype/pick_list/pick_list.js:166
#: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12
#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:714
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:666
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1225
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1563
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1576
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1590
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1604
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1618
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1635
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:668
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1227
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1565
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1578
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1592
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1606
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1620
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1637
#: erpnext/stock/doctype/stock_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51395,13 +51466,13 @@ msgstr "การตั้งค่าโพสต์สต็อกใหม่
msgid "Stock Reservation"
msgstr "การจองสต็อก"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1746
msgid "Stock Reservation Entries Cancelled"
msgstr "ยกเลิกรายการจองสต็อกแล้ว"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2156
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1698
msgid "Stock Reservation Entries Created"
msgstr "สร้างรายการจองสต็อกแล้ว"
@@ -51409,25 +51480,25 @@ msgstr "สร้างรายการจองสต็อกแล้ว"
#: erpnext/public/js/stock_reservation.js:308
#: erpnext/selling/doctype/sales_order/sales_order.js:444
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:352
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:354
#: erpnext/stock/report/reserved_stock/reserved_stock.js:53
#: erpnext/stock/report/reserved_stock/reserved_stock.py:171
msgid "Stock Reservation Entry"
msgstr "รายการจองสต็อก"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:528
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:530
msgid "Stock Reservation Entry cannot be updated as it has been delivered."
msgstr "ไม่สามารถอัปเดตรายการจองสต็อกได้เนื่องจากได้ส่งมอบแล้ว"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:522
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:524
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:547
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:549
msgid "Stock Reservation Warehouse Mismatch"
msgstr "คลังสินค้าการจองสต็อกไม่ตรงกัน"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:675
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:677
msgid "Stock Reservation can only be created against {0}."
msgstr "สามารถสร้างการจองสต็อกได้เฉพาะกับ {0}"
@@ -51462,7 +51533,7 @@ msgstr "ปริมาณสต็อกที่จอง (ในหน่ว
#. Label of a Link in the Stock Workspace
#: erpnext/setup/doctype/company/company.json
#: erpnext/setup/workspace/settings/settings.json
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:667
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:669
#: erpnext/stock/doctype/stock_settings/stock_settings.json
#: erpnext/stock/workspace/stock/stock.json
msgid "Stock Settings"
@@ -51668,11 +51739,11 @@ msgstr "สต็อกและการผลิต"
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr "ไม่สามารถจองสต็อกในคลังสินค้ากลุ่ม {0} ได้"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1510
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr "ไม่สามารถจองสต็อกในคลังสินค้ากลุ่ม {0} ได้"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:727
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:729
msgid "Stock cannot be updated against Purchase Receipt {0}"
msgstr "ไม่สามารถอัปเดตสต็อกกับใบรับซื้อ {0} ได้"
@@ -51684,11 +51755,11 @@ msgstr "ไม่สามารถอัปเดตสต็อกกับใ
msgid "Stock cannot be updated because the invoice contains a drop shipping item. Please disable 'Update Stock' or remove the drop shipping item."
msgstr "ไม่สามารถอัปเดตสต็อกได้เนื่องจากใบแจ้งหนี้มีรายการจัดส่งโดยตรง โปรดปิดใช้งาน 'อัปเดตสต็อก' หรือเอารายการจัดส่งโดยตรงออก"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1121
msgid "Stock has been unreserved for work order {0}."
msgstr "สต็อกถูกยกเลิกการจองสำหรับคำสั่งงาน {0}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:323
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:325
msgid "Stock not available for Item {0} in Warehouse {1}."
msgstr "ไม่มีสต็อกสำหรับรายการ {0} ในคลังสินค้า {1}"
@@ -52000,7 +52071,7 @@ msgstr "รายการบริการคำสั่งจ้างช่
msgid "Subcontracting Order Supplied Item"
msgstr "รายการที่จัดหาสำหรับคำสั่งจ้างช่วง"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:943
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:965
msgid "Subcontracting Order {0} created."
msgstr "คำสั่งจ้างช่วง {0} ถูกสร้างขึ้นแล้ว"
@@ -52090,7 +52161,7 @@ msgstr "หัวข้อ"
msgid "Submit"
msgstr "ส่ง"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:939
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:961
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:910
msgid "Submit Action Failed"
msgstr "การส่งล้มเหลว"
@@ -52541,7 +52612,7 @@ msgstr ""
#: erpnext/selling/doctype/customer/customer.js:230
#: erpnext/selling/doctype/party_specific_item/party_specific_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:160
-#: erpnext/selling/doctype/sales_order/sales_order.js:1231
+#: erpnext/selling/doctype/sales_order/sales_order.js:1235
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/doctype/sms_center/sms_center.json
#: erpnext/setup/workspace/home/home.json
@@ -52552,7 +52623,7 @@ msgstr ""
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
#: erpnext/stock/doctype/shipment/shipment.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:462
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:505
#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr ""
@@ -52677,7 +52748,7 @@ msgstr "ใบแจ้งหนี้ผู้จัดจำหน่าย"
msgid "Supplier Invoice Date"
msgstr "วันที่ใบแจ้งหนี้ผู้จัดจำหน่าย"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1730
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1732
msgid "Supplier Invoice Date cannot be greater than Posting Date"
msgstr "วันที่ใบแจ้งหนี้ผู้จัดจำหน่ายต้องไม่มากกว่าวันที่โพสต์"
@@ -52687,12 +52758,12 @@ msgstr "วันที่ใบแจ้งหนี้ผู้จัดจำ
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:59
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/report/general_ledger/general_ledger.html:104
-#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/general_ledger/general_ledger.py:780
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr "หมายเลขใบแจ้งหนี้ผู้จัดจำหน่าย"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1757
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1759
msgid "Supplier Invoice No exists in Purchase Invoice {0}"
msgstr "หมายเลขใบแจ้งหนี้ผู้จัดจำหน่ายมีอยู่ในใบแจ้งหนี้ซื้อ {0}"
@@ -52920,7 +52991,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:62
+#: erpnext/manufacturing/doctype/job_card/job_card.js:70
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
msgid "Supplier Warehouse"
msgstr "คลังสินค้าผู้จัดจำหน่าย"
@@ -53253,7 +53324,7 @@ msgstr ""
msgid "TDS Computation Summary"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1514
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1516
msgid "TDS Deducted"
msgstr ""
@@ -54107,7 +54178,7 @@ msgstr ""
msgid "Template"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:355
+#: erpnext/manufacturing/doctype/bom/bom.js:376
msgid "Template Item"
msgstr ""
@@ -54343,7 +54414,7 @@ msgstr ""
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:182
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:68
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:221
-#: erpnext/accounts/report/gross_profit/gross_profit.py:399
+#: erpnext/accounts/report/gross_profit/gross_profit.py:411
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js:8
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:21
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:263
@@ -54442,7 +54513,7 @@ msgstr ""
msgid "The BOM which will be replaced"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:1378
+#: erpnext/stock/serial_batch_bundle.py:1394
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr ""
@@ -54557,7 +54628,7 @@ msgstr "ฟิลด์จากผู้ถือหุ้นต้องไม
msgid "The field To Shareholder cannot be blank"
msgstr "ฟิลด์ถึงผู้ถือหุ้นต้องไม่ว่างเปล่า"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:399
msgid "The field {0} in row {1} is not set"
msgstr "ฟิลด์ {0} ในแถว {1} ไม่ได้ตั้งค่า"
@@ -54626,6 +54697,10 @@ msgstr "การ์ดงาน {0} อยู่ในสถานะ {1} แ
msgid "The job card {0} is in {1} state and you cannot start it again."
msgstr "การ์ดงาน {0} อยู่ในสถานะ {1} และคุณไม่สามารถเริ่มต้นใหม่ได้"
+#: erpnext/public/js/utils/barcode_scanner.js:533
+msgid "The last scanned warehouse has been cleared and won't be set in the subsequently scanned items"
+msgstr ""
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.py:46
msgid "The lowest tier must have a minimum spent amount of 0. Customers need to be part of a tier as soon as they are enrolled in the program."
msgstr "ระดับต่ำสุดต้องมีจำนวนเงินที่ใช้จ่ายขั้นต่ำ 0 ลูกค้าจำเป็นต้องเป็นส่วนหนึ่งของระดับทันทีที่พวกเขาลงทะเบียนในโปรแกรม"
@@ -54704,7 +54779,7 @@ msgstr "บัญชีราก {0} ต้องเป็นกลุ่ม"
msgid "The selected BOMs are not for the same item"
msgstr "BOM ที่เลือกไม่ใช่สำหรับรายการเดียวกัน"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:493
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:494
msgid "The selected change account {} doesn't belongs to Company {}."
msgstr "บัญชีเปลี่ยนแปลงที่เลือก {} ไม่ได้เป็นของบริษัท {}"
@@ -54838,7 +54913,7 @@ msgstr "{0} {1} ถูกใช้ในการคำนวณต้นทุ
msgid "Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc."
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:579
+#: erpnext/assets/doctype/asset/asset.py:595
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr ""
@@ -54941,7 +55016,7 @@ msgstr "รายการนี้เป็นตัวแปรของ {0} (
msgid "This Month's Summary"
msgstr "สรุปเดือนนี้"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:952
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:974
msgid "This PO has been fully subcontracted."
msgstr "คำสั่งซื้อนี้ถูกจ้างช่วงทั้งหมดแล้ว"
@@ -54965,7 +55040,7 @@ msgstr "การกระทำนี้จะหยุดการเรีย
msgid "This action will unlink this account from any external service integrating ERPNext with your bank accounts. It cannot be undone. Are you certain ?"
msgstr "การกระทำนี้จะยกเลิกการเชื่อมโยงบัญชีนี้จากบริการภายนอกที่รวม ERPNext กับบัญชีธนาคารของคุณ ไม่สามารถย้อนกลับได้ คุณแน่ใจหรือไม่?"
-#: erpnext/assets/doctype/asset/asset.py:359
+#: erpnext/assets/doctype/asset/asset.py:360
msgid "This asset category is marked as non-depreciable. Please disable depreciation calculation or choose a different category."
msgstr "หมวดหมู่สินทรัพย์นี้ถูกทำเครื่องหมายว่าไม่สามารถคิดค่าเสื่อมราคาได้ โปรดปิดใช้งานการคำนวณค่าเสื่อมราคาหรือเลือกหมวดหมู่อื่น"
@@ -54977,7 +55052,7 @@ msgstr "ครอบคลุมการ์ดคะแนนทั้งหม
msgid "This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?"
msgstr "เอกสารนี้เกินขีดจำกัด {0} {1} สำหรับรายการ {4} คุณกำลังทำ {3} อื่นกับ {2} เดียวกันหรือไม่?"
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:483
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:489
msgid "This field is used to set the 'Customer'."
msgstr "ฟิลด์นี้ใช้สำหรับตั้งค่า 'ลูกค้า'"
@@ -54987,11 +55062,11 @@ msgstr "ฟิลด์นี้ใช้สำหรับตั้งค่า
msgid "This filter will be applied to Journal Entry."
msgstr "ตัวกรองนี้จะถูกใช้กับรายการบัญชีแยกประเภท"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:812
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:813
msgid "This invoice has already been paid."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:219
+#: erpnext/manufacturing/doctype/bom/bom.js:240
msgid "This is a Template BOM and will be used to make the work order for {0} of the item {1}"
msgstr "นี่คือ BOM แม่แบบและจะถูกใช้ในการสร้างคำสั่งงานสำหรับ {0} ของรายการ {1}"
@@ -55064,7 +55139,7 @@ msgstr "นี่ขึ้นอยู่กับธุรกรรมที่
msgid "This is considered dangerous from accounting point of view."
msgstr "นี่ถือว่าอันตรายจากมุมมองทางบัญชี"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:531
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:533
msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice"
msgstr "สิ่งนี้ทำเพื่อจัดการบัญชีในกรณีที่สร้างใบรับซื้อหลังจากใบแจ้งหนี้ซื้อ"
@@ -55080,7 +55155,7 @@ msgstr "นี่คือสำหรับรายการวัตถุด
msgid "This item filter has already been applied for the {0}"
msgstr "ตัวกรองรายการนี้ถูกใช้แล้วสำหรับ {0}"
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:496
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:502
msgid "This option can be checked to edit the 'Posting Date' and 'Posting Time' fields."
msgstr "สามารถเลือกตัวเลือกนี้เพื่อแก้ไขฟิลด์ 'วันที่โพสต์' และ 'เวลาโพสต์'"
@@ -55116,7 +55191,7 @@ msgstr "กำหนดการนี้ถูกสร้างขึ้นเ
msgid "This schedule was created when Asset {0} was scrapped."
msgstr "กำหนดการนี้ถูกสร้างขึ้นเมื่อสินทรัพย์ {0} ถูกทิ้ง"
-#: erpnext/assets/doctype/asset/asset.py:1356
+#: erpnext/assets/doctype/asset/asset.py:1372
msgid "This schedule was created when Asset {0} was {1} into new Asset {2}."
msgstr "กำหนดการนี้ถูกสร้างขึ้นเมื่อสินทรัพย์ {0} ถูก {1} เป็นสินทรัพย์ใหม่ {2}"
@@ -55138,7 +55213,7 @@ msgstr "กำหนดการนี้ถูกสร้างขึ้นเ
msgid "This section allows the user to set the Body and Closing text of the Dunning Letter for the Dunning Type based on language, which can be used in Print."
msgstr "ส่วนนี้อนุญาตให้ผู้ใช้ตั้งค่าข้อความเนื้อหาและข้อความปิดท้ายของจดหมายแจ้งเตือนสำหรับประเภทการแจ้งเตือนตามภาษา ซึ่งสามารถใช้ในการพิมพ์ได้"
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:489
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:495
msgid "This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc."
msgstr "ตารางนี้ใช้สำหรับตั้งค่ารายละเอียดเกี่ยวกับ 'รายการ', 'ปริมาณ', 'อัตราพื้นฐาน' เป็นต้น"
@@ -55338,7 +55413,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Projects Workspace
#. Label of a shortcut in the Projects Workspace
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1014
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1023
#: erpnext/projects/doctype/timesheet/timesheet.json
#: erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py:26
#: erpnext/projects/report/timesheet_billing_summary/timesheet_billing_summary.py:59
@@ -55453,7 +55528,7 @@ msgstr ""
#. Label of the to_uom (Link) field in DocType 'UOM Conversion Factor'
#. Label of the to (Data) field in DocType 'Call Log'
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1046
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1055
#: erpnext/setup/doctype/uom_conversion_factor/uom_conversion_factor.json
#: erpnext/telephony/doctype/call_log/call_log.json
#: erpnext/templates/pages/projects.html:68
@@ -55824,7 +55899,7 @@ msgstr "ถึงคลังสินค้า"
msgid "To Warehouse (Optional)"
msgstr "ถึงคลังสินค้า (ไม่บังคับ)"
-#: erpnext/manufacturing/doctype/bom/bom.js:872
+#: erpnext/manufacturing/doctype/bom/bom.js:893
msgid "To add Operations tick the 'With Operations' checkbox."
msgstr "เพื่อเพิ่มการดำเนินการ ให้ทำเครื่องหมายที่ช่อง 'พร้อมการดำเนินการ'"
@@ -55899,11 +55974,11 @@ msgstr "เพื่อยกเลิกกฎนี้ ให้เปิด
msgid "To still proceed with editing this Attribute Value, enable {0} in Item Variant Settings."
msgstr "เพื่อดำเนินการแก้ไขค่าคุณลักษณะนี้ต่อ ให้เปิดใช้งาน {0} ในการตั้งค่าตัวแปรรายการ"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:621
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:623
msgid "To submit the invoice without purchase order please set {0} as {1} in {2}"
msgstr "เพื่อส่งใบแจ้งหนี้โดยไม่มีคำสั่งซื้อ โปรดตั้งค่า {0} เป็น {1} ใน {2}"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:642
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:644
msgid "To submit the invoice without purchase receipt please set {0} as {1} in {2}"
msgstr "เพื่อส่งใบแจ้งหนี้โดยไม่มีใบรับซื้อ โปรดตั้งค่า {0} เป็น {1} ใน {2}"
@@ -55913,7 +55988,7 @@ msgid "To use a different finance book, please uncheck 'Include Default FB Asset
msgstr "เพื่อใช้สมุดการเงินที่แตกต่าง โปรดยกเลิกการเลือก 'รวมสินทรัพย์ FB เริ่มต้น'"
#: erpnext/accounts/report/financial_statements.py:603
-#: erpnext/accounts/report/general_ledger/general_ledger.py:304
+#: erpnext/accounts/report/general_ledger/general_ledger.py:310
#: erpnext/accounts/report/trial_balance/trial_balance.py:292
msgid "To use a different finance book, please uncheck 'Include Default FB Entries'"
msgstr "เพื่อใช้สมุดการเงินที่แตกต่าง โปรดยกเลิกการเลือก 'รวมรายการ FB เริ่มต้น'"
@@ -56007,7 +56082,7 @@ msgstr ""
#: erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py:229
#: erpnext/accounts/report/financial_statements.py:699
#: erpnext/accounts/report/general_ledger/general_ledger.html:132
-#: erpnext/accounts/report/general_ledger/general_ledger.py:378
+#: erpnext/accounts/report/general_ledger/general_ledger.py:398
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:699
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:93
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:98
@@ -56816,7 +56891,7 @@ msgstr "เปอร์เซ็นต์การสนับสนุนรว
msgid "Total hours: {0}"
msgstr "รวมชั่วโมง: {0}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:523
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:524
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:536
msgid "Total payments amount can't be greater than {}"
msgstr "จำนวนเงินชำระรวมต้องไม่เกิน {}"
@@ -57476,7 +57551,7 @@ msgstr ""
#: erpnext/quality_management/doctype/quality_review_objective/quality_review_objective.json
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
#: erpnext/selling/doctype/quotation_item/quotation_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1225
+#: erpnext/selling/doctype/sales_order/sales_order.js:1228
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:43
#: erpnext/selling/report/sales_analytics/sales_analytics.py:138
@@ -57550,7 +57625,7 @@ msgstr ""
msgid "UOM Conversion Factor"
msgstr ""
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1387
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1404
msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}"
msgstr ""
@@ -57934,11 +58009,11 @@ msgstr ""
#: erpnext/accounts/doctype/account/account.js:204
#: erpnext/accounts/doctype/cost_center/cost_center.js:107
-#: erpnext/manufacturing/doctype/job_card/job_card.js:338
-#: erpnext/manufacturing/doctype/job_card/job_card.js:407
+#: erpnext/manufacturing/doctype/job_card/job_card.js:346
+#: erpnext/manufacturing/doctype/job_card/job_card.js:415
#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:500
#: erpnext/public/js/utils.js:608 erpnext/public/js/utils.js:912
-#: erpnext/public/js/utils/barcode_scanner.js:183
+#: erpnext/public/js/utils/barcode_scanner.js:209
#: erpnext/public/js/utils/serial_no_batch_selector.js:17
#: erpnext/public/js/utils/serial_no_batch_selector.js:191
#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js:179
@@ -58039,7 +58114,7 @@ msgstr "อัปเดตต้นทุนวัสดุที่ใช้ใ
#. Option for the 'Update Type' (Select) field in DocType 'BOM Update Log'
#. Label of the update_cost_section (Section Break) field in DocType 'BOM
#. Update Tool'
-#: erpnext/manufacturing/doctype/bom/bom.js:135
+#: erpnext/manufacturing/doctype/bom/bom.js:156
#: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.json
#: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json
msgid "Update Cost"
@@ -58133,7 +58208,7 @@ msgstr "อัปเดตความถี่ของโครงการ"
msgid "Update latest price in all BOMs"
msgstr "อัปเดตราคาล่าสุดใน BOM ทั้งหมด"
-#: erpnext/assets/doctype/asset/asset.py:401
+#: erpnext/assets/doctype/asset/asset.py:402
msgid "Update stock must be enabled for the purchase invoice {0}"
msgstr "ต้องเปิดใช้งานการอัปเดตสต็อกสำหรับใบแจ้งหนี้ซื้อ {0}"
@@ -58149,7 +58224,7 @@ msgstr "อัปเดตการประทับเวลาที่แก
msgid "Update timestamp on new communication"
msgstr "อัปเดตการประทับเวลาบนการสื่อสารใหม่"
-#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:534
+#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:539
msgid "Updated successfully"
msgstr "อัปเดตสำเร็จ"
@@ -58257,7 +58332,7 @@ msgstr "ใช้การโพสต์ใหม่ตามรายการ
#. Label of the use_multi_level_bom (Check) field in DocType 'Work Order'
#. Label of the use_multi_level_bom (Check) field in DocType 'Stock Entry'
-#: erpnext/manufacturing/doctype/bom/bom.js:337
+#: erpnext/manufacturing/doctype/bom/bom.js:358
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Use Multi-Level BOM"
@@ -58587,7 +58662,7 @@ msgstr "ฟิลด์วันที่เริ่มใช้และวั
msgid "Valid till Date cannot be before Transaction Date"
msgstr "วันที่ใช้ได้ถึงต้องไม่ก่อนวันที่ทำธุรกรรม"
-#: erpnext/selling/doctype/quotation/quotation.py:154
+#: erpnext/selling/doctype/quotation/quotation.py:156
msgid "Valid till date cannot be before transaction date"
msgstr "วันที่ใช้ได้ถึงต้องไม่ก่อนวันที่ทำธุรกรรม"
@@ -58649,7 +58724,7 @@ msgstr "ความถูกต้องและการใช้งาน"
msgid "Validity in Days"
msgstr "ความถูกต้องในวัน"
-#: erpnext/selling/doctype/quotation/quotation.py:361
+#: erpnext/selling/doctype/quotation/quotation.py:363
msgid "Validity period of this quotation has ended."
msgstr "ระยะเวลาความถูกต้องของใบเสนอราคานี้สิ้นสุดลงแล้ว"
@@ -58698,7 +58773,7 @@ msgstr "วิธีการประเมินมูลค่า"
#. Label of the valuation_rate (Currency) field in DocType 'Stock
#. Reconciliation Item'
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:323
+#: erpnext/accounts/report/gross_profit/gross_profit.py:329
#: erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
#: erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json
#: erpnext/manufacturing/doctype/bom/bom.json
@@ -58927,7 +59002,7 @@ msgstr "ข้อผิดพลาดของคุณลักษณะตั
msgid "Variant Attributes"
msgstr "คุณลักษณะตัวแปร"
-#: erpnext/manufacturing/doctype/bom/bom.js:176
+#: erpnext/manufacturing/doctype/bom/bom.js:197
msgid "Variant BOM"
msgstr "BOM ตัวแปร"
@@ -58949,8 +59024,8 @@ msgstr "รายงานรายละเอียดตัวแปร"
msgid "Variant Field"
msgstr "ฟิลด์ตัวแปร"
-#: erpnext/manufacturing/doctype/bom/bom.js:291
-#: erpnext/manufacturing/doctype/bom/bom.js:370
+#: erpnext/manufacturing/doctype/bom/bom.js:312
+#: erpnext/manufacturing/doctype/bom/bom.js:391
msgid "Variant Item"
msgstr "รายการตัวแปร"
@@ -59084,7 +59159,7 @@ msgstr "การตั้งค่าวิดีโอ"
#: erpnext/accounts/doctype/cost_center/cost_center_tree.js:56
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js:205
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:76
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:14
#: erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:24
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:167
@@ -59108,8 +59183,8 @@ msgstr "การตั้งค่าวิดีโอ"
#: erpnext/stock/doctype/item/item.js:142
#: erpnext/stock/doctype/item/item.js:150
#: erpnext/stock/doctype/item/item.js:158
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:228
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:239
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:232
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:243
#: erpnext/stock/doctype/stock_entry/stock_entry.js:297
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:46
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:62
@@ -59137,7 +59212,7 @@ msgstr "ดูบัญชีแยกประเภททั่วไป"
msgid "View Leads"
msgstr "ดูผู้สนใจ"
-#: erpnext/accounts/doctype/account/account_tree.js:275
+#: erpnext/accounts/doctype/account/account_tree.js:270
#: erpnext/stock/doctype/batch/batch.js:18
msgid "View Ledger"
msgstr "ดูบัญชีแยกประเภท"
@@ -59275,7 +59350,7 @@ msgstr "ชื่อใบสำคัญ"
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:209
#: erpnext/accounts/report/general_ledger/general_ledger.js:49
-#: erpnext/accounts/report/general_ledger/general_ledger.py:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:735
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js:41
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:33
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:65
@@ -59314,7 +59389,7 @@ msgstr "ปริมาณใบสำคัญ"
#. Label of the voucher_subtype (Small Text) field in DocType 'GL Entry'
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:729
msgid "Voucher Subtype"
msgstr "ประเภทใบสำคัญย่อย"
@@ -59346,7 +59421,7 @@ msgstr "ประเภทใบสำคัญย่อย"
#: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1184
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:200
-#: erpnext/accounts/report/general_ledger/general_ledger.py:707
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
@@ -59367,7 +59442,7 @@ msgstr "ประเภทใบสำคัญย่อย"
#: erpnext/stock/report/reserved_stock/reserved_stock.py:145
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:40
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:107
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:429
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:472
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:27
#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:114
#: erpnext/stock/report/stock_ledger/stock_ledger.py:320
@@ -59501,7 +59576,7 @@ msgstr ""
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/gross_profit/gross_profit.js:56
-#: erpnext/accounts/report/gross_profit/gross_profit.py:308
+#: erpnext/accounts/report/gross_profit/gross_profit.py:314
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:41
#: erpnext/accounts/report/purchase_register/purchase_register.js:52
#: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py:28
@@ -59551,7 +59626,7 @@ msgstr ""
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:350
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:352
#: erpnext/stock/doctype/warehouse/warehouse.json
#: erpnext/stock/page/stock_balance/stock_balance.js:11
#: erpnext/stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:25
@@ -59577,7 +59652,7 @@ msgstr ""
#: erpnext/stock/report/reserved_stock/reserved_stock.py:96
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:34
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:138
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:442
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:485
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:21
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:47
#: erpnext/stock/report/stock_ageing/stock_ageing.js:30
@@ -59699,7 +59774,7 @@ msgid "Warehouse not found against the account {0}"
msgstr "ไม่พบคลังสินค้าสำหรับบัญชี {0}"
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1160
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:426
msgid "Warehouse required for stock Item {0}"
msgstr "ต้องการคลังสินค้าสำหรับรายการสต็อก {0}"
@@ -59888,6 +59963,10 @@ msgstr "สถานะการรับประกัน / AMC"
msgid "Warranty Claim"
msgstr "การเรียกร้องการรับประกัน"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:525
+msgid "Warranty Expiry (Serial)"
+msgstr ""
+
#. Label of the warranty_expiry_date (Date) field in DocType 'Serial No'
#. Label of the warranty_expiry_date (Date) field in DocType 'Warranty Claim'
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -60311,7 +60390,7 @@ msgstr "คลังสินค้างานที่กำลังดำเ
#. Entry'
#. Option for the 'From Voucher Type' (Select) field in DocType 'Stock
#. Reservation Entry'
-#: erpnext/manufacturing/doctype/bom/bom.js:167
+#: erpnext/manufacturing/doctype/bom/bom.js:188
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
@@ -60333,7 +60412,7 @@ msgstr "คลังสินค้างานที่กำลังดำเ
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:455
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:498
#: erpnext/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr "คำสั่งงาน"
@@ -60397,7 +60476,7 @@ msgstr "ไม่สามารถสร้างคำสั่งงานส
msgid "Work Order has been {0}"
msgstr "คำสั่งงานได้ถูก {0}"
-#: erpnext/selling/doctype/sales_order/sales_order.js:823
+#: erpnext/selling/doctype/sales_order/sales_order.js:826
msgid "Work Order not created"
msgstr "ไม่ได้สร้างคำสั่งงาน"
@@ -60410,7 +60489,7 @@ msgstr "คำสั่งงาน {0}: ไม่พบการ์ดงาน
msgid "Work Orders"
msgstr "คำสั่งงาน"
-#: erpnext/selling/doctype/sales_order/sales_order.js:908
+#: erpnext/selling/doctype/sales_order/sales_order.js:911
msgid "Work Orders Created: {0}"
msgstr "คำสั่งงานที่สร้าง: {0}"
@@ -60850,7 +60929,7 @@ msgid "You can only have Plans with the same billing cycle in a Subscription"
msgstr "คุณสามารถมีแผนที่มีรอบการเรียกเก็บเงินเดียวกันในการสมัครสมาชิกเท่านั้น"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:412
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:876
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:885
msgid "You can only redeem max {0} points in this order."
msgstr "คุณสามารถแลกคะแนนได้สูงสุด {0} คะแนนในคำสั่งซื้อนี้"
@@ -60878,7 +60957,7 @@ msgstr "คุณไม่สามารถประมวลผลหมาย
msgid "You can't redeem Loyalty Points having more value than the Total Amount."
msgstr "คุณไม่สามารถแลกคะแนนสะสมที่มีมูลค่ามากกว่ายอดรวมได้"
-#: erpnext/manufacturing/doctype/bom/bom.js:653
+#: erpnext/manufacturing/doctype/bom/bom.js:674
msgid "You cannot change the rate if BOM is mentioned against any Item."
msgstr "คุณไม่สามารถเปลี่ยนอัตราได้หากมีการกล่าวถึง BOM สำหรับรายการใด ๆ"
@@ -60978,7 +61057,7 @@ msgstr "คุณยังไม่ได้สร้าง {0}"
msgid "You must select a customer before adding an item."
msgstr "คุณต้องเลือกลูกค้าก่อนเพิ่มรายการ"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:267
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:268
msgid "You need to cancel POS Closing Entry {} to be able to cancel this document."
msgstr "คุณต้องยกเลิกการปิด POS Entry {} เพื่อที่จะยกเลิกเอกสารนี้"
@@ -61075,7 +61154,7 @@ msgstr "เป็นคำอธิบาย"
msgid "as Title"
msgstr "เป็นชื่อเรื่อง"
-#: erpnext/manufacturing/doctype/bom/bom.js:896
+#: erpnext/manufacturing/doctype/bom/bom.js:917
msgid "as a percentage of finished item quantity"
msgstr "เป็นเปอร์เซ็นต์ของปริมาณรายการที่เสร็จสมบูรณ์"
@@ -61095,7 +61174,7 @@ msgstr "โดย {}"
msgid "cannot be greater than 100"
msgstr "ต้องไม่เกิน 100"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:331
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:333
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1046
msgid "dated {0}"
msgstr "ลงวันที่ {0}"
@@ -61468,7 +61547,7 @@ msgstr ""
msgid "{0} account is not of type {1}"
msgstr "บัญชี {0} ไม่ใช่ประเภท {1}"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:496
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:498
msgid "{0} account not found while submitting purchase receipt"
msgstr "ไม่พบบัญชี {0} ขณะส่งใบรับซื้อ"
@@ -61492,7 +61571,7 @@ msgstr "{0} เทียบกับคำสั่งขาย {1}"
msgid "{0} already has a Parent Procedure {1}."
msgstr "{0} มีขั้นตอนหลัก {1} อยู่แล้ว"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:544
msgid "{0} and {1}"
msgstr "{0} และ {1}"
@@ -61663,6 +61742,10 @@ msgstr ""
msgid "{0} is required"
msgstr "{0} เป็นสิ่งจำเป็น"
+#: erpnext/assets/doctype/asset/asset.py:431
+msgid "{0} is still in Draft. Please submit it before saving the Asset."
+msgstr ""
+
#: erpnext/manufacturing/doctype/work_order/work_order.js:454
msgid "{0} items in progress"
msgstr "{0} รายการกำลังดำเนินการ"
@@ -61748,6 +61831,10 @@ msgstr "สร้างตัวแปร {0} แล้ว"
msgid "{0} will be given as discount."
msgstr "จะให้ส่วนลด {0}"
+#: erpnext/public/js/utils/barcode_scanner.js:523
+msgid "{0} will be set as the {1} in subsequently scanned items"
+msgstr ""
+
#: erpnext/manufacturing/doctype/job_card/job_card.py:883
msgid "{0} {1}"
msgstr ""
@@ -61760,7 +61847,7 @@ msgstr "{0} {1} ด้วยตนเอง"
msgid "{0} {1} Partially Reconciled"
msgstr "{0} {1} กระทบยอดบางส่วน"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:516
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:518
msgid "{0} {1} cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr "{0} {1} ไม่สามารถอัปเดตได้ หากคุณต้องการเปลี่ยนแปลง เราแนะนำให้ยกเลิกรายการที่มีอยู่และสร้างรายการใหม่"
diff --git a/erpnext/locale/tr.po b/erpnext/locale/tr.po
index f2216e47a23..ba05e27b6a8 100644
--- a/erpnext/locale/tr.po
+++ b/erpnext/locale/tr.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: frappe\n"
"Report-Msgid-Bugs-To: hello@frappe.io\n"
-"POT-Creation-Date: 2025-08-10 09:37+0000\n"
-"PO-Revision-Date: 2025-08-11 17:06\n"
+"POT-Creation-Date: 2025-08-17 09:36+0000\n"
+"PO-Revision-Date: 2025-08-17 18:14\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Turkish\n"
"MIME-Version: 1.0\n"
@@ -143,7 +143,7 @@ msgstr "% Tamamlandı"
msgid "% Delivered"
msgstr "% Teslim Edildi"
-#: erpnext/manufacturing/doctype/bom/bom.js:892
+#: erpnext/manufacturing/doctype/bom/bom.js:913
#, python-format
msgid "% Finished Item Quantity"
msgstr "% Bitmiş Ürün Miktarı"
@@ -1092,6 +1092,10 @@ msgstr "AB-"
msgid "ACC-PINV-.YYYY.-"
msgstr "ACC-PINV-.YYYY.-"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:531
+msgid "AMC Expiry (Serial)"
+msgstr ""
+
#. Label of the amc_expiry_date (Date) field in DocType 'Serial No'
#. Label of the amc_expiry_date (Date) field in DocType 'Warranty Claim'
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -1319,7 +1323,7 @@ msgstr "{0} Ürün Ağacı, ‘{1}’ ürünü stok girişinde eksik."
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:30
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:190
#: erpnext/accounts/report/general_ledger/general_ledger.js:38
-#: erpnext/accounts/report/general_ledger/general_ledger.py:652
+#: erpnext/accounts/report/general_ledger/general_ledger.py:672
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js:30
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:30
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
@@ -1530,7 +1534,7 @@ msgstr "Ödeme kayıtlarını almak için hesap zorunludur"
msgid "Account is not set for the dashboard chart {0}"
msgstr "{0} gösterge tablosu grafiği için hesap ayarlanmadı"
-#: erpnext/assets/doctype/asset/asset.py:755
+#: erpnext/assets/doctype/asset/asset.py:771
msgid "Account not Found"
msgstr "Hesap bulunamadı"
@@ -1912,8 +1916,8 @@ msgstr "Muhasebe Boyutları Filtresi"
msgid "Accounting Entries"
msgstr "Muhasebe Girişleri"
-#: erpnext/assets/doctype/asset/asset.py:789
-#: erpnext/assets/doctype/asset/asset.py:804
+#: erpnext/assets/doctype/asset/asset.py:805
+#: erpnext/assets/doctype/asset/asset.py:820
#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:559
msgid "Accounting Entry for Asset"
msgstr "Varlık İçin Muhasebe Girişi"
@@ -1927,29 +1931,29 @@ msgstr ""
msgid "Accounting Entry for Landed Cost Voucher for SCR {0}"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:814
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:816
msgid "Accounting Entry for Service"
msgstr "Hizmet için Muhasebe Girişi"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:999
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1020
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1038
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1059
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1080
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1104
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1211
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1447
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1469
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1001
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1022
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1040
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1061
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1082
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1106
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1213
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1449
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1471
#: erpnext/controllers/stock_controller.py:579
#: erpnext/controllers/stock_controller.py:596
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:909
#: erpnext/stock/doctype/stock_entry/stock_entry.py:1627
#: erpnext/stock/doctype/stock_entry/stock_entry.py:1641
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:613
msgid "Accounting Entry for Stock"
msgstr "Stok İçin Muhasebe Girişi"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:716
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:718
msgid "Accounting Entry for {0}"
msgstr "{0} için Muhasebe Girişi"
@@ -2492,9 +2496,9 @@ msgstr "Yeni Fatura Üzerinde İşlem"
#: erpnext/buying/doctype/supplier/supplier.js:128
#: erpnext/buying/doctype/supplier/supplier.js:137
#: erpnext/buying/doctype/supplier_scorecard_scoring_standing/supplier_scorecard_scoring_standing.json
-#: erpnext/manufacturing/doctype/bom/bom.js:139
-#: erpnext/manufacturing/doctype/bom/bom.js:150
-#: erpnext/manufacturing/doctype/bom/bom.js:161
+#: erpnext/manufacturing/doctype/bom/bom.js:160
+#: erpnext/manufacturing/doctype/bom/bom.js:171
+#: erpnext/manufacturing/doctype/bom/bom.js:182
#: erpnext/projects/doctype/project/project.js:87
#: erpnext/projects/doctype/project/project.js:95
#: erpnext/projects/doctype/project/project.js:151
@@ -2783,7 +2787,7 @@ msgstr "Gerçek tip vergi satırda Ürün fiyatına dahil edilemez {0}"
#: erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json
#: erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
#: erpnext/crm/doctype/lead/lead.js:85
-#: erpnext/manufacturing/doctype/bom/bom.js:922
+#: erpnext/manufacturing/doctype/bom/bom.js:943
#: erpnext/manufacturing/doctype/plant_floor/stock_summary_template.html:55
#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:235
#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:264
@@ -2800,7 +2804,7 @@ msgstr "Ekle"
msgid "Add / Edit Prices"
msgstr "Fiyat Ekle / Düzenle"
-#: erpnext/accounts/doctype/account/account_tree.js:252
+#: erpnext/accounts/doctype/account/account_tree.js:248
msgid "Add Child"
msgstr "Alt Öğe Ekle"
@@ -2896,7 +2900,7 @@ msgid "Add Quote"
msgstr "Teklif Ekle"
#. Label of the add_raw_materials (Button) field in DocType 'BOM Operation'
-#: erpnext/manufacturing/doctype/bom/bom.js:920
+#: erpnext/manufacturing/doctype/bom/bom.js:941
#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
msgid "Add Raw Materials"
msgstr "Hammadde Ekle"
@@ -3473,11 +3477,11 @@ msgstr "Vergi Kategorisini belirlemek için kullanılacak olan adres."
msgid "Adjust Asset Value"
msgstr "Varlık Değerini Ayarla"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1078
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1087
msgid "Adjustment Against"
msgstr "Karşılığına Yapılan Düzenleme"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:644
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:646
msgid "Adjustment based on Purchase Invoice rate"
msgstr "Satın Alma Faturası oranına göre düzeltme"
@@ -3667,7 +3671,7 @@ msgstr "Karşılığında"
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
#: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:39
#: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:91
-#: erpnext/accounts/report/general_ledger/general_ledger.py:721
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Account"
msgstr "Hesap"
@@ -3686,7 +3690,7 @@ msgstr "Genel Siparişe Karşılık"
msgid "Against Customer Order {0}"
msgstr "Müşteri Siparişi {0} Karşılığında"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1191
+#: erpnext/selling/doctype/sales_order/sales_order.js:1194
msgid "Against Default Supplier"
msgstr "Varsayılan Tedarikçiye Karşı"
@@ -3778,13 +3782,13 @@ msgstr "Satış Sipariş Kalemi karşılığı"
msgid "Against Stock Entry"
msgstr "Stok Girişi Karşılığı"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:329
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:331
msgid "Against Supplier Invoice {0}"
msgstr "Tedarikçi Faturasına Karşı {0}"
#. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry'
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:741
+#: erpnext/accounts/report/general_ledger/general_ledger.py:774
msgid "Against Voucher"
msgstr "Fatura"
@@ -3808,7 +3812,7 @@ msgstr "İlgili Belge No"
#: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/general_ledger/general_ledger.py:772
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr "Fatura Türü"
@@ -4099,11 +4103,11 @@ msgstr "Bu ve bunun üzerindeki tüm iletişimler yeni Sayıya taşınacaktır."
msgid "All items are already requested"
msgstr "Tüm ürünler zaten talep edildi"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1335
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1342
msgid "All items have already been Invoiced/Returned"
msgstr "Tüm ürünler zaten Faturalandırıldı/İade Edildi"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1196
msgid "All items have already been received"
msgstr "Tüm ürünler zaten alındı"
@@ -4129,7 +4133,7 @@ msgstr ""
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 "Tüm gerekli malzemeler (hammadde) Ürün Ağacı'ndan alınarak bu tabloya eklenir. Burada herhangi bir ürün için Kaynak Depo'yu da değiştirebilirsiniz. Üretim sırasında, bu tablodan transfer edilen hammaddeleri takip edebilirsiniz."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:847
msgid "All these items have already been Invoiced/Returned"
msgstr "Bu öğelerin tümü zaten Faturalandırılmış/İade edilmiştir"
@@ -4194,7 +4198,7 @@ msgstr "Ayrılan"
#: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json
#: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
#: erpnext/accounts/doctype/unreconcile_payment_entries/unreconcile_payment_entries.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:378
+#: erpnext/accounts/report/gross_profit/gross_profit.py:384
#: erpnext/public/js/utils/unreconcile.js:87
msgid "Allocated Amount"
msgstr "Ayrılan Tutar"
@@ -4676,7 +4680,7 @@ msgstr "{1} kullanıcısı için {0} pos profilinde varsayılan olarak varsayıl
msgid "Also you can't switch back to FIFO after setting the valuation method to Moving Average for this item."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:200
+#: erpnext/manufacturing/doctype/bom/bom.js:221
#: erpnext/manufacturing/doctype/work_order/work_order.js:151
#: erpnext/manufacturing/doctype/work_order/work_order.js:166
#: erpnext/public/js/utils.js:518
@@ -5772,11 +5776,11 @@ msgstr "Negatif stok olduğu için {0} özelliğini aktif hale getiremezsiniz."
msgid "As there are reserved stock, you cannot disable {0}."
msgstr "Depolarda Rezerv stok olduğu için {0} ayarını devre dışı bırakamazsınız."
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1031
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1046
msgid "As there are sufficient Sub Assembly Items, Work Order is not required for Warehouse {0}."
msgstr "Yeterli Alt Montaj Ürünleri mevcut olduğundan, {0} Deposu için İş Emri gerekli değildir."
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1743
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1760
msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}."
msgstr "Yeterli hammadde olduğundan, {0} Deposu için Malzeme Talebi gerekli değildir."
@@ -5826,7 +5830,7 @@ msgstr "Montaj Ürünleri"
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/workspace/assets/assets.json
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:221
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:225
#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Asset"
msgstr "Varlık"
@@ -5944,7 +5948,7 @@ msgstr "Varlık Amortisman Programı {0} Varlık {1} için zaten mevcut."
msgid "Asset Depreciation Schedule {0} for Asset {1} and Finance Book {2} already exists."
msgstr "Varlık Amortisman Programı {0} Varlık {1} ve Finans Defteri {2} için zaten mevcut."
-#: erpnext/assets/doctype/asset/asset.py:176
+#: erpnext/assets/doctype/asset/asset.py:177
msgid "Asset Depreciation Schedules created/updated:
{0}
Please check, edit if needed, and submit the Asset."
msgstr ""
@@ -6017,7 +6021,7 @@ msgstr "Varlık Bakım Ekibi"
#. Label of a Link in the Assets Workspace
#: erpnext/assets/doctype/asset_movement/asset_movement.json
#: erpnext/assets/workspace/assets/assets.json
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:232
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:236
msgid "Asset Movement"
msgstr "Varlık Hareketleri"
@@ -6026,7 +6030,7 @@ msgstr "Varlık Hareketleri"
msgid "Asset Movement Item"
msgstr "Varlık Hareketi Ürünü"
-#: erpnext/assets/doctype/asset/asset.py:1035
+#: erpnext/assets/doctype/asset/asset.py:1051
msgid "Asset Movement record {0} created"
msgstr "Varlık Hareket kaydı {0} oluşturuldu"
@@ -6155,11 +6159,11 @@ msgstr "Varlık Değer Ayarlaması, varlığın satın alma tarihi {0} ö
msgid "Asset Value Analytics"
msgstr "Varlık Değeri Analitiği"
-#: erpnext/assets/doctype/asset/asset.py:208
+#: erpnext/assets/doctype/asset/asset.py:209
msgid "Asset cancelled"
msgstr "Varlık iptal edildi"
-#: erpnext/assets/doctype/asset/asset.py:584
+#: erpnext/assets/doctype/asset/asset.py:600
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr "Varlık iptal edilemez, çünkü zaten {0} durumda"
@@ -6171,15 +6175,15 @@ msgstr "Varlık, son amortisman girişinden önce hurdaya çıkarılamaz."
msgid "Asset capitalized after Asset Capitalization {0} was submitted"
msgstr "Varlık Sermayelendirmesi {0} gönderildikten sonra varlık sermayelendirildi"
-#: erpnext/assets/doctype/asset/asset.py:217
+#: erpnext/assets/doctype/asset/asset.py:218
msgid "Asset created"
msgstr "Varlık oluşturuldu"
-#: erpnext/assets/doctype/asset/asset.py:1275
+#: erpnext/assets/doctype/asset/asset.py:1291
msgid "Asset created after being split from Asset {0}"
msgstr "Varlıktan ayrıldıktan sonra oluşturulan varlık {0}"
-#: erpnext/assets/doctype/asset/asset.py:220
+#: erpnext/assets/doctype/asset/asset.py:221
msgid "Asset deleted"
msgstr "Varlık silindi"
@@ -6220,7 +6224,7 @@ msgstr "Varlık, Yevmiye Kaydı {0} ile hurdaya ayrıldı"
msgid "Asset sold"
msgstr "Satılan Varlık"
-#: erpnext/assets/doctype/asset/asset.py:195
+#: erpnext/assets/doctype/asset/asset.py:196
msgid "Asset submitted"
msgstr "Varlık Kaydedildi"
@@ -6228,7 +6232,7 @@ msgstr "Varlık Kaydedildi"
msgid "Asset transferred to Location {0}"
msgstr "Varlık {0} konumuna aktarıldı"
-#: erpnext/assets/doctype/asset/asset.py:1284
+#: erpnext/assets/doctype/asset/asset.py:1300
msgid "Asset updated after being split into Asset {0}"
msgstr "Varlık, Varlığa bölündükten sonra güncellendi {0}"
@@ -6319,7 +6323,7 @@ msgstr "{item_code} için varlıklar oluşturulamadı. Varlığı manuel olarak
msgid "Assets {assets_link} created for {item_code}"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:193
+#: erpnext/manufacturing/doctype/job_card/job_card.js:201
msgid "Assign Job to Employee"
msgstr "Yapılacak İşi Personele Ata"
@@ -6369,11 +6373,11 @@ msgstr "Satır #{0}: Ürün {2} için seçilen miktar {1}, depo {4} içinde mevc
msgid "At least one account with exchange gain or loss is required"
msgstr "En az bir adet döviz kazancı veya kaybı hesabının bulunması zorunludur"
-#: erpnext/assets/doctype/asset/asset.py:1141
+#: erpnext/assets/doctype/asset/asset.py:1157
msgid "At least one asset has to be selected."
msgstr "En azından bir varlığın seçilmesi gerekiyor."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:930
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:965
msgid "At least one invoice has to be selected."
msgstr "En az bir faturanın seçilmesi gerekiyor."
@@ -6381,7 +6385,7 @@ msgstr "En az bir faturanın seçilmesi gerekiyor."
msgid "At least one item should be entered with negative quantity in return document"
msgstr "İade işleminde en az bir kalemin negatif miktarla girilmesi gerekmektedir"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:484
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:485
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:540
msgid "At least one mode of payment is required for POS invoice."
msgstr "POS faturası için en az bir ödeme şekli zorunludur."
@@ -6931,7 +6935,7 @@ msgstr "Mevcut Stok"
msgid "Available Stock for Packing Items"
msgstr "Paketlenecek Ürünlerin Stok Durumu"
-#: erpnext/assets/doctype/asset/asset.py:313
+#: erpnext/assets/doctype/asset/asset.py:314
msgid "Available for use date is required"
msgstr "Kullanıma Hazır Tarihi gereklidir"
@@ -6948,7 +6952,7 @@ msgstr "{0} Kullanılabilir"
msgid "Available-for-use Date"
msgstr "Kullanıma Hazır Tarihi"
-#: erpnext/assets/doctype/asset/asset.py:418
+#: erpnext/assets/doctype/asset/asset.py:419
msgid "Available-for-use Date should be after purchase date"
msgstr "Kullanıma hazır tarihi satın alma tarihinden sonra olmalıdır"
@@ -7003,7 +7007,7 @@ msgstr "Ortalama Alış Liste Fiyatı"
msgid "Avg. Selling Price List Rate"
msgstr "Ortalama Satış Liste Fiyatı"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:316
+#: erpnext/accounts/report/gross_profit/gross_profit.py:322
msgid "Avg. Selling Rate"
msgstr "Ortalama Satış Fiyatı"
@@ -7058,7 +7062,7 @@ msgstr "Ürün Ağacı Miktarı"
#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js:5
#: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:109
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1005
+#: erpnext/selling/doctype/sales_order/sales_order.js:1008
#: erpnext/stock/doctype/material_request/material_request.js:334
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/stock/doctype/stock_entry/stock_entry.js:633
@@ -7072,7 +7076,7 @@ msgstr "Ürün Ağacı"
msgid "BOM 1"
msgstr "Ürün Ağacı 1"
-#: erpnext/manufacturing/doctype/bom/bom.py:1519
+#: erpnext/manufacturing/doctype/bom/bom.py:1556
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr "Ürün Ağacı 1 {0} ve Ürün Ağacı 2 {1} aynı olmamalıdır"
@@ -7291,7 +7295,7 @@ msgstr "Ürün Ağacı Web Sitesi Ürünü"
msgid "BOM Website Operation"
msgstr "Ürün Ağacı Web Sitesi Operasyonu"
-#: erpnext/stock/doctype/stock_entry/stock_entry.js:1208
+#: erpnext/stock/doctype/stock_entry/stock_entry.js:1214
msgid "BOM and Manufacturing Quantity are required"
msgstr "Ürün Ağacı ve Üretim Miktarı gereklidir."
@@ -7314,19 +7318,19 @@ msgstr "Ürün Ağacı yinelemesi: {0}, {1} alt öğesi olamaz"
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr "Ürün Ağacı yinelemesi: {1}, {0} girişinin üst öğesi veya alt öğesi olamaz"
-#: erpnext/manufacturing/doctype/bom/bom.py:1332
+#: erpnext/manufacturing/doctype/bom/bom.py:1369
msgid "BOM {0} does not belong to Item {1}"
msgstr "{0} Ürün Ağacı {1} Ürününe ait değil"
-#: erpnext/manufacturing/doctype/bom/bom.py:1314
+#: erpnext/manufacturing/doctype/bom/bom.py:1351
msgid "BOM {0} must be active"
msgstr "{0} Ürün Ağacı aktif olmalıdır"
-#: erpnext/manufacturing/doctype/bom/bom.py:1317
+#: erpnext/manufacturing/doctype/bom/bom.py:1354
msgid "BOM {0} must be submitted"
msgstr "{0} Ürün Ağacı kaydedilmelidir"
-#: erpnext/manufacturing/doctype/bom/bom.py:734
+#: erpnext/manufacturing/doctype/bom/bom.py:765
msgid "BOM {0} not found for the item {1}"
msgstr "{1} Ürünü için {0} Ürün Ağacı bulunamadı"
@@ -7397,7 +7401,7 @@ msgstr "Bakiye"
msgid "Balance (Dr - Cr)"
msgstr "Bakiye (Borç - Alacak)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:673
+#: erpnext/accounts/report/general_ledger/general_ledger.py:693
msgid "Balance ({0})"
msgstr "Bakiye ({0})"
@@ -7789,7 +7793,7 @@ msgstr "Çubuk"
#: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
-#: erpnext/public/js/utils/barcode_scanner.js:282
+#: erpnext/public/js/utils/barcode_scanner.js:308
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#: erpnext/stock/doctype/item_barcode/item_barcode.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -8010,6 +8014,7 @@ msgid "Batch Details"
msgstr "Parti Detayları"
#: erpnext/stock/doctype/batch/batch.py:197
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:455
msgid "Batch Expiry Date"
msgstr "Parti Son Kullanma Tarihi"
@@ -8062,7 +8067,7 @@ msgstr "Parti Ürünü Son Kullanma Durumu"
#: 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:2446
-#: erpnext/public/js/utils/barcode_scanner.js:260
+#: erpnext/public/js/utils/barcode_scanner.js:286
#: erpnext/public/js/utils/serial_no_batch_selector.js:438
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#: erpnext/stock/doctype/item_price/item_price.json
@@ -8083,7 +8088,7 @@ msgstr "Parti Ürünü Son Kullanma Durumu"
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:81
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:160
#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:19
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:416
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:448
#: erpnext/stock/report/stock_ledger/stock_ledger.js:78
#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
#: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
@@ -8098,7 +8103,7 @@ msgstr "Parti Numarası Zorunlu"
msgid "Batch No {0} does not exists"
msgstr "Parti No {0} mevcut değil"
-#: erpnext/stock/utils.py:632
+#: erpnext/stock/utils.py:638
msgid "Batch No {0} is linked with Item {1} which has serial no. Please scan serial no instead."
msgstr "Parti No {0} , seri numarası olan {1} öğesi ile bağlantılıdır. Lütfen bunun yerine seri numarasını tarayın."
@@ -8166,7 +8171,7 @@ msgstr "Parti ve Seri No"
msgid "Batch not created for item {} since it does not have a batch series."
msgstr "{} öğesi için parti oluşturulamadı çünkü parti serisi yok."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:348
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:350
msgid "Batch {0} and Warehouse"
msgstr "Parti {0} ve Depo"
@@ -8243,7 +8248,7 @@ msgstr "Alış Faturasındaki Reddedilen Miktar için Fatura"
#. Label of a Card Break in the Manufacturing Workspace
#. Label of a Link in the Manufacturing Workspace
-#: erpnext/manufacturing/doctype/bom/bom.py:1188
+#: erpnext/manufacturing/doctype/bom/bom.py:1225
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8557,7 +8562,7 @@ msgid "Blanket Order Rate"
msgstr "Genel Sipariş Fiyatı"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:268
msgid "Block Invoice"
msgstr "Faturayı Engelle"
@@ -8755,7 +8760,7 @@ msgstr "Şube Kodu"
#: erpnext/accounts/doctype/pricing_rule_brand/pricing_rule_brand.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:300
+#: erpnext/accounts/report/gross_profit/gross_profit.py:306
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:53
#: erpnext/accounts/report/sales_register/sales_register.js:64
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -8828,7 +8833,7 @@ msgstr "Yayıncılık"
msgid "Brokerage"
msgstr "Aracılık"
-#: erpnext/manufacturing/doctype/bom/bom.js:143
+#: erpnext/manufacturing/doctype/bom/bom.js:164
msgid "Browse BOM"
msgstr "Ürün Ağacına Gözat"
@@ -9050,7 +9055,7 @@ msgstr "Satın Alma"
msgid "Buying & Selling Settings"
msgstr "Alış ve Satış Ayarları"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:337
+#: erpnext/accounts/report/gross_profit/gross_profit.py:343
msgid "Buying Amount"
msgstr "Alış Tutarı"
@@ -9721,11 +9726,11 @@ msgstr "Hesap Türü seçili olduğundan Gruba dönüştürülemiyor."
msgid "Cannot covert to Group because Account Type is selected."
msgstr "Hesap Türü seçili olduğundan Gruba dönüştürülemiyor."
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:988
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:990
msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts."
msgstr "İleri tarihli Alış İrsaliyeleri için Stok Rezervasyon Girişleri oluşturulamıyor."
-#: erpnext/selling/doctype/sales_order/sales_order.py:1758
+#: erpnext/selling/doctype/sales_order/sales_order.py:1774
#: erpnext/stock/doctype/pick_list/pick_list.py:199
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 "Rezerve stok olduğundan {0} Satış Siparişi için bir Çekme Listesi oluşturulamıyor. Çekme Listesi oluşturmak için lütfen stok rezervini kaldırın."
@@ -9738,15 +9743,11 @@ msgstr "Devre dışı bırakılan hesaplar için muhasebe girişleri oluşturula
msgid "Cannot create return for consolidated invoice {0}."
msgstr ""
-#: erpnext/accounts/doctype/account/account_tree.js:241
-msgid "Cannot create root account."
-msgstr ""
-
-#: erpnext/manufacturing/doctype/bom/bom.py:1044
+#: erpnext/manufacturing/doctype/bom/bom.py:1081
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr "Diğer Ürün Ağaçları ile bağlantılı olan bir Ürün Ağacı iptal edilemez."
-#: erpnext/crm/doctype/opportunity/opportunity.py:277
+#: erpnext/crm/doctype/opportunity/opportunity.py:282
msgid "Cannot declare as lost, because Quotation has been made."
msgstr "Kayıp olarak belirtilemez, çünkü Fiyat Teklifi verilmiş."
@@ -9776,7 +9777,11 @@ msgstr "Bir şirket için birden fazla belge sıraya alınamıyor. {0} zaten şu
msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No."
msgstr "{0} Ürünü Seri No ile \"Teslimatı Sağla ile ve Seri No ile Teslimatı Sağla\" olmadan eklendiğinden, Seri No ile teslimat sağlanamaz."
-#: erpnext/public/js/utils/barcode_scanner.js:54
+#: erpnext/public/js/utils/barcode_scanner.js:62
+msgid "Cannot find Item or Warehouse with this Barcode"
+msgstr ""
+
+#: erpnext/public/js/utils/barcode_scanner.js:63
msgid "Cannot find Item with this Barcode"
msgstr "Bu Barkoda Sahip Ürün Bulunamadı"
@@ -9827,7 +9832,7 @@ msgstr "Güncelleme için bağlantı token'ı alınamıyor. Daha fazla bilgi iç
msgid "Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row"
msgstr "İlk satır için ücret türü 'Önceki Satır Tutarı Üzerinden' veya 'Önceki Satır Toplamı Üzerinden' olarak seçilemiyor"
-#: erpnext/selling/doctype/quotation/quotation.py:283
+#: erpnext/selling/doctype/quotation/quotation.py:285
msgid "Cannot set as Lost as Sales Order is made."
msgstr "Satış Siparişi verildiği için Kayıp olarak ayarlanamaz."
@@ -10014,7 +10019,7 @@ msgstr "Operasyonlardan Nakit Akışı"
msgid "Cash In Hand"
msgstr "Eldeki Nakit"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:321
msgid "Cash or Bank Account is mandatory for making payment entry"
msgstr "Ödeme girişi yapmak için Nakit veya Banka Hesabı zorunludur"
@@ -10640,8 +10645,8 @@ msgstr "Müşteri"
#: erpnext/selling/doctype/sales_order/sales_order.js:591
#: erpnext/selling/doctype/sales_order/sales_order.js:623
#: erpnext/selling/doctype/sales_order/sales_order_list.js:66
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:319
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:276
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:325
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:283
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:170
#: erpnext/support/doctype/issue/issue.js:23
msgid "Close"
@@ -10746,7 +10751,7 @@ msgstr "Kapanış Alacağı"
msgid "Closing (Dr)"
msgstr "Kapanış Borcu"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:379
+#: erpnext/accounts/report/general_ledger/general_ledger.py:399
msgid "Closing (Opening + Total)"
msgstr "Kapanış (Açılış + Toplam)"
@@ -11606,7 +11611,7 @@ msgstr "Fatura oluşturmak için şirket zorunludur. Lütfen Global Varsayılanl
msgid "Company name not same"
msgstr "Şirket adı aynı değil"
-#: erpnext/assets/doctype/asset/asset.py:261
+#: erpnext/assets/doctype/asset/asset.py:262
msgid "Company of asset {0} and purchase document {1} doesn't matches."
msgstr "{0} varlık ve {1} satın alma belgesi eşleşmiyor."
@@ -11649,7 +11654,7 @@ msgstr "Şirket {0} birden fazla kez eklendi"
msgid "Company {} does not exist yet. Taxes setup aborted."
msgstr "{} şirketi henüz mevcut değil. Vergi kurulumu iptal edildi."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:528
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:529
msgid "Company {} does not match with POS Profile Company {}"
msgstr "{} Şirketi, {} Şirketi POS Profili ile eşleşmiyor"
@@ -11686,7 +11691,7 @@ msgstr "Rakipler"
msgid "Complete"
msgstr "Tamamla"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:230
+#: erpnext/manufacturing/doctype/job_card/job_card.js:238
#: erpnext/manufacturing/doctype/workstation/workstation.js:151
msgid "Complete Job"
msgstr "İşi Tamamla"
@@ -11819,8 +11824,8 @@ msgstr "Tamamlanan Miktar"
msgid "Completed Qty cannot be greater than 'Qty to Manufacture'"
msgstr "Tamamlanan Miktar, Üretilecek Miktardan fazla olamaz."
-#: erpnext/manufacturing/doctype/job_card/job_card.js:278
-#: erpnext/manufacturing/doctype/job_card/job_card.js:373
+#: erpnext/manufacturing/doctype/job_card/job_card.js:286
+#: erpnext/manufacturing/doctype/job_card/job_card.js:381
#: erpnext/manufacturing/doctype/workstation/workstation.js:296
msgid "Completed Quantity"
msgstr "Tamamlanan Miktar"
@@ -12712,13 +12717,13 @@ msgstr "Düzeltici"
msgid "Corrective Action"
msgstr "Düzeltici Faaliyet"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:430
+#: erpnext/manufacturing/doctype/job_card/job_card.js:438
msgid "Corrective Job Card"
msgstr "Düzeltici Faaliyet İş Kartı"
#. Label of the corrective_operation_section (Tab Break) field in DocType 'Job
#. Card'
-#: erpnext/manufacturing/doctype/job_card/job_card.js:437
+#: erpnext/manufacturing/doctype/job_card/job_card.js:445
#: erpnext/manufacturing/doctype/job_card/job_card.json
msgid "Corrective Operation"
msgstr "Düzeltici Faaliyet"
@@ -12862,9 +12867,9 @@ msgstr "Maliyet"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:197
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98
#: erpnext/accounts/report/general_ledger/general_ledger.js:153
-#: erpnext/accounts/report/general_ledger/general_ledger.py:734
+#: erpnext/accounts/report/general_ledger/general_ledger.py:767
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
-#: erpnext/accounts/report/gross_profit/gross_profit.py:364
+#: erpnext/accounts/report/gross_profit/gross_profit.py:370
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
#: erpnext/accounts/report/purchase_register/purchase_register.js:46
#: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py:29
@@ -12949,8 +12954,8 @@ msgstr ""
msgid "Cost Center is a part of Cost Center Allocation, hence cannot be converted to a group"
msgstr "Maliyet Merkezi, Maliyet Merkezi Tahsisinin bir parçasıdır, dolayısıyla bir gruba dönüştürülemez"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1412
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:873
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1414
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:875
msgid "Cost Center is required in row {0} in Taxes table for type {1}"
msgstr "{1} türü için Vergiler tablosundaki {0} satırında Maliyet Merkezi gereklidir"
@@ -12970,11 +12975,11 @@ msgstr "Mevcut işlemleri olan Maliyet Merkezi deftere çevrilemez"
msgid "Cost Center {0} cannot be used for allocation as it is used as main cost center in other allocation record."
msgstr "Maliyet Merkezi {0} diğer tahsis kayıtlarında ana maliyet merkezi olarak kullanıldığından tahsis için kullanılamaz."
-#: erpnext/assets/doctype/asset/asset.py:289
+#: erpnext/assets/doctype/asset/asset.py:290
msgid "Cost Center {} doesn't belong to Company {}"
msgstr "Maliyet Merkezi {}, {} Şirketine ait değil"
-#: erpnext/assets/doctype/asset/asset.py:296
+#: erpnext/assets/doctype/asset/asset.py:297
msgid "Cost Center {} is a group cost center and group cost centers cannot be used in transactions"
msgstr "Maliyet Merkezi {} bir grup maliyet merkezidir ve grup maliyet merkezleri işlemlerde kullanılamaz"
@@ -13090,11 +13095,11 @@ msgstr ""
msgid "Could Not Delete Demo Data"
msgstr "Demo Verileri Silinemedi"
-#: erpnext/selling/doctype/quotation/quotation.py:584
+#: erpnext/selling/doctype/quotation/quotation.py:606
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr "Aşağıdaki zorunlu alanlar eksik olduğundan Müşteri otomatik olarak oluşturulamadı:"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:674
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr "Alacak Dekontu otomatik olarak oluşturulamadı, lütfen 'Alacak Dekontu Düzenle' seçeneğinin işaretini kaldırın ve tekrar gönderin"
@@ -13223,9 +13228,9 @@ msgstr "Alacak"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:127
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:135
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:146
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:222
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:659
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:683
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:228
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:665
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:689
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13265,14 +13270,14 @@ msgstr "Alacak"
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:34
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:48
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:64
-#: erpnext/manufacturing/doctype/bom/bom.js:171
-#: erpnext/manufacturing/doctype/bom/bom.js:180
-#: erpnext/manufacturing/doctype/bom/bom.js:190
-#: erpnext/manufacturing/doctype/bom/bom.js:194
-#: erpnext/manufacturing/doctype/bom/bom.js:438
+#: erpnext/manufacturing/doctype/bom/bom.js:192
+#: erpnext/manufacturing/doctype/bom/bom.js:201
+#: erpnext/manufacturing/doctype/bom/bom.js:211
+#: erpnext/manufacturing/doctype/bom/bom.js:215
+#: erpnext/manufacturing/doctype/bom/bom.js:459
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.js:99
-#: erpnext/manufacturing/doctype/job_card/job_card.js:137
-#: erpnext/manufacturing/doctype/job_card/job_card.js:151
+#: erpnext/manufacturing/doctype/job_card/job_card.js:145
+#: erpnext/manufacturing/doctype/job_card/job_card.js:159
#: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:268
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:145
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:159
@@ -13284,7 +13289,7 @@ msgstr "Alacak"
#: erpnext/projects/doctype/task/task_tree.js:81
#: erpnext/public/js/communication.js:19 erpnext/public/js/communication.js:31
#: erpnext/public/js/communication.js:41
-#: erpnext/public/js/controllers/transaction.js:361
+#: erpnext/public/js/controllers/transaction.js:362
#: erpnext/public/js/controllers/transaction.js:2494
#: erpnext/selling/doctype/customer/customer.js:181
#: erpnext/selling/doctype/quotation/quotation.js:125
@@ -13303,18 +13308,18 @@ msgstr "Alacak"
#: erpnext/selling/doctype/sales_order/sales_order.js:759
#: erpnext/selling/doctype/sales_order/sales_order.js:766
#: erpnext/selling/doctype/sales_order/sales_order.js:770
-#: erpnext/selling/doctype/sales_order/sales_order.js:917
-#: erpnext/selling/doctype/sales_order/sales_order.js:1056
+#: erpnext/selling/doctype/sales_order/sales_order.js:920
+#: erpnext/selling/doctype/sales_order/sales_order.js:1059
#: erpnext/stock/doctype/delivery_note/delivery_note.js:96
#: erpnext/stock/doctype/delivery_note/delivery_note.js:98
#: erpnext/stock/doctype/delivery_note/delivery_note.js:121
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:247
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:261
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:271
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:281
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:300
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:305
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:347
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:253
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:277
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:287
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:306
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:311
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:353
#: erpnext/stock/doctype/item/item.js:167
#: erpnext/stock/doctype/item/item.js:174
#: erpnext/stock/doctype/item/item.js:182
@@ -13338,15 +13343,15 @@ msgstr "Alacak"
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:70
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:82
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:108
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:279
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:284
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:286
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:291
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:297
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:300
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:298
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:304
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:307
#: erpnext/stock/doctype/stock_entry/stock_entry.js:170
#: erpnext/stock/doctype/stock_entry/stock_entry.js:172
#: erpnext/stock/doctype/stock_entry/stock_entry.js:247
-#: erpnext/stock/doctype/stock_entry/stock_entry.js:1283
+#: erpnext/stock/doctype/stock_entry/stock_entry.js:1289
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:231
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:264
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:277
@@ -13471,7 +13476,7 @@ msgstr "POS Açılış Girişi Oluştur"
msgid "Create Payment Entry"
msgstr "Ödeme Girişi Oluştur"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:806
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:807
msgid "Create Payment Entry for Consolidated POS Invoices."
msgstr ""
@@ -13487,7 +13492,7 @@ msgstr "Yazdırma Formatı Oluştur"
msgid "Create Prospect"
msgstr "Potansiyel Müşteri Oluştur"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1238
+#: erpnext/selling/doctype/sales_order/sales_order.js:1242
#: erpnext/utilities/activation.py:106
msgid "Create Purchase Order"
msgstr "Satın Alma Emri Oluştur"
@@ -13619,7 +13624,7 @@ msgstr "{1} için, şu tarih aralığında {0} adet puan kartı oluşturuldu:\n"
msgid "Creating Accounts..."
msgstr "Hesap Oluşturuluyor..."
-#: erpnext/selling/doctype/sales_order/sales_order.js:1133
+#: erpnext/selling/doctype/sales_order/sales_order.js:1136
msgid "Creating Delivery Note ..."
msgstr "İrsaliye Oluşturuluyor..."
@@ -13639,11 +13644,11 @@ msgstr "Paketleme Fişi Oluşturuluyor ..."
msgid "Creating Purchase Invoices ..."
msgstr "Satın Alma Faturaları Oluşturuluyor..."
-#: erpnext/selling/doctype/sales_order/sales_order.js:1258
+#: erpnext/selling/doctype/sales_order/sales_order.js:1262
msgid "Creating Purchase Order ..."
msgstr "Satın Alma Siparişi Oluşturuluyor..."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:746
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13714,11 +13719,11 @@ msgstr "{0} oluşturulması kısmen başarılı.\n"
msgid "Credit"
msgstr "Alacak"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:691
+#: erpnext/accounts/report/general_ledger/general_ledger.py:711
msgid "Credit (Transaction)"
msgstr "Alacak (İşlem)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:666
+#: erpnext/accounts/report/general_ledger/general_ledger.py:686
msgid "Credit ({0})"
msgstr "Alacak ({0})"
@@ -13861,14 +13866,14 @@ msgstr "Alacak Dekontu Düzenlendi"
msgid "Credit Note will update it's own outstanding amount, even if 'Return Against' is specified."
msgstr "Alacak Dekontu, \"Karşı İade\" belirtilmiş olsa bile kendi bakiye tutarını güncelleyecektir."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:671
msgid "Credit Note {0} has been created automatically"
msgstr "Alacak Dekontu {0} otomatik olarak kurulmuştur"
#. Label of the credit_to (Link) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:369
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:377
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:371
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:379
#: erpnext/controllers/accounts_controller.py:2282
msgid "Credit To"
msgstr "Bakiye Eklenecek Hesap"
@@ -14067,7 +14072,7 @@ msgstr "Fincan"
#: erpnext/accounts/report/financial_statements.html:29
#: erpnext/accounts/report/financial_statements.py:678
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
-#: erpnext/accounts/report/gross_profit/gross_profit.py:427
+#: erpnext/accounts/report/gross_profit/gross_profit.py:443
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
@@ -14168,7 +14173,7 @@ msgstr "Başka bir para birimi kullanılarak giriş yapıldıktan sonra para bir
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2319
+#: erpnext/accounts/utils.py:2323
msgid "Currency for {0} must be {1}"
msgstr "{0} için para birimi {1} olmalıdır"
@@ -14434,13 +14439,13 @@ msgstr "Özel"
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:286
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:289
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/accounts/doctype/sales_invoice_reference/sales_invoice_reference.json
#: erpnext/accounts/doctype/tax_rule/tax_rule.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:38
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:29
-#: erpnext/accounts/report/gross_profit/gross_profit.py:385
+#: erpnext/accounts/report/gross_profit/gross_profit.py:391
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:37
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:22
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:225
@@ -14503,8 +14508,8 @@ msgstr "Özel"
#: erpnext/setup/doctype/customer_group/customer_group.json
#: erpnext/setup/doctype/territory/territory.json
#: erpnext/setup/workspace/home/home.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:215
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:482
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:218
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:488
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
#: erpnext/stock/doctype/item/item.json
@@ -14518,7 +14523,7 @@ msgstr "Özel"
#: erpnext/stock/report/delayed_item_report/delayed_item_report.py:121
#: erpnext/stock/report/delayed_order_report/delayed_order_report.js:36
#: erpnext/stock/report/delayed_order_report/delayed_order_report.py:46
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:469
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:512
#: erpnext/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14696,7 +14701,7 @@ msgstr "Müşteri Görüşleri"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:185
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:56
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:228
-#: erpnext/accounts/report/gross_profit/gross_profit.py:392
+#: erpnext/accounts/report/gross_profit/gross_profit.py:398
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:212
#: erpnext/accounts/report/sales_register/sales_register.js:27
#: erpnext/accounts/report/sales_register/sales_register.py:202
@@ -14804,6 +14809,7 @@ msgstr "Müşteri Mobil No"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:156
#: 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
+#: erpnext/accounts/report/gross_profit/gross_profit.py:405
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:232
#: erpnext/accounts/report/sales_register/sales_register.py:193
#: erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -14951,7 +14957,7 @@ msgstr "'Müşteri Bazlı İndirim' için müşteri seçilmesi gereklidir"
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1087
#: erpnext/selling/doctype/sales_order/sales_order.py:373
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:418
msgid "Customer {0} does not belong to project {1}"
msgstr "Müşteri {0} {1} projesine ait değil"
@@ -15440,11 +15446,11 @@ msgstr "Sayın Sistem Yöneticisi,"
msgid "Debit"
msgstr "Borç"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:684
+#: erpnext/accounts/report/general_ledger/general_ledger.py:704
msgid "Debit (Transaction)"
msgstr "Borç (İşlem)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:659
+#: erpnext/accounts/report/general_ledger/general_ledger.py:679
msgid "Debit ({0})"
msgstr "Borç ({0})"
@@ -16386,7 +16392,7 @@ msgstr "Teslimat"
#. Label of the delivery_date (Date) field in DocType 'Sales Order'
#. Label of the delivery_date (Date) field in DocType 'Sales Order Item'
#: erpnext/public/js/utils.js:813
-#: erpnext/selling/doctype/sales_order/sales_order.js:1076
+#: erpnext/selling/doctype/sales_order/sales_order.js:1079
#: erpnext/selling/doctype/sales_order/sales_order.json
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:321
@@ -16421,7 +16427,7 @@ msgstr "Sevkiyat Yöneticisi"
#. Label of a Link in the Stock Workspace
#. Label of a shortcut in the Stock Workspace
#: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:306
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:312
#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:36
#: 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
@@ -16528,7 +16534,7 @@ msgstr "Teslimat"
#. Label of the delivery_trip (Link) field in DocType 'Delivery Note'
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:277
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:283
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_trip/delivery_trip.json
#: erpnext/stock/workspace/stock/stock.json
@@ -16718,7 +16724,7 @@ msgstr "Amortisman Kaydı"
msgid "Depreciation Entry Posting Status"
msgstr "Amortisman Girişi Gönderme Durumu"
-#: erpnext/assets/doctype/asset/asset.py:1109
+#: erpnext/assets/doctype/asset/asset.py:1125
msgid "Depreciation Entry against asset {0}"
msgstr ""
@@ -16765,11 +16771,11 @@ msgstr "Amortisman Kayıt Tarihi"
msgid "Depreciation Posting Date cannot be before Available-for-use Date"
msgstr "Amortisman Kayıt Tarihi, Kullanıma Hazır Tarihten önce olamaz"
-#: erpnext/assets/doctype/asset/asset.py:318
+#: erpnext/assets/doctype/asset/asset.py:319
msgid "Depreciation Row {0}: Depreciation Posting Date cannot be before Available-for-use Date"
msgstr "Amortisman Satırı {0}: Amortisman Kayıt Tarihi, Kullanıma Hazır Tarihinden önce olamaz"
-#: erpnext/assets/doctype/asset/asset.py:569
+#: erpnext/assets/doctype/asset/asset.py:585
msgid "Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1}"
msgstr "Amortisman Satırı {0}: Faydalı ömürden sonra beklenen değer {1}'den büyük veya eşit olmalıdır."
@@ -16796,7 +16802,7 @@ msgstr "Amortisman Planı"
msgid "Depreciation Schedule View"
msgstr "Amortisman Planı"
-#: erpnext/assets/doctype/asset/asset.py:412
+#: erpnext/assets/doctype/asset/asset.py:413
msgid "Depreciation cannot be calculated for fully depreciated assets"
msgstr "Tam amortismana tabi varlıklar için amortisman hesaplanamaz"
@@ -16974,7 +16980,7 @@ msgstr ""
#: erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
#: erpnext/accounts/doctype/share_type/share_type.json
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:72
-#: erpnext/accounts/report/gross_profit/gross_profit.py:302
+#: erpnext/accounts/report/gross_profit/gross_profit.py:308
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:175
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:196
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:72
@@ -17267,7 +17273,7 @@ msgstr "Fark Miktarı"
msgid "Difference Value"
msgstr "Fark Değeri"
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:491
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:497
msgid "Different 'Source Warehouse' and 'Target Warehouse' can be set for each row."
msgstr "Her satır için farklı 'Kaynak Depo' ve 'Hedef Depo' ayarlanabilir."
@@ -18037,7 +18043,7 @@ msgstr "Tüm müşterilere e-posta yoluyla bildirim göndermek ister misiniz?"
msgid "Do you want to submit the material request"
msgstr "Malzeme talebini göndermek istiyor musunuz?"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:76
+#: erpnext/manufacturing/doctype/job_card/job_card.js:84
msgid "Do you want to submit the stock entry?"
msgstr ""
@@ -18544,7 +18550,7 @@ msgstr "Müşteri Grubunu Çoğalt"
msgid "Duplicate Entry. Please check Authorization Rule {0}"
msgstr "Çift Giriş. Lütfen Yetkilendirme Kuralını kontrol edin {0}"
-#: erpnext/assets/doctype/asset/asset.py:342
+#: erpnext/assets/doctype/asset/asset.py:343
msgid "Duplicate Finance Book"
msgstr "Finans Defterini Çoğalt"
@@ -18737,7 +18743,7 @@ msgstr "Notu Düzenle"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:495
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:501
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -19175,7 +19181,7 @@ msgstr "Boş"
msgid "Ems(Pica)"
msgstr "Pica Em"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1642
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr "Belirli bir sipariş için envanterden belirli bir miktarı ayırmaya izin verir."
@@ -19412,8 +19418,8 @@ msgstr "Bitiş Tarihi, Başlangıç Tarihi'nden önce olamaz."
#. 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:311
-#: erpnext/manufacturing/doctype/job_card/job_card.js:380
+#: erpnext/manufacturing/doctype/job_card/job_card.js:319
+#: erpnext/manufacturing/doctype/job_card/job_card.js:388
#: 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
@@ -19504,8 +19510,8 @@ msgstr "Seri Numaralarını Girin"
msgid "Enter Supplier"
msgstr "Tedarikçi Girin"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:337
-#: erpnext/manufacturing/doctype/job_card/job_card.js:406
+#: erpnext/manufacturing/doctype/job_card/job_card.js:345
+#: erpnext/manufacturing/doctype/job_card/job_card.js:414
#: erpnext/manufacturing/doctype/workstation/workstation.js:312
msgid "Enter Value"
msgstr "Değer Girin"
@@ -19546,7 +19552,7 @@ msgstr "Müşterinin telefon numarasını girin"
msgid "Enter date to scrap asset"
msgstr "Varlığın hurdaya çıkarılacağı tarihi girin"
-#: erpnext/assets/doctype/asset/asset.py:410
+#: erpnext/assets/doctype/asset/asset.py:411
msgid "Enter depreciation details"
msgstr "Amortisman bilgileri girin"
@@ -19580,7 +19586,7 @@ msgstr "Göndermeden önce bankanın veya kredi veren kurumun adını girin."
msgid "Enter the opening stock units."
msgstr "Açılış stok birimlerini girin."
-#: erpnext/manufacturing/doctype/bom/bom.js:865
+#: erpnext/manufacturing/doctype/bom/bom.js:886
msgid "Enter the quantity of the Item that will be manufactured from this Bill of Materials."
msgstr "Bu Ürün Ağacından üretilecek Ürünün miktarını girin."
@@ -19939,7 +19945,7 @@ msgstr "Döviz Kuru aynı olmalıdır {0} {1} ({2})"
msgid "Excise Entry"
msgstr "Özel Tüketim Vergisi Girişi"
-#: erpnext/stock/doctype/stock_entry/stock_entry.js:1276
+#: erpnext/stock/doctype/stock_entry/stock_entry.js:1282
msgid "Excise Invoice"
msgstr "ÖTV Faturası"
@@ -20111,7 +20117,7 @@ msgstr "Kullanım Ömrü Sonrası Beklenen Değer"
#: erpnext/accounts/doctype/cashier_closing/cashier_closing.json
#: erpnext/accounts/doctype/ledger_merge/ledger_merge.json
#: erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:596
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:598
#: erpnext/accounts/report/account_balance/account_balance.js:28
#: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:89
#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:178
@@ -20179,13 +20185,13 @@ msgstr "Harcama Talebi"
msgid "Expense Head"
msgstr "Gider Kategorisi"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:490
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:514
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:534
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:492
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:516
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:536
msgid "Expense Head Changed"
msgstr "Gider Hesabı Değiştirildi"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:592
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:594
msgid "Expense account is mandatory for item {0}"
msgstr "Gider hesabı {0} kalemi için zorunludur"
@@ -20326,6 +20332,11 @@ msgstr "Çok Büyük"
msgid "Extra Small"
msgstr "Çok Küçük"
+#. Label of the finished_good (Link) field in DocType 'BOM Operation'
+#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
+msgid "FG / Semi FG Item"
+msgstr ""
+
#. Option for the 'Valuation Method' (Select) field in DocType 'Item'
#. Option for the 'Default Valuation Method' (Select) field in DocType 'Stock
#. Settings'
@@ -20534,7 +20545,7 @@ msgstr "Şuna Göre Getir"
msgid "Fetch Customers"
msgstr "Müşterileri Getir"
-#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js:76
+#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js:77
msgid "Fetch Items from Warehouse"
msgstr "Ürünleri Depodan Getir"
@@ -20550,7 +20561,7 @@ msgstr "Gecikmiş Ödemeler"
msgid "Fetch Subscription Updates"
msgstr "Abonelik Güncellemeleri Al"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1017
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1026
msgid "Fetch Timesheet"
msgstr "Zaman Çizelgesinden Getir"
@@ -20942,11 +20953,6 @@ msgstr "Bitmiş Ürün {0} alt yüklenici ürünü olmalıdır."
msgid "Finished Goods"
msgstr "Bitmiş Ürünler"
-#. Label of the finished_good (Link) field in DocType 'BOM Operation'
-#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
-msgid "Finished Goods / Semi Finished Goods Item"
-msgstr "Ürün"
-
#. Label of the fg_based_section_section (Section Break) field in DocType 'BOM'
#: erpnext/manufacturing/doctype/bom/bom.json
msgid "Finished Goods Based Operating Cost"
@@ -20957,11 +20963,6 @@ msgstr "Ürün Bazlı Operasyonel Maliyeti"
msgid "Finished Goods Item"
msgstr "Bitmiş Ürün"
-#. Label of the finished_good_qty (Float) field in DocType 'BOM Operation'
-#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
-msgid "Finished Goods Qty"
-msgstr "Bitmiş Ürün Miktarı"
-
#. Label of the fg_reference_id (Data) field in DocType 'BOM Creator Item'
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
msgid "Finished Goods Reference"
@@ -21125,7 +21126,7 @@ msgstr "Sabit Varlık"
#. Capitalization Asset Item'
#. Label of the fixed_asset_account (Link) field in DocType 'Asset Category
#. Account'
-#: erpnext/assets/doctype/asset/asset.py:751
+#: erpnext/assets/doctype/asset/asset.py:767
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
#: erpnext/assets/doctype/asset_category_account/asset_category_account.json
msgid "Fixed Asset Account"
@@ -21291,7 +21292,7 @@ msgid "For Job Card"
msgstr "İş Kartı İçin"
#. Label of the for_operation (Link) field in DocType 'Job Card'
-#: erpnext/manufacturing/doctype/job_card/job_card.js:450
+#: erpnext/manufacturing/doctype/job_card/job_card.js:458
#: erpnext/manufacturing/doctype/job_card/job_card.json
msgid "For Operation"
msgstr "Operasyon"
@@ -21340,7 +21341,7 @@ msgstr "Tedarikçi"
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:466
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:997
+#: erpnext/selling/doctype/sales_order/sales_order.js:1000
#: erpnext/stock/doctype/material_request/material_request.js:344
#: erpnext/templates/form_grid/material_request_grid.html:36
msgid "For Warehouse"
@@ -21410,7 +21411,7 @@ msgstr "Referans İçin"
msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included"
msgstr "Satır {0} için {1} belgesi. Ürün fiyatına {2} masrafı dahil etmek için, satır {3} de dahil edilmelidir."
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1635
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1652
msgid "For row {0}: Enter Planned Qty"
msgstr "Satır {0}: Planlanan Miktarı Girin"
@@ -21585,7 +21586,7 @@ msgstr "Cuma"
#. Label of the from_uom (Link) field in DocType 'UOM Conversion Factor'
#. Label of the from (Data) field in DocType 'Call Log'
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1020
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1029
#: erpnext/setup/doctype/uom_conversion_factor/uom_conversion_factor.json
#: erpnext/telephony/doctype/call_log/call_log.json
#: erpnext/templates/pages/projects.html:67
@@ -22189,7 +22190,7 @@ msgstr "Genel Muhasebe Bakiyesi"
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:644
+#: erpnext/accounts/report/general_ledger/general_ledger.py:664
msgid "GL Entry"
msgstr "Genel Muhasebe Girişi"
@@ -22455,12 +22456,12 @@ msgid "Get Items"
msgstr "Ürünleri Getir"
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:170
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:192
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:270
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:299
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:330
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1073
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:173
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:198
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:273
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:305
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:339
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1082
#: erpnext/buying/doctype/purchase_order/purchase_order.js:612
#: erpnext/buying/doctype/purchase_order/purchase_order.js:632
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:366
@@ -22476,13 +22477,13 @@ msgstr "Ürünleri Getir"
#: erpnext/public/js/controllers/buying.js:296
#: erpnext/selling/doctype/quotation/quotation.js:167
#: erpnext/selling/doctype/sales_order/sales_order.js:174
-#: erpnext/selling/doctype/sales_order/sales_order.js:798
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:187
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:236
+#: erpnext/selling/doctype/sales_order/sales_order.js:801
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:190
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:242
#: erpnext/stock/doctype/material_request/material_request.js:126
#: erpnext/stock/doctype/material_request/material_request.js:221
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:156
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:270
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:160
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:277
#: erpnext/stock/doctype/stock_entry/stock_entry.js:319
#: erpnext/stock/doctype/stock_entry/stock_entry.js:366
#: erpnext/stock/doctype/stock_entry/stock_entry.js:395
@@ -22610,7 +22611,7 @@ msgstr "Tedarikçileri Getir"
msgid "Get Suppliers By"
msgstr "Kriter Seçimi"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1069
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1078
msgid "Get Timesheets"
msgstr "Zaman Çizelgesini Getir"
@@ -22928,7 +22929,7 @@ msgstr "Brüt Kar Marjı %"
#. Label of the gross_profit (Currency) field in DocType 'Quotation Item'
#. Label of the gross_profit (Currency) field in DocType 'Sales Order Item'
#: erpnext/accounts/report/gross_profit/gross_profit.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:344
+#: erpnext/accounts/report/gross_profit/gross_profit.py:350
#: erpnext/accounts/workspace/financial_reports/financial_reports.json
#: erpnext/selling/doctype/quotation_item/quotation_item.json
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -22939,7 +22940,7 @@ msgstr "Brüt Kâr"
msgid "Gross Profit / Loss"
msgstr "Brüt Kâr / Zarar"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:351
+#: erpnext/accounts/report/gross_profit/gross_profit.py:357
msgid "Gross Profit Percent"
msgstr "Brüt Kâr Yüzdesi"
@@ -22951,11 +22952,11 @@ msgstr "Brüt Kâr Yüzdesi"
msgid "Gross Purchase Amount"
msgstr "Brüt Alış Tutarı"
-#: erpnext/assets/doctype/asset/asset.py:380
+#: erpnext/assets/doctype/asset/asset.py:381
msgid "Gross Purchase Amount is mandatory"
msgstr "Brüt Alış Tutarı zorunludur"
-#: erpnext/assets/doctype/asset/asset.py:425
+#: erpnext/assets/doctype/asset/asset.py:441
msgid "Gross Purchase Amount should be equal to purchase amount of one single Asset."
msgstr "Brüt Satın Alma Tutarı, tek bir Varlığın satın alma tutarına eşit olmalıdır."
@@ -23999,11 +24000,11 @@ msgstr "Bu Ürünün stokunu Envanterinizde tutuyorsanız, ERPNext bu ürünün
msgid "If you need to reconcile particular transactions against each other, then please select accordingly. If not, all the transactions will be allocated in FIFO order."
msgstr "Belirli işlemleri birbiriyle mutabık hale getirmeniz gerekiyorsa, lütfen buna göre seçin. Aksi takdirde, tüm işlemler FIFO sırasına göre tahsis edilecektir."
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1036
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1051
msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox."
msgstr "Yine de devam etmek istiyorsanız, lütfen 'Mevcut Alt Montaj Öğelerini Atla' onay kutusunu devre dışı bırakın."
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1748
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1765
msgid "If you still want to proceed, please enable {0}."
msgstr "Hala devam etmek istiyorsanız lütfen {0} ayarını etkinleştirin."
@@ -24077,11 +24078,11 @@ msgstr "Boş Stoku Yoksay"
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:980
+#: erpnext/selling/doctype/sales_order/sales_order.js:983
msgid "Ignore Existing Ordered Qty"
msgstr "Mevcut Sipariş Miktarını Yoksay"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1740
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1757
msgid "Ignore Existing Projected Quantity"
msgstr "Mevcut Öngörülen Miktarı Yoksay"
@@ -24726,7 +24727,7 @@ msgstr "Süresi Dolmuş Partileri Dahil Et"
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:976
+#: erpnext/selling/doctype/sales_order/sales_order.js:979
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -24925,7 +24926,7 @@ msgstr "Yeniden Sipariş İçin Depoda Yanlış Giriş (grup)"
msgid "Incorrect Component Quantity"
msgstr "Yanlış Bileşen Miktarı"
-#: erpnext/assets/doctype/asset/asset.py:321
+#: erpnext/assets/doctype/asset/asset.py:322
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py:56
msgid "Incorrect Date"
msgstr "Yanlış Tarih"
@@ -25171,7 +25172,7 @@ msgstr "Kurulum Tarihi"
#. 'Installation Note'
#. Label of a Link in the Stock Workspace
#: erpnext/selling/doctype/installation_note/installation_note.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:257
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:263
#: erpnext/stock/workspace/stock/stock.json
msgid "Installation Note"
msgstr "Kurulum Notu"
@@ -25181,7 +25182,7 @@ msgstr "Kurulum Notu"
msgid "Installation Note Item"
msgstr "Kurulum Notu Kalemi"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:625
msgid "Installation Note {0} has already been submitted"
msgstr "Kurulum Notu {0} zaten gönderilmiş."
@@ -25239,7 +25240,7 @@ msgstr "Yetersiz Yetki"
#: erpnext/stock/doctype/pick_list/pick_list.py:132
#: erpnext/stock/doctype/pick_list/pick_list.py:1003
#: erpnext/stock/doctype/stock_entry/stock_entry.py:788
-#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1103 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr "Yetersiz Stok"
@@ -25333,6 +25334,10 @@ msgstr "Şirket içi Yevmiye Kaydı Referansı"
msgid "Inter Company Order Reference"
msgstr "Şirketler arası Sipariş Referansı"
+#: erpnext/selling/doctype/sales_order/sales_order.js:742
+msgid "Inter Company Purchase Order"
+msgstr ""
+
#. Label of the inter_company_reference (Link) field in DocType 'Delivery Note'
#. Label of the inter_company_reference (Link) field in DocType 'Purchase
#. Receipt'
@@ -25341,6 +25346,10 @@ msgstr "Şirketler arası Sipariş Referansı"
msgid "Inter Company Reference"
msgstr "Şirketler Arası Referans"
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:485
+msgid "Inter Company Sales Order"
+msgstr ""
+
#. Label of the inter_transfer_reference_section (Section Break) field in
#. DocType 'Sales Order Item'
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -25382,10 +25391,18 @@ msgstr "İç Müşteri"
msgid "Internal Customer for company {0} already exists"
msgstr "Şirket için İç Müşteri {0} zaten mevcut"
+#: erpnext/selling/doctype/sales_order/sales_order.js:741
+msgid "Internal Purchase Order"
+msgstr ""
+
#: erpnext/controllers/accounts_controller.py:731
msgid "Internal Sale or Delivery Reference missing."
msgstr "Dahili Satış veya Teslimat Referansı eksik."
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:484
+msgid "Internal Sales Order"
+msgstr ""
+
#: erpnext/controllers/accounts_controller.py:733
msgid "Internal Sales Reference Missing"
msgstr "Dahili Satış Referansı Eksik"
@@ -25454,8 +25471,8 @@ msgstr "Tanıtım"
msgid "Invalid"
msgstr "Geçersiz"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:370
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:378
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:372
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:380
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:961
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:971
#: erpnext/assets/doctype/asset_category/asset_category.py:69
@@ -25498,8 +25515,8 @@ msgstr "Geçersiz Alt Prosedür"
msgid "Invalid Company for Inter Company Transaction."
msgstr "Şirketler Arası İşlem için Geçersiz Şirket."
-#: erpnext/assets/doctype/asset/asset.py:292
-#: erpnext/assets/doctype/asset/asset.py:299
+#: erpnext/assets/doctype/asset/asset.py:293
+#: erpnext/assets/doctype/asset/asset.py:300
#: erpnext/controllers/accounts_controller.py:3037
msgid "Invalid Cost Center"
msgstr "Geçersiz Maliyet Merkezi"
@@ -25529,7 +25546,7 @@ msgstr "Geçersiz Belge Türü"
msgid "Invalid Formula"
msgstr "Geçersiz Formül"
-#: erpnext/assets/doctype/asset/asset.py:430
+#: erpnext/assets/doctype/asset/asset.py:446
msgid "Invalid Gross Purchase Amount"
msgstr "Geçersiz Brüt Alış Tutarı"
@@ -25537,7 +25554,7 @@ msgstr "Geçersiz Brüt Alış Tutarı"
msgid "Invalid Group By"
msgstr "Geçersiz Gruplama Ölçütü"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:453
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:454
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:914
msgid "Invalid Item"
msgstr "Geçersiz Öğe"
@@ -25580,7 +25597,7 @@ msgstr "Geçersiz Birincil Rol"
msgid "Invalid Priority"
msgstr "Geçersiz Öncelik"
-#: erpnext/manufacturing/doctype/bom/bom.py:1093
+#: erpnext/manufacturing/doctype/bom/bom.py:1130
msgid "Invalid Process Loss Configuration"
msgstr "Geçersiz Proses Kaybı Yapılandırması"
@@ -25608,8 +25625,8 @@ msgstr "Geçersiz İade"
msgid "Invalid Sales Invoices"
msgstr "Geçersiz Satış Faturaları"
-#: erpnext/assets/doctype/asset/asset.py:515
-#: erpnext/assets/doctype/asset/asset.py:534
+#: erpnext/assets/doctype/asset/asset.py:531
+#: erpnext/assets/doctype/asset/asset.py:550
msgid "Invalid Schedule"
msgstr "Geçersiz Program"
@@ -25642,7 +25659,7 @@ msgstr "Hesap {} için {} {} muhasebe girişlerinde geçersiz tutar: {}"
msgid "Invalid condition expression"
msgstr "Geçersiz koşul ifadesi"
-#: erpnext/selling/doctype/quotation/quotation.py:270
+#: erpnext/selling/doctype/quotation/quotation.py:272
msgid "Invalid lost reason {0}, please create a new lost reason"
msgstr "Geçersiz kayıp nedeni {0}, lütfen yeni bir kayıp nedeni oluşturun"
@@ -25788,7 +25805,7 @@ msgstr "Fatura Limiti"
msgid "Invoice Number"
msgstr "Fatura Numarası"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:812
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:813
msgid "Invoice Paid"
msgstr "Fatura Ödendi"
@@ -26382,6 +26399,14 @@ msgstr "Standart"
msgid "Is Stock Item"
msgstr "Stok Ürünü"
+#. Label of the is_sub_assembly_item (Check) field in DocType 'BOM Explosion
+#. Item'
+#. Label of the is_sub_assembly_item (Check) field in DocType 'BOM Item'
+#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
+#: erpnext/manufacturing/doctype/bom_item/bom_item.json
+msgid "Is Sub Assembly Item"
+msgstr ""
+
#. Label of the is_subcontracted (Check) field in DocType 'Purchase Invoice'
#. Label of the is_subcontracted (Check) field in DocType 'Purchase Order'
#. Label of the is_subcontracted (Check) field in DocType 'Supplier Quotation'
@@ -26608,7 +26633,7 @@ msgstr "Toplam tutar sıfır olduğunda ücretleri eşit olarak dağıtmak mümk
#: erpnext/buying/workspace/buying/buying.json
#: erpnext/controllers/taxes_and_totals.py:1123
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.json
-#: erpnext/manufacturing/doctype/bom/bom.js:944
+#: erpnext/manufacturing/doctype/bom/bom.js:979
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109
#: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:25
@@ -26629,7 +26654,7 @@ msgstr "Toplam tutar sıfır olduğunda ücretleri eşit olarak dağıtmak mümk
#: erpnext/public/js/stock_analytics.js:92
#: erpnext/selling/doctype/party_specific_item/party_specific_item.json
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1203
+#: erpnext/selling/doctype/sales_order/sales_order.js:1206
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:46
#: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.js:14
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.js:36
@@ -26832,10 +26857,10 @@ msgstr "Ürün Sepeti"
#: erpnext/accounts/doctype/pricing_rule_item_code/pricing_rule_item_code.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1026
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1035
#: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:68
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:37
-#: erpnext/accounts/report/gross_profit/gross_profit.py:281
+#: erpnext/accounts/report/gross_profit/gross_profit.py:287
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:150
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:171
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:37
@@ -26892,8 +26917,8 @@ msgstr "Ürün Sepeti"
#: erpnext/selling/doctype/quotation_item/quotation_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:345
#: erpnext/selling/doctype/sales_order/sales_order.js:453
-#: erpnext/selling/doctype/sales_order/sales_order.js:839
-#: erpnext/selling/doctype/sales_order/sales_order.js:990
+#: erpnext/selling/doctype/sales_order/sales_order.js:842
+#: erpnext/selling/doctype/sales_order/sales_order.js:993
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py:29
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:27
@@ -26936,7 +26961,7 @@ msgstr "Ürün Sepeti"
#: erpnext/stock/report/item_price_stock/item_price_stock.py:18
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:125
#: 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:396
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:419
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:7
#: erpnext/stock/report/stock_ageing/stock_ageing.py:130
#: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:104
@@ -26963,7 +26988,7 @@ msgstr ""
msgid "Item Code cannot be changed for Serial No."
msgstr "Seri No için Ürün Kodu değiştirilemez."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:445
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:447
msgid "Item Code required at Row No {0}"
msgstr "{0} Numaralı satırda Ürün Kodu gereklidir"
@@ -27068,7 +27093,7 @@ msgstr "Ürün Detayları"
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/doctype/tax_rule/tax_rule.json
#: erpnext/accounts/report/gross_profit/gross_profit.js:44
-#: erpnext/accounts/report/gross_profit/gross_profit.py:294
+#: erpnext/accounts/report/gross_profit/gross_profit.py:300
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js:21
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:28
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:28
@@ -27280,7 +27305,7 @@ msgstr "Üretici Firma"
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:74
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:71
-#: erpnext/accounts/report/gross_profit/gross_profit.py:288
+#: erpnext/accounts/report/gross_profit/gross_profit.py:294
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:33
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:156
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:177
@@ -27329,7 +27354,7 @@ msgstr "Üretici Firma"
#: erpnext/public/js/controllers/transaction.js:2414
#: erpnext/public/js/utils.js:756
#: erpnext/selling/doctype/quotation_item/quotation_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:845
+#: erpnext/selling/doctype/sales_order/sales_order.js:848
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py:35
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:33
@@ -27363,7 +27388,7 @@ msgstr "Üretici Firma"
#: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143
#: 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:131
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:403
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:426
#: erpnext/stock/report/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -27412,7 +27437,7 @@ msgstr "Ürün Fiyat Ayarları"
msgid "Item Price Stock"
msgstr "Ürün Stok Fiyatı"
-#: erpnext/stock/get_item_details.py:1063
+#: erpnext/stock/get_item_details.py:1058
msgid "Item Price added for {0} in Price List {1}"
msgstr "{0} Ürün Fiyatı {1} Fiyat Listesinde Güncellendi"
@@ -27420,7 +27445,7 @@ msgstr "{0} Ürün Fiyatı {1} Fiyat Listesinde Güncellendi"
msgid "Item Price appears multiple times based on Price List, Supplier/Customer, Currency, Item, Batch, UOM, Qty, and Dates."
msgstr "Ürün Fiyatı, Fiyat Listesi, Tedarikçi/Müşteri, Para Birimi, Ürün, Parti, Birim, Miktar ve Tarihlere göre birden fazla kez görünür."
-#: erpnext/stock/get_item_details.py:1042
+#: erpnext/stock/get_item_details.py:1037
msgid "Item Price updated for {0} in Price List {1}"
msgstr "Ürün Fiyatı {0} için Fiyat Listesinde {1} güncellendi"
@@ -27568,8 +27593,8 @@ msgstr "Üretilecek Ürün"
msgid "Item UOM"
msgstr "Ürün Ölçü Birimi"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:409
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:416
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:410
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:417
msgid "Item Unavailable"
msgstr "Ürün Mevcut Değil"
@@ -27685,7 +27710,7 @@ msgid "Item must be added using 'Get Items from Purchase Receipts' button"
msgstr "Ürün, 'Satın Alma İrsaliyelerinden Ürünleri Getir' butonu kullanılarak eklenmelidir"
#: erpnext/buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:42
-#: erpnext/selling/doctype/sales_order/sales_order.js:1210
+#: erpnext/selling/doctype/sales_order/sales_order.js:1213
msgid "Item name"
msgstr "Ürün Adı"
@@ -27732,7 +27757,7 @@ msgstr "{0} Ürünü kendisine bir alt montaj olarak eklenemez"
msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}."
msgstr "Ürün {0}, Toplu Sipariş {2} kapsamında {1} miktarından daha fazla sipariş edilemez."
-#: erpnext/assets/doctype/asset/asset.py:274
+#: erpnext/assets/doctype/asset/asset.py:275
#: erpnext/stock/doctype/item/item.py:634
msgid "Item {0} does not exist"
msgstr "{0} ürünü mevcut değil"
@@ -27753,7 +27778,7 @@ msgstr "{0} ürünü birden fazla kez girildi."
msgid "Item {0} has already been returned"
msgstr "Ürün {0} zaten iade edilmiş"
-#: erpnext/assets/doctype/asset/asset.py:276
+#: erpnext/assets/doctype/asset/asset.py:277
msgid "Item {0} has been disabled"
msgstr "Ürün {0} Devre dışı bırakılmış"
@@ -27769,7 +27794,7 @@ msgstr "Ürün {0} {1} tarihinde kullanım süresinin sonuna gelmiştir."
msgid "Item {0} ignored since it is not a stock item"
msgstr "{0} Stok Kalemi olmadığından, ürün yok sayılır"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:565
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:567
msgid "Item {0} is already reserved/delivered against Sales Order {1}."
msgstr "Ürün {0} zaten {1} Satış Siparişi karşılığında rezerve edilmiş/teslim edilmiştir."
@@ -27797,7 +27822,7 @@ msgstr "{0} Ürünü Alt Yüklenici Kalemi olmalıdır"
msgid "Item {0} is not active or end of life has been reached"
msgstr "Ürün {0} aktif değil veya kullanım süresinin sonuna gelindi"
-#: erpnext/assets/doctype/asset/asset.py:278
+#: erpnext/assets/doctype/asset/asset.py:279
msgid "Item {0} must be a Fixed Asset Item"
msgstr "Öğe {0} Sabit Varlık Öğesi olmalı"
@@ -27809,7 +27834,7 @@ msgstr "Ürün {0} Stokta Olmayan Ürün olmalıdır"
msgid "Item {0} must be a Sub-contracted Item"
msgstr "{0} Ürünü Alt Yüklenici Kalemi olmalıdır"
-#: erpnext/assets/doctype/asset/asset.py:280
+#: erpnext/assets/doctype/asset/asset.py:281
msgid "Item {0} must be a non-stock item"
msgstr "{0} kalemi stok dışı bir ürün olmalıdır"
@@ -27866,7 +27891,7 @@ msgstr "Ürün Bazında Satış Geçmişi"
msgid "Item-wise Sales Register"
msgstr "Ürün Bazında Satış Kaydı"
-#: erpnext/stock/get_item_details.py:703
+#: erpnext/stock/get_item_details.py:698
msgid "Item/Item Code required to get Item Tax Template."
msgstr ""
@@ -27924,11 +27949,11 @@ msgstr "{0} Ürünü sistemde mevcut değil"
#: erpnext/selling/doctype/installation_note/installation_note.json
#: erpnext/selling/doctype/product_bundle/product_bundle.json
#: erpnext/selling/doctype/quotation/quotation.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:831
+#: erpnext/selling/doctype/sales_order/sales_order.js:834
#: erpnext/selling/doctype/sales_order/sales_order.json
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:19
#: erpnext/setup/doctype/item_group/item_group.js:87
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:487
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:493
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/material_request/material_request.json
#: erpnext/stock/doctype/packing_slip/packing_slip.json
@@ -27958,8 +27983,8 @@ msgstr "Ürün Kataloğu"
msgid "Items Filter"
msgstr "Ürünler Filtresi"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1601
-#: erpnext/selling/doctype/sales_order/sales_order.js:1246
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1618
+#: erpnext/selling/doctype/sales_order/sales_order.js:1250
msgid "Items Required"
msgstr "Ürünler Gereklidir"
@@ -27979,7 +28004,7 @@ msgstr "Ürünler ve Fiyatlar"
msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}."
msgstr "Alt Yüklenici Siparişi {0} Satın Alma Siparişine karşı oluşturulduğu için kalemler güncellenemez."
-#: erpnext/selling/doctype/sales_order/sales_order.js:1026
+#: erpnext/selling/doctype/sales_order/sales_order.js:1029
msgid "Items for Raw Material Request"
msgstr "Hammadde Talebi için Ürünler"
@@ -27993,7 +28018,7 @@ msgstr "Aşağıdaki kalemler için Sıfır Değerleme Oranına İzin Ver işare
msgid "Items to Be Repost"
msgstr "Tekrar Gönderilecek Öğeler"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1600
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1617
msgid "Items to Manufacture are required to pull the Raw Materials associated with it."
msgstr "Üretilecek Ürünlerin, ilgili Hammaddeleri çekmesi gerekmektedir."
@@ -28490,7 +28515,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:685
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:104
#: erpnext/stock/workspace/stock/stock.json
@@ -28602,6 +28627,35 @@ msgstr "Son Sipariş Tarihi"
msgid "Last Purchase Rate"
msgstr "Son Alış Fiyatı"
+#. Label of the last_scanned_warehouse (Data) field in DocType 'POS Invoice'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Purchase
+#. Invoice'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Sales Invoice'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Purchase Order'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Quotation'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Sales Order'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Delivery Note'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Material
+#. Request'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Purchase
+#. Receipt'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Stock Entry'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Stock
+#. Reconciliation'
+#: 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/buying/doctype/purchase_order/purchase_order.json
+#: erpnext/selling/doctype/quotation/quotation.json
+#: erpnext/selling/doctype/sales_order/sales_order.json
+#: erpnext/stock/doctype/delivery_note/delivery_note.json
+#: erpnext/stock/doctype/material_request/material_request.json
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+#: erpnext/stock/doctype/stock_entry/stock_entry.json
+#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
+msgid "Last Scanned Warehouse"
+msgstr ""
+
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:328
msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}."
msgstr "{1} deposundaki {0} adlı ürün için son Stok İşlemi {2} tarihinde gerçekleşti."
@@ -29405,7 +29459,7 @@ msgstr "Sadakat Puanları: {0}"
#: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.json
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1121
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1130
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/selling/doctype/customer/customer.json
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:952
@@ -29728,7 +29782,7 @@ msgstr "Bölüm"
#. Label of the make (Data) field in DocType 'Vehicle'
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:109
-#: erpnext/manufacturing/doctype/job_card/job_card.js:471
+#: erpnext/manufacturing/doctype/job_card/job_card.js:479
#: erpnext/setup/doctype/vehicle/vehicle.json
msgid "Make"
msgstr "Oluştur"
@@ -29762,7 +29816,7 @@ msgstr "Satın Alma Faturası Kesin"
msgid "Make Quotation"
msgstr "Teklif Oluştur"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:356
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:363
msgid "Make Return Entry"
msgstr "İade Girişi Yapın"
@@ -29777,12 +29831,12 @@ msgstr "Satış Faturası Oluşturma"
msgid "Make Serial No / Batch from Work Order"
msgstr "İş Emrinden Seri No / Parti Oluştur"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:74
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:282
+#: erpnext/manufacturing/doctype/job_card/job_card.js:82
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:289
msgid "Make Stock Entry"
msgstr "Stok Girişi Oluştur"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:345
+#: erpnext/manufacturing/doctype/job_card/job_card.js:353
msgid "Make Subcontracting PO"
msgstr "Alt Yüklenici Siparişi Oluştur"
@@ -29852,18 +29906,18 @@ msgstr "Genel Müdür"
#: erpnext/accounts/doctype/pos_field/pos_field.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:147
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:76
-#: erpnext/manufacturing/doctype/bom/bom.js:85
-#: erpnext/manufacturing/doctype/bom/bom.js:603
+#: erpnext/manufacturing/doctype/bom/bom.js:87
+#: erpnext/manufacturing/doctype/bom/bom.js:624
#: erpnext/manufacturing/doctype/bom/bom.py:261
#: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py:71
#: erpnext/public/js/controllers/accounts.js:249
#: erpnext/public/js/controllers/transaction.js:2812
#: erpnext/public/js/utils/party.js:321
#: erpnext/stock/doctype/delivery_note/delivery_note.js:164
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:203
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:206
#: erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:138
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:250
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:254
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:101
msgid "Mandatory"
msgstr "Zorunlu"
@@ -29894,15 +29948,15 @@ msgstr "Bilanço için Zorunlu"
msgid "Mandatory For Profit and Loss Account"
msgstr "Kar ve Zarar Hesabı için Zorunlu"
-#: erpnext/selling/doctype/quotation/quotation.py:588
+#: erpnext/selling/doctype/quotation/quotation.py:610
msgid "Mandatory Missing"
msgstr "Zorunlu Ayarı Eksik"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:628
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:630
msgid "Mandatory Purchase Order"
msgstr "Zorunlu Satın Alma Siparişi"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:649
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:651
msgid "Mandatory Purchase Receipt"
msgstr "Alış İrsaliyesi Zorunludur"
@@ -30167,7 +30221,7 @@ msgstr "Üretim Türü"
msgid "Manufacturing User"
msgstr "Üretim Kullanıcısı"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:179
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:183
msgid "Mapping Purchase Receipt ..."
msgstr "Alış İrsaliyeleri Eşleşiyor..."
@@ -30403,7 +30457,7 @@ msgstr "Stok Girişi"
#: 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:133
+#: erpnext/manufacturing/doctype/job_card/job_card.js:141
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:155
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
#: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
@@ -30499,7 +30553,7 @@ msgstr "Malzeme Talebi Planı Ürünü"
msgid "Material Request Type"
msgstr "Malzeme Talep Türü"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1704
+#: erpnext/selling/doctype/sales_order/sales_order.py:1720
msgid "Material Request not created, as quantity for Raw Materials already available."
msgstr "Hammaddeler için miktar zaten mevcut olduğundan Malzeme Talebi oluşturulmadı."
@@ -30517,7 +30571,7 @@ msgstr "Bu stok hareketini yapmak için kullanılan Malzeme Talebi"
msgid "Material Request {0} is cancelled or stopped"
msgstr "Malzeme Talebi {0} iptal edilmiş veya durdurulmuştur"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1042
+#: erpnext/selling/doctype/sales_order/sales_order.js:1045
msgid "Material Request {0} submitted."
msgstr "{0} Malzeme Talebi gönderildi."
@@ -30554,7 +30608,7 @@ msgstr "Devam Eden İşlerden Geri Dönen Malzemeler"
#. 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:147
+#: erpnext/manufacturing/doctype/job_card/job_card.js:155
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:90
#: erpnext/stock/doctype/item/item.json
@@ -30725,7 +30779,7 @@ msgstr "Maksimum Değer"
msgid "Maximum discount for Item {0} is {1}%"
msgstr "{0} Kalemi için maksimum indirim %{1} kadardır"
-#: erpnext/public/js/utils/barcode_scanner.js:99
+#: erpnext/public/js/utils/barcode_scanner.js:125
msgid "Maximum quantity scanned for item {0}."
msgstr "{0} Ürünü için taranan maksimum miktar."
@@ -31196,7 +31250,7 @@ msgstr "Eksik"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:87
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:184
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:588
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:590
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2249
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
#: erpnext/assets/doctype/asset_category/asset_category.py:116
@@ -31208,7 +31262,7 @@ msgid "Missing Asset"
msgstr "Kayıp Varlık"
#: erpnext/accounts/doctype/gl_entry/gl_entry.py:178
-#: erpnext/assets/doctype/asset/asset.py:308
+#: erpnext/assets/doctype/asset/asset.py:309
msgid "Missing Cost Center"
msgstr "Maliyet Merkezi Eksik"
@@ -31216,11 +31270,11 @@ msgstr "Maliyet Merkezi Eksik"
msgid "Missing Default in Company"
msgstr "Şirkette Eksik Varsayılan"
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:44
msgid "Missing Filters"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:350
+#: erpnext/assets/doctype/asset/asset.py:351
msgid "Missing Finance Book"
msgstr "Kayıp Finans Kitabı"
@@ -31252,7 +31306,7 @@ msgstr "Gerekli Eksik Değerler"
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr "Sevkiyat için e-posta şablonu eksik. Lütfen Teslimat Ayarlarında bir tane belirleyin."
-#: erpnext/manufacturing/doctype/bom/bom.py:1052
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr "Eksik Değer"
@@ -31490,7 +31544,7 @@ msgstr "Fatura Kesim Ayından Sonraki Ay"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:62
#: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:75
-#: erpnext/accounts/report/gross_profit/gross_profit.py:406
+#: erpnext/accounts/report/gross_profit/gross_profit.py:418
#: erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json
#: erpnext/buying/report/purchase_analytics/purchase_analytics.js:61
#: erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
@@ -31918,7 +31972,7 @@ msgstr "Doğal gaz"
msgid "Needs Analysis"
msgstr "İhtiyaç Analizi"
-#: erpnext/stock/serial_batch_bundle.py:1381
+#: erpnext/stock/serial_batch_bundle.py:1397
msgid "Negative Batch Quantity"
msgstr "Negatif Parti Miktarı"
@@ -32359,7 +32413,7 @@ msgstr "Yeni Seri No'nun Deposu olamaz. Depo, Stok Hareketi veya Alış İrsaliy
msgid "New Task"
msgstr "Yeni Görev"
-#: erpnext/manufacturing/doctype/bom/bom.js:156
+#: erpnext/manufacturing/doctype/bom/bom.js:177
msgid "New Version"
msgstr "Yeni Versiyon"
@@ -32386,7 +32440,7 @@ msgstr "Yeni mali yıl oluşturuldu: - "
msgid "New invoices will be generated as per schedule even if current invoices are unpaid or past due date"
msgstr "Mevcut faturalar ödenmemiş veya vadesi geçmiş olsa bile, plana göre yeni faturalar oluşturulacaktır."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:258
msgid "New release date should be in the future"
msgstr "Yeni çıkış tarihi gelecek tarihli olmalı"
@@ -32468,8 +32522,8 @@ msgstr "Sıradaki E-Posta Gönderimi"
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:625
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:646
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:627
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:648
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/buying/doctype/buying_settings/buying_settings.json
#: erpnext/projects/doctype/project/project.json
@@ -32528,11 +32582,11 @@ msgstr "{0} Seri Numaralı Ürün Bulunamadı"
msgid "No Items selected for transfer."
msgstr "Transfer için hiçbir Ürün seçilmedi."
-#: erpnext/selling/doctype/sales_order/sales_order.js:824
+#: erpnext/selling/doctype/sales_order/sales_order.js:827
msgid "No Items with Bill of Materials to Manufacture"
msgstr "Ürün Ağacında Üretimi Yapılacak Ürün Yok"
-#: erpnext/selling/doctype/sales_order/sales_order.js:962
+#: erpnext/selling/doctype/sales_order/sales_order.js:965
msgid "No Items with Bill of Materials."
msgstr "Ürün Bulunmayan Ürün Ağaçları."
@@ -32548,7 +32602,7 @@ msgstr "Not Yok"
msgid "No Outstanding Invoices found for this party"
msgstr "Bu Cari için Ödenmemiş Fatura bulunamadı"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:623
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:624
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr "POS Profili bulunamadı. Lütfen önce Yeni bir POS Profili oluşturun"
@@ -32568,7 +32622,7 @@ msgstr "Hiçbir Satın Alma Siparişi oluşturulmadı"
msgid "No Records for these settings."
msgstr "Bu ayarlar için Kayıt Yok."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:334
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:336
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1049
msgid "No Remarks"
msgstr "Açıklama Yok"
@@ -32597,7 +32651,7 @@ msgstr "{0} şirketini temsil eden Şirketler Arası İşlemler için Tedarikçi
msgid "No Tax Withholding data found for the current posting date."
msgstr "Geçerli kayıt tarihi için Vergi Stopajı verisi bulunamadı."
-#: erpnext/accounts/report/gross_profit/gross_profit.py:857
+#: erpnext/accounts/report/gross_profit/gross_profit.py:874
msgid "No Terms"
msgstr "Şart Yok"
@@ -32613,7 +32667,7 @@ msgstr "Bu Cari için Uzlaşılmamış Ödeme bulunamadı"
msgid "No Work Orders were created"
msgstr "Hiçbir İş Emri oluşturulmadı"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:803
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:805
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:742
msgid "No accounting entries for the following warehouses"
msgstr "Aşağıdaki depolar için muhasebe kaydı yok"
@@ -32860,7 +32914,7 @@ msgstr "Amortismana Tabi Olmayan Kategori"
msgid "Non Profit"
msgstr "Kâr Amacı Gütmeyen"
-#: erpnext/manufacturing/doctype/bom/bom.py:1420
+#: erpnext/manufacturing/doctype/bom/bom.py:1457
msgid "Non stock items"
msgstr "Stok dışı ürünler"
@@ -32879,19 +32933,19 @@ msgid "None of the items have any change in quantity or value."
msgstr "Ürünlerin hiçbirinde miktar veya değer değişikliği yoktur."
#. Name of a UOM
-#: erpnext/setup/setup_wizard/data/uom_data.json erpnext/stock/utils.py:681
-#: erpnext/stock/utils.py:683
+#: erpnext/setup/setup_wizard/data/uom_data.json erpnext/stock/utils.py:703
+#: erpnext/stock/utils.py:705
msgid "Nos"
msgstr "Nos"
#: erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py:66
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:270
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:271
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:556
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:568
#: erpnext/assets/doctype/asset/asset.js:618
#: erpnext/assets/doctype/asset/asset.js:633
#: erpnext/controllers/buying_controller.py:269
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:72
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:73
#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:80
msgid "Not Allowed"
msgstr "İzin Verilmiyor"
@@ -32926,7 +32980,7 @@ msgstr "Teslim Edilmedi"
msgid "Not Initiated"
msgstr "Başlatılmadı"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:812
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:823
#: erpnext/templates/pages/material_request_info.py:21
#: erpnext/templates/pages/order.py:37 erpnext/templates/pages/rfq.py:46
msgid "Not Permitted"
@@ -33000,7 +33054,7 @@ msgstr "Stokta Yok"
#: erpnext/manufacturing/doctype/work_order/work_order.py:2041
#: erpnext/manufacturing/doctype/work_order/work_order.py:2110
#: erpnext/selling/doctype/sales_order/sales_order.py:826
-#: erpnext/selling/doctype/sales_order/sales_order.py:1685
+#: erpnext/selling/doctype/sales_order/sales_order.py:1701
msgid "Not permitted"
msgstr "İzin Verilmedi"
@@ -33010,12 +33064,12 @@ msgstr "İzin Verilmedi"
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:288
#: erpnext/crm/doctype/crm_note/crm_note.json
#: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py:100
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1040
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1750
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1055
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1767
#: erpnext/projects/doctype/timesheet/timesheet.json
#: erpnext/public/js/controllers/buying.js:477
#: erpnext/selling/doctype/customer/customer.py:129
-#: erpnext/selling/doctype/sales_order/sales_order.js:1180
+#: erpnext/selling/doctype/sales_order/sales_order.js:1183
#: erpnext/stock/doctype/item/item.js:526
#: erpnext/stock/doctype/item/item.py:571
#: erpnext/stock/doctype/item_price/item_price.json
@@ -33692,7 +33746,7 @@ msgstr "İş Emirlerini Aç"
msgid "Open a new ticket"
msgstr "Yeni bir destek talebi oluştur"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:377
+#: erpnext/accounts/report/general_ledger/general_ledger.py:397
#: erpnext/public/js/stock_analytics.js:97
msgid "Opening"
msgstr "Açılış"
@@ -33789,7 +33843,7 @@ msgstr "Açılış Fatura Oluşturma Aracı Kalemi"
msgid "Opening Invoice Item"
msgstr "Açılış Faturası Ürünü"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1628
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1836
msgid "Opening Invoice has rounding adjustment of {0}.
'{1}' account is required to post these values. Please set it in Company: {2}.
Or, '{3}' can be enabled to not post any rounding adjustment."
msgstr "Açılış Faturası {0} yuvarlama ayarına sahiptir.
'{1}' hesabının bu değerleri göndermesi gerekir. Lütfen Şirket'te bu hesabı ayarlayın: {2}.
Veya, herhangi bir yuvarlama ayarı göndermemek için '{3}' seçeneğini aktifleştirin."
@@ -33864,7 +33918,7 @@ msgstr "Operasyon Maliyeti (Şirket Para Birimi)"
msgid "Operating Cost Per BOM Quantity"
msgstr "Ürün Ağacındaki Miktara Göre Operasyon Maliyeti"
-#: erpnext/manufacturing/doctype/bom/bom.py:1436
+#: erpnext/manufacturing/doctype/bom/bom.py:1473
msgid "Operating Cost as per Work Order / BOM"
msgstr "İş Emri / Ürün Ağacına Göre İşletme Maliyeti"
@@ -33894,7 +33948,7 @@ msgstr "Operasyon Maliyeti"
#. Label of the operation (Link) field in DocType 'Work Order Item'
#. Label of the operation (Link) field in DocType 'Work Order Operation'
#. Label of a Link in the Manufacturing Workspace
-#: erpnext/manufacturing/doctype/bom/bom.js:409
+#: erpnext/manufacturing/doctype/bom/bom.js:430
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
@@ -33986,7 +34040,7 @@ msgstr "Operasyon tamamlandıktan sonra elde edilecek ürün miktarı"
msgid "Operation time does not depend on quantity to produce"
msgstr "Operasyon süresi üretilecek ürün miktarına bağlı değildir."
-#: erpnext/manufacturing/doctype/job_card/job_card.js:513
+#: erpnext/manufacturing/doctype/job_card/job_card.js:521
msgid "Operation {0} added multiple times in the work order {1}"
msgstr "Operasyon {0}, iş emrine birden çok kez eklendi {1}"
@@ -34020,7 +34074,7 @@ msgstr "Operasyonlar"
msgid "Operations Routing"
msgstr "Operasyonların Rotası"
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1098
msgid "Operations cannot be left blank"
msgstr "Operasyonlar boş bırakılamaz"
@@ -34594,7 +34648,7 @@ msgstr "Giden"
msgid "Over Billing Allowance (%)"
msgstr "Fazla Fatura Ödeneği (%)"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1260
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1262
msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%"
msgstr ""
@@ -35088,7 +35142,7 @@ msgstr "Paket Listesi"
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:293
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:299
#: erpnext/stock/doctype/packing_slip/packing_slip.json
#: erpnext/stock/workspace/stock/stock.json
msgid "Packing Slip"
@@ -35099,7 +35153,7 @@ msgstr "Paketleme Fişi"
msgid "Packing Slip Item"
msgstr "Paketleme Fişi Kalemi"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:641
msgid "Packing Slip(s) cancelled"
msgstr "Paketleme iptal edildi"
@@ -35230,7 +35284,7 @@ msgstr "Ödeme Yapılacak Hesap Türü"
msgid "Paid To Account Type"
msgstr "Ödenen Yapılacak Hesap Türü"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:324
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:326
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1095
msgid "Paid amount + Write Off Amount can not be greater than Grand Total"
msgstr "Ödenen Tutar + Kapatılan Tutar, Genel Toplamdan büyük olamaz."
@@ -35385,11 +35439,11 @@ msgstr "Ana Ürün"
msgid "Parent Item Group"
msgstr "Ana Ürün Grubu"
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:80
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:81
msgid "Parent Item {0} must not be a Fixed Asset"
msgstr "Ana Kalem {0} Sabit Varlık olmamalıdır"
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:78
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:79
msgid "Parent Item {0} must not be a Stock Item"
msgstr "Ana Ürün {0} Stok Ürünü olmamalıdır"
@@ -35409,7 +35463,7 @@ msgstr "Ana Prosedür"
msgid "Parent Row No"
msgstr "Üst Satır No"
-#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:496
+#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:499
msgid "Parent Row No not found for {0}"
msgstr "Üst Satır No {0} için bulunamadı"
@@ -35460,7 +35514,7 @@ msgstr "Kısmi Malzeme Transferi"
msgid "Partial Payment in POS Transactions are not allowed."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1645
msgid "Partial Stock Reservation"
msgstr "Kısmi Stok Rezervasyonu"
@@ -35654,7 +35708,7 @@ msgstr "Milyonda Parça Sayısı"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:147
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:228
#: erpnext/accounts/report/general_ledger/general_ledger.js:74
-#: erpnext/accounts/report/general_ledger/general_ledger.py:723
+#: erpnext/accounts/report/general_ledger/general_ledger.py:743
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:161
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46
@@ -35759,6 +35813,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:110
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: erpnext/crm/doctype/contract/contract.json
#: erpnext/selling/doctype/party_specific_item/party_specific_item.json
#: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22
@@ -35817,7 +35872,7 @@ msgstr "Partiye Özel Ürün"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:141
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:219
#: erpnext/accounts/report/general_ledger/general_ledger.js:65
-#: erpnext/accounts/report/general_ledger/general_ledger.py:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:742
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:157
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35
@@ -35912,7 +35967,7 @@ msgstr "Dizin Yolu"
msgid "Pause"
msgstr "Duraklat"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:216
+#: erpnext/manufacturing/doctype/job_card/job_card.js:224
msgid "Pause Job"
msgstr "İşi Duraklat"
@@ -36408,7 +36463,7 @@ msgstr "Ödeme Durumu"
#: 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:1200
-#: erpnext/accounts/report/gross_profit/gross_profit.py:412
+#: erpnext/accounts/report/gross_profit/gross_profit.py:424
#: erpnext/accounts/workspace/accounting/accounting.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:30
msgid "Payment Term"
@@ -36521,7 +36576,7 @@ msgstr "Ödeme Bağlantısı Kaldırma Hatası"
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr "{0} {1} tutarındaki ödeme, {2} Bakiye Tutarından büyük olamaz"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:748
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:749
msgid "Payment amount cannot be less than or equal to 0"
msgstr "Ödeme tutarı 0'dan az veya eşit olamaz"
@@ -36538,7 +36593,7 @@ msgstr "{0} ödemesi başarıyla alındı."
msgid "Payment of {0} received successfully. Waiting for other requests to complete..."
msgstr "{0} ödemesi başarıyla alındı. Diğer isteklerin tamamlanması bekleniyor..."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:378
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:379
msgid "Payment related to {0} is not completed"
msgstr "{0} ile ilgili ödeme tamamlanmadı"
@@ -36681,7 +36736,7 @@ msgstr "Bekleyen Tutar"
#: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
#: erpnext/manufacturing/doctype/work_order/work_order.js:312
#: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:183
-#: erpnext/selling/doctype/sales_order/sales_order.js:1217
+#: erpnext/selling/doctype/sales_order/sales_order.js:1220
#: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:45
msgid "Pending Qty"
msgstr "Bekleyen Miktar"
@@ -37060,7 +37115,7 @@ msgstr "Telefon Numarası"
#. Reservation Entry'
#. Label of a Link in the Stock Workspace
#: erpnext/selling/doctype/sales_order/sales_order.js:637
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:199
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:202
#: erpnext/stock/doctype/material_request/material_request.js:140
#: erpnext/stock/doctype/pick_list/pick_list.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -37379,12 +37434,12 @@ msgid "Please Select a Company."
msgstr "Lütfen Firma Seçin."
#: erpnext/stock/doctype/delivery_note/delivery_note.js:165
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:204
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:207
msgid "Please Select a Customer"
msgstr "Lütfen Bir Müşteri Seçin"
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:139
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:251
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:255
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:102
msgid "Please Select a Supplier"
msgstr "Lütfen Bir Tedarikçi Seçin"
@@ -37470,7 +37525,7 @@ msgstr "Diğer para birimleriyle hesaplara izin vermek için lütfen Çoklu Para
msgid "Please check Process Deferred Accounting {0} and submit manually after resolving errors."
msgstr "Lütfen Ertelenmiş Muhasebe İşlemini {0} kontrol edin ve hataları çözdükten sonra manuel olarak gönderin."
-#: erpnext/manufacturing/doctype/bom/bom.js:84
+#: erpnext/manufacturing/doctype/bom/bom.js:86
msgid "Please check either with operations or FG Based Operating Cost."
msgstr "Lütfen operasyonları veya Bitmiş Ürün Bazlı İşletme Maliyetini kontrol edin."
@@ -37515,7 +37570,7 @@ msgstr "{0} için kredi limitlerini uzatmak amacıyla lütfen yöneticinizle ile
msgid "Please convert the parent account in corresponding child company to a group account."
msgstr "Lütfen ilgili alt şirketteki ana hesabı bir grup hesabına dönüştürün."
-#: erpnext/selling/doctype/quotation/quotation.py:586
+#: erpnext/selling/doctype/quotation/quotation.py:608
msgid "Please create Customer from Lead {0}."
msgstr "Lütfen {0} Müşteri Adayından oluşturun."
@@ -37531,7 +37586,7 @@ msgstr "Gerekirse lütfen yeni bir Muhasebe Boyutu oluşturun."
msgid "Please create purchase from internal sale or delivery document itself"
msgstr "Lütfen satın alma işlemini dahili satış veya teslimat belgesinin kendisinden oluşturun"
-#: erpnext/assets/doctype/asset/asset.py:390
+#: erpnext/assets/doctype/asset/asset.py:391
msgid "Please create purchase receipt or purchase invoice for the item {0}"
msgstr "Lütfen {0} ürünü için alış irsaliyesi veya alış faturası alın"
@@ -37543,7 +37598,7 @@ msgstr "Lütfen {1} adresini {2} adresiyle birleştirmeden önce {0} Ürün Pake
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:429
+#: erpnext/assets/doctype/asset/asset.py:445
msgid "Please do not book expense of multiple assets against one single Asset."
msgstr "Lütfen birden fazla varlığın giderini tek bir Varlığa karşı muhasebeleştirmeyin."
@@ -37573,7 +37628,7 @@ msgstr "Lütfen yalnızca bunu etkinleştirmenin etkilerini anlıyorsanız etkin
msgid "Please enable pop-ups"
msgstr "Lütfen açılır pencereleri etkinleştirin"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:665
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:667
msgid "Please enable {0} in the {1}."
msgstr "Lütfen {1} içindeki {0} öğesini etkinleştirin."
@@ -37581,11 +37636,11 @@ msgstr "Lütfen {1} içindeki {0} öğesini etkinleştirin."
msgid "Please enable {} in {} to allow same item in multiple rows"
msgstr "Aynı öğeye birden fazla satırda izin vermek için lütfen {} içinde {} ayarını etkinleştirin"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:367
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:369
msgid "Please ensure that the {0} account is a Balance Sheet account. You can change the parent account to a Balance Sheet account or select a different account."
msgstr "Lütfen {0} hesabının bir Bilanço hesabı olduğundan emin olun. Ana hesabı bir Bilanço hesabı olarak değiştirebilir veya farklı bir hesap seçebilirsiniz."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:375
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:377
msgid "Please ensure that the {0} account {1} is a Payable account. You can change the account type to Payable or select a different account."
msgstr "Lütfen {0} hesabının {1} bir Borç hesabı olduğundan emin olun. Hesap türünü Ödenecek olarak değiştirebilir veya farklı bir hesap seçebilirsiniz."
@@ -37601,7 +37656,7 @@ msgstr "Lütfen {} hesabının {} bir Alacak hesabı olduğundan emin olun."
msgid "Please enter Difference Account or set default Stock Adjustment Account for company {0}"
msgstr "Lütfen Fark Hesabı girin veya şirket için varsayılan Stok Ayarlama Hesabı olarak ayarlayın {0}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:508
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:509
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1188
msgid "Please enter Account for Change Amount"
msgstr "Değişim Miktarı Hesabı girin"
@@ -37683,7 +37738,7 @@ msgstr "Lütfen Gönderi Koli bilgilerini girin"
msgid "Please enter Warehouse and Date"
msgstr "Lütfen Depo ve Tarihi giriniz"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:653
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:655
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1184
msgid "Please enter Write Off Account"
msgstr "Lütfen Şüpheli Alacak Hesabını Girin"
@@ -37712,7 +37767,7 @@ msgstr "Lütfen önce cep telefonu numaranızı girin."
msgid "Please enter parent cost center"
msgstr "Lütfen ana maliyet merkezini girin"
-#: erpnext/public/js/utils/barcode_scanner.js:165
+#: erpnext/public/js/utils/barcode_scanner.js:191
msgid "Please enter quantity for item {0}"
msgstr "Lütfen {0} ürünü için miktar girin"
@@ -37728,7 +37783,7 @@ msgstr "Lütfen seri numaralarını girin"
msgid "Please enter the company name to confirm"
msgstr "Lütfen onaylamak için şirket adını girin"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:751
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:752
msgid "Please enter the phone number first"
msgstr "Lütfen önce telefon numaranızı giriniz"
@@ -37831,7 +37886,7 @@ msgstr "Şablonu indirmek için lütfen Şablon Türünü seçin"
msgid "Please select Apply Discount On"
msgstr "Lütfen indirim uygula seçeneğini belirleyin"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1650
+#: erpnext/selling/doctype/sales_order/sales_order.py:1666
msgid "Please select BOM against item {0}"
msgstr "Lütfen {0} Ürününe karşı Ürün Ağacını Seçin"
@@ -37917,11 +37972,11 @@ msgstr "Cariyi seçmeden önce Gönderme Tarihi seçiniz"
msgid "Please select Posting Date first"
msgstr "Lütfen önce Gönderi Tarihini seçin"
-#: erpnext/manufacturing/doctype/bom/bom.py:1106
+#: erpnext/manufacturing/doctype/bom/bom.py:1143
msgid "Please select Price List"
msgstr "Lütfen Fiyat Listesini Seçin"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1652
+#: erpnext/selling/doctype/sales_order/sales_order.py:1668
msgid "Please select Qty against item {0}"
msgstr "Lütfen {0} ürünü için miktar seçin"
@@ -37929,7 +37984,7 @@ msgstr "Lütfen {0} ürünü için miktar seçin"
msgid "Please select Sample Retention Warehouse in Stock Settings first"
msgstr "Lütfen önce Stok Ayarlarında Numune Saklama Deposunu seçin"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:415
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:417
msgid "Please select Serial/Batch Nos to reserve or change Reservation Based On to Qty."
msgstr "Lütfen rezerve etmek için Seri/Parti Numaralarını seçin veya Rezervasyonu Miktara Göre Değiştirin."
@@ -37949,17 +38004,17 @@ msgstr "Lütfen Satın Alma Siparişi yerine Alt Yüklenici Siparişini seçin {
msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
msgstr "Lütfen Gerçekleşmemiş Kâr / Zarar hesabını seçin veya {0} şirketi için varsayılan Gerçekleşmemiş Kâr / Zarar hesabı hesabını ekleyin"
-#: erpnext/manufacturing/doctype/bom/bom.py:1338
+#: erpnext/manufacturing/doctype/bom/bom.py:1375
msgid "Please select a BOM"
msgstr "Ürün Ağacı Seçin"
#: erpnext/accounts/party.py:430
-#: erpnext/stock/doctype/pick_list/pick_list.py:1551
+#: erpnext/stock/doctype/pick_list/pick_list.py:1563
msgid "Please select a Company"
msgstr "Bir Şirket Seçiniz"
#: erpnext/accounts/doctype/payment_entry/payment_entry.js:267
-#: erpnext/manufacturing/doctype/bom/bom.js:603
+#: erpnext/manufacturing/doctype/bom/bom.js:624
#: erpnext/manufacturing/doctype/bom/bom.py:261
#: erpnext/public/js/controllers/accounts.js:249
#: erpnext/public/js/controllers/transaction.js:2812
@@ -38039,11 +38094,11 @@ msgstr "Lütfen {1} Fiyat Teklifi {0} için bir değer seçin"
msgid "Please select an item code before setting the warehouse."
msgstr "Depoyu ayarlamadan önce lütfen bir ürün kodu seçin."
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:26
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:43
msgid "Please select at least one filter: Item Code, Batch, or Serial No."
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:886
+#: erpnext/selling/doctype/sales_order/sales_order.js:889
msgid "Please select atleast one item to continue"
msgstr ""
@@ -38128,7 +38183,7 @@ msgstr "Lütfen {0} seçin"
msgid "Please select {0} first"
msgstr "Lütfen Önce {0} Seçin"
-#: erpnext/public/js/controllers/transaction.js:99
+#: erpnext/public/js/controllers/transaction.js:100
msgid "Please set 'Apply Additional Discount On'"
msgstr "Lütfen 'Ek İndirim Uygula' seçeneğini ayarlayın"
@@ -38170,10 +38225,14 @@ msgstr "Lütfen {} içinde Muhasebe Boyutunu {} ayarlayın"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:58
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:68
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:78
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:756
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:765
msgid "Please set Company"
msgstr "Lütfen Şirketi ayarlayın"
+#: erpnext/regional/united_arab_emirates/utils.py:26
+msgid "Please set Customer Address to determine if the transaction is an export."
+msgstr ""
+
#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr "Lütfen Değer Kaybı ile ilgili Hesapları, Varlık Kategorisi {0} veya Firma {1} içinde belirleyin"
@@ -38196,7 +38255,7 @@ msgstr "Lütfen kamu idaresi için Mali Kodu belirleyin '%s'"
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:585
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:587
msgid "Please set Fixed Asset Account in {} against {}."
msgstr "Lütfen {} içindeki Sabit Kıymet Hesabını {} ile karşılaştırın."
@@ -38222,7 +38281,7 @@ msgstr "Lütfen Şirkette Gerçekleştirilmemiş Döviz Kazancı/Zararı Hesabı
msgid "Please set VAT Accounts in {0}"
msgstr "Lütfen KDV Hesaplarını {0} olarak ayarlayın"
-#: erpnext/regional/united_arab_emirates/utils.py:61
+#: erpnext/regional/united_arab_emirates/utils.py:83
msgid "Please set Vat Accounts for Company: \"{0}\" in UAE VAT Settings"
msgstr "Lütfen BAE KDV Ayarlarında Şirket için KDV Hesaplarını \"{0}\" olarak ayarlayın"
@@ -38230,11 +38289,11 @@ msgstr "Lütfen BAE KDV Ayarlarında Şirket için KDV Hesaplarını \"{0}\" ola
msgid "Please set a Company"
msgstr "Lütfen bir Şirket ayarlayın"
-#: erpnext/assets/doctype/asset/asset.py:305
+#: erpnext/assets/doctype/asset/asset.py:306
msgid "Please set a Cost Center for the Asset or set an Asset Depreciation Cost Center for the Company {}"
msgstr "Lütfen Varlık için bir Maliyet Merkezi belirleyin veya Şirket için bir Varlık Amortisman Maliyet Merkezi belirleyin {}"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1406
+#: erpnext/selling/doctype/sales_order/sales_order.py:1422
msgid "Please set a Supplier against the Items to be considered in the Purchase Order."
msgstr "Lütfen Satın Alma Siparişinde dikkate alınacak Ürünlere bir Tedarikçi ekleyin."
@@ -38246,7 +38305,7 @@ msgstr "Lütfen {1} Şirketi için varsayılan bir Tatil Listesi ayarlayın"
msgid "Please set a default Holiday List for Employee {0} or Company {1}"
msgstr "Lütfen Personel {0} veya {1} Şirketi için varsayılan bir Tatil Listesi ayarlayın"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1095
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1097
msgid "Please set account in Warehouse {0}"
msgstr "Lütfen {0} Deposu için hesabı ayarlayın."
@@ -38287,7 +38346,7 @@ msgstr "Lütfen Ödeme Şeklinde varsayılan Nakit veya Banka hesabını ayarlay
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr "Lütfen Ödeme Şeklinde varsayılan Nakit veya Banka hesabını ayarlayın {}"
-#: erpnext/accounts/utils.py:2314
+#: erpnext/accounts/utils.py:2318
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr "Lütfen {} Şirketi varsayılan Döviz Kazanç/Zarar Hesabını ayarlayın"
@@ -38320,7 +38379,7 @@ msgstr "Lütfen filtreleri ayarlayın"
msgid "Please set one of the following:"
msgstr "Lütfen aşağıdakilerden birini ayarlayın:"
-#: erpnext/assets/doctype/asset/asset.py:506
+#: erpnext/assets/doctype/asset/asset.py:522
msgid "Please set opening number of booked depreciations"
msgstr ""
@@ -38404,8 +38463,8 @@ msgid "Please specify Company"
msgstr "Lütfen Şirketi belirtin"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:447
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:503
msgid "Please specify Company to proceed"
msgstr "Lütfen devam etmek için Şirketi belirtin"
@@ -38612,8 +38671,8 @@ msgstr "Posta Giderleri"
#: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:61
#: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:66
#: erpnext/accounts/report/cheques_and_deposits_incorrectly_cleared/cheques_and_deposits_incorrectly_cleared.py:151
-#: erpnext/accounts/report/general_ledger/general_ledger.py:650
-#: erpnext/accounts/report/gross_profit/gross_profit.py:269
+#: erpnext/accounts/report/general_ledger/general_ledger.py:670
+#: erpnext/accounts/report/gross_profit/gross_profit.py:275
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:183
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:204
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
@@ -38645,7 +38704,7 @@ msgstr "Posta Giderleri"
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:127
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:104
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:86
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:449
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:492
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:24
#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:112
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:144
@@ -38660,7 +38719,7 @@ msgstr "Tarih"
msgid "Posting Date Inheritance for Exchange Gain / Loss"
msgstr "Kur Farkı Karı / Zararı İçin Muhasebe Tarihi Devralımı"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:254
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:256
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:130
msgid "Posting Date cannot be future date"
msgstr "Kaydetme Tarihi gelecekteki bir tarih olamaz"
@@ -38700,7 +38759,7 @@ msgstr "Gönderim Tarih ve Saati"
#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:275
+#: erpnext/accounts/report/gross_profit/gross_profit.py:281
#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -38999,7 +39058,7 @@ msgstr "Fiyat Listesi Ülkesi"
msgid "Price List Currency"
msgstr "Fiyat Listesi Para Birimi"
-#: erpnext/stock/get_item_details.py:1236
+#: erpnext/stock/get_item_details.py:1231
msgid "Price List Currency not selected"
msgstr "Fiyat Listesi Para Birimi seçilmedi"
@@ -39668,7 +39727,7 @@ msgstr "Açıklama"
msgid "Process Loss"
msgstr "Proses Kaybı"
-#: erpnext/manufacturing/doctype/bom/bom.py:1089
+#: erpnext/manufacturing/doctype/bom/bom.py:1126
msgid "Process Loss Percentage cannot be greater than 100"
msgstr "Proses Kaybı Yüzdesi 100'den büyük olamaz"
@@ -39687,7 +39746,7 @@ msgstr "Proses Kaybı Yüzdesi 100'den büyük olamaz"
msgid "Process Loss Qty"
msgstr "Kayıp Proses Miktarı"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:293
+#: erpnext/manufacturing/doctype/job_card/job_card.js:301
msgid "Process Loss Quantity"
msgstr ""
@@ -40152,15 +40211,15 @@ msgstr "İlerleme (%)"
#: erpnext/accounts/doctype/psoa_project/psoa_project.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1052
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1061
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:109
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:74
#: erpnext/accounts/report/general_ledger/general_ledger.js:164
-#: erpnext/accounts/report/general_ledger/general_ledger.py:727
+#: erpnext/accounts/report/general_ledger/general_ledger.py:760
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
-#: erpnext/accounts/report/gross_profit/gross_profit.py:357
+#: erpnext/accounts/report/gross_profit/gross_profit.py:363
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:274
#: erpnext/accounts/report/purchase_register/purchase_register.py:207
@@ -40693,7 +40752,7 @@ msgstr "Satın Alma Detayları"
#: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
#: erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:134
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:289
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:296
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js:30
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
@@ -40727,16 +40786,16 @@ msgstr "Alış Faturası Ürünü"
msgid "Purchase Invoice Trends"
msgstr "Alış Faturası Trend Grafikleri"
-#: erpnext/assets/doctype/asset/asset.py:267
+#: erpnext/assets/doctype/asset/asset.py:268
msgid "Purchase Invoice cannot be made against an existing asset {0}"
msgstr "Satın Alma Faturası mevcut bir varlığa karşı yapılamaz {0}"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:431
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:445
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:433
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:447
msgid "Purchase Invoice {0} is already submitted"
msgstr "Satınalma Faturası {0} zaten gönderildi"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:2011
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:2013
msgid "Purchase Invoices"
msgstr "Alış Faturaları"
@@ -40813,7 +40872,7 @@ msgstr "Satın Alma Genel Müdürü"
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#: erpnext/stock/doctype/material_request/material_request.js:179
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:246
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:250
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -40889,11 +40948,11 @@ msgstr "Zamanında teslim alınmayan Satın Alma Siparişi Ürünleri"
msgid "Purchase Order Pricing Rule"
msgstr "Satınalma Siparişi Fiyatlandırma Kuralı"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:624
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:626
msgid "Purchase Order Required"
msgstr "Satın Alma Emri Gerekli"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:619
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:621
msgid "Purchase Order Required for item {}"
msgstr "{} için Satın Alma Emri Gerekli"
@@ -40905,19 +40964,19 @@ msgstr "{} için Satın Alma Emri Gerekli"
msgid "Purchase Order Trends"
msgstr "Satın Alma Emirleri Trendleri"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1179
+#: erpnext/selling/doctype/sales_order/sales_order.js:1182
msgid "Purchase Order already created for all Sales Order items"
msgstr "Tüm Satış Siparişi kalemleri için Satın Alma Emri zaten oluşturuldu"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:320
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:322
msgid "Purchase Order number required for Item {0}"
msgstr "{0} için Satın Alma Emri No gereklidir"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:662
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:664
msgid "Purchase Order {0} is not submitted"
msgstr "Satın Alma Emri {0} kaydedilmedi"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:907
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:929
msgid "Purchase Orders"
msgstr "Satın Alma Siparişleri"
@@ -40965,9 +41024,9 @@ msgstr "Satın Alma Fiyat Listesi"
#. Reservation Entry'
#. Label of a Link in the Stock Workspace
#. Label of a shortcut in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:174
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:655
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:665
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:177
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:661
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:671
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:49
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:246
@@ -41030,11 +41089,11 @@ msgstr "Satınalma İrsaliyesi Ürünleri"
msgid "Purchase Receipt No"
msgstr "Alış İrsaliye No"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:645
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:647
msgid "Purchase Receipt Required"
msgstr "Alış İrsaliyesi Gereklidir"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:640
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:642
msgid "Purchase Receipt Required for item {}"
msgstr "{} kalemi için Alış İrsaliyesi Gereklidir"
@@ -41047,7 +41106,7 @@ msgstr "{} kalemi için Alış İrsaliyesi Gereklidir"
msgid "Purchase Receipt Trends"
msgstr "Alış İrsaliyesi Eğilimleri"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:384
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:391
msgid "Purchase Receipt doesn't have any Item for which Retain Sample is enabled."
msgstr "Satın Alma İrsaliyesinde Numune Sakla ayarı etkinleştirilmiş bir Ürün bulunmamaktadır."
@@ -41055,7 +41114,7 @@ msgstr "Satın Alma İrsaliyesinde Numune Sakla ayarı etkinleştirilmiş bir Ü
msgid "Purchase Receipt {0} created."
msgstr "{0} Alış İrsaliyesi oluşturuldu."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:669
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:671
msgid "Purchase Receipt {0} is not submitted"
msgstr "Satın Alma İrsaliyesi {0} kaydedilmedi"
@@ -41066,7 +41125,7 @@ msgstr "Satın Alma İrsaliyesi {0} kaydedilmedi"
msgid "Purchase Register"
msgstr "Satın Alma Kayıtları"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:279
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:286
msgid "Purchase Return"
msgstr "İade"
@@ -41262,14 +41321,14 @@ msgstr "{1} Deposundaki {0} Ürünü için zaten bir Paketten Çıkarma Kuralı
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91
-#: erpnext/accounts/report/gross_profit/gross_profit.py:314
+#: erpnext/accounts/report/gross_profit/gross_profit.py:320
#: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json
#: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240
#: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:224
#: erpnext/controllers/trends.py:242 erpnext/controllers/trends.py:254
#: erpnext/controllers/trends.py:259
#: erpnext/crm/doctype/opportunity_item/opportunity_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:964
+#: erpnext/manufacturing/doctype/bom/bom.js:999
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
#: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
@@ -41289,8 +41348,8 @@ msgstr "{1} Deposundaki {0} Ürünü için zaten bir Paketten Çıkarma Kuralı
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:367
#: erpnext/selling/doctype/sales_order/sales_order.js:471
-#: erpnext/selling/doctype/sales_order/sales_order.js:863
-#: erpnext/selling/doctype/sales_order/sales_order.js:1015
+#: erpnext/selling/doctype/sales_order/sales_order.js:866
+#: erpnext/selling/doctype/sales_order/sales_order.js:1018
#: 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_voucher/landed_cost_voucher.json
@@ -41374,7 +41433,7 @@ msgstr "Birim Başına Miktar"
#. Label of the for_quantity (Float) field in DocType 'Job Card'
#. Label of the qty (Float) field in DocType 'Work Order'
-#: erpnext/manufacturing/doctype/bom/bom.js:309
+#: erpnext/manufacturing/doctype/bom/bom.js:330
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/manufacturing/report/process_loss_report/process_loss_report.py:82
@@ -41489,7 +41548,7 @@ msgstr "Teslim Edilecek Miktar"
msgid "Qty to Fetch"
msgstr "Getirilecek Miktar"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:265
+#: erpnext/manufacturing/doctype/job_card/job_card.js:273
#: erpnext/manufacturing/doctype/job_card/job_card.py:765
msgid "Qty to Manufacture"
msgstr "Üretilecek Miktar"
@@ -41502,6 +41561,8 @@ msgstr "Üretilecek Miktar"
msgid "Qty to Order"
msgstr "Sipariş Miktarı"
+#. Label of the finished_good_qty (Float) field in DocType 'BOM Operation'
+#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
#: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:129
msgid "Qty to Produce"
msgstr "Üretilecek Miktar"
@@ -41628,7 +41689,7 @@ msgstr "Kalite Hedefi Amaçları"
#: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:186
+#: erpnext/manufacturing/doctype/bom/bom.js:207
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/quality_management/workspace/quality/quality.json
@@ -41703,7 +41764,7 @@ msgstr "Kalite Kontrol Şablonu"
msgid "Quality Inspection Template Name"
msgstr "Kalite Kontrol Şablonu Adı"
-#: erpnext/public/js/controllers/transaction.js:359
+#: erpnext/public/js/controllers/transaction.js:360
#: erpnext/stock/doctype/stock_entry/stock_entry.js:165
msgid "Quality Inspection(s)"
msgstr "Kalite Kontrolleri"
@@ -41821,7 +41882,7 @@ msgstr "Kalite Hedefi Amaçları"
#: erpnext/buying/report/purchase_analytics/purchase_analytics.js:28
#: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:213
#: erpnext/manufacturing/doctype/blanket_order_item/blanket_order_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:396
+#: erpnext/manufacturing/doctype/bom/bom.js:417
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.js:68
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.json
@@ -41848,7 +41909,7 @@ msgstr "Kalite Hedefi Amaçları"
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py:36
#: erpnext/stock/report/delayed_item_report/delayed_item_report.py:154
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:423
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:466
#: erpnext/stock/report/stock_analytics/stock_analytics.js:27
#: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
#: erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json
@@ -41970,8 +42031,8 @@ msgid "Quantity required for Item {0} in row {1}"
msgstr "Satır {1} deki Ürün {0} için gereken miktar"
#: erpnext/manufacturing/doctype/bom/bom.py:604
-#: erpnext/manufacturing/doctype/job_card/job_card.js:321
-#: erpnext/manufacturing/doctype/job_card/job_card.js:390
+#: erpnext/manufacturing/doctype/job_card/job_card.js:329
+#: erpnext/manufacturing/doctype/job_card/job_card.js:398
#: erpnext/manufacturing/doctype/workstation/workstation.js:303
msgid "Quantity should be greater than 0"
msgstr "Miktar 0'dan büyük olmalıdır"
@@ -42000,7 +42061,7 @@ msgstr "Üretilecek Miktar"
msgid "Quantity to Produce should be greater than zero."
msgstr "Üretilecek Miktar sıfırdan büyük olmalıdır."
-#: erpnext/public/js/utils/barcode_scanner.js:236
+#: erpnext/public/js/utils/barcode_scanner.js:262
msgid "Quantity to Scan"
msgstr "Taranacak Miktar"
@@ -42131,7 +42192,7 @@ msgstr "Teklif/Müşteri Adayı %"
#. Label of the prevdoc_docname (Link) field in DocType 'Sales Order Item'
#. Label of a Link in the Selling Workspace
#. Option for the 'Transaction' (Select) field in DocType 'Authorization Rule'
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:277
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:280
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:36
#: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html:20
#: erpnext/crm/doctype/contract/contract.json
@@ -42198,7 +42259,7 @@ msgstr "Teklif {0} iptal edildi"
msgid "Quotation {0} not of type {1}"
msgstr "Teklif {0} {1} türü değil"
-#: erpnext/selling/doctype/quotation/quotation.py:343
+#: erpnext/selling/doctype/quotation/quotation.py:345
#: erpnext/selling/page/sales_funnel/sales_funnel.py:57
msgid "Quotations"
msgstr "Fiyat Teklifleri"
@@ -42650,8 +42711,8 @@ msgstr "Hammadde Deposu"
#. Label of the materials_section (Section Break) field in DocType 'BOM'
#. Label of the section_break_8 (Section Break) field in DocType 'Job Card'
#. Label of the mr_items (Table) field in DocType 'Production Plan'
-#: erpnext/manufacturing/doctype/bom/bom.js:349
-#: erpnext/manufacturing/doctype/bom/bom.js:938
+#: erpnext/manufacturing/doctype/bom/bom.js:370
+#: erpnext/manufacturing/doctype/bom/bom.js:972
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
@@ -42814,7 +42875,7 @@ msgid "Reason"
msgstr "Nedeni"
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:282
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr "Beklemeye Alma Nedeni"
@@ -42825,7 +42886,7 @@ msgid "Reason for Failure"
msgstr "Başarısızlığın Nedeni"
#: erpnext/buying/doctype/purchase_order/purchase_order.js:748
-#: erpnext/selling/doctype/sales_order/sales_order.js:1338
+#: erpnext/selling/doctype/sales_order/sales_order.js:1341
msgid "Reason for Hold"
msgstr "Bekletme Nedeni"
@@ -42834,7 +42895,7 @@ msgstr "Bekletme Nedeni"
msgid "Reason for Leaving"
msgstr "Ayrılma Gerekçesi Detayı"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1353
+#: erpnext/selling/doctype/sales_order/sales_order.js:1356
msgid "Reason for hold:"
msgstr "Bekletme nedeni:"
@@ -43204,7 +43265,7 @@ msgstr "URL kaydediliyor"
msgid "Records"
msgstr "Kayıtlar"
-#: erpnext/regional/united_arab_emirates/utils.py:171
+#: erpnext/regional/united_arab_emirates/utils.py:193
msgid "Recoverable Standard Rated expenses should not be set when Reverse Charge Applicable is Y"
msgstr "İade Edilebilir Standart Oranlı Giderler, Ters Yükleme Uygulanıyorken (Y) ayarlanmamalıdır."
@@ -43646,11 +43707,11 @@ msgstr "Referans: {0}, Ürün Kodu: {1} ve Müşteri: {2}"
msgid "References"
msgstr "Referanslar"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:385
msgid "References to Sales Invoices are Incomplete"
msgstr "Satış Faturalarına İlişkin Referanslar Eksik"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:380
msgid "References to Sales Orders are Incomplete"
msgstr "Satış Siparişlerine Yapılan Referanslar Eksik"
@@ -43795,14 +43856,14 @@ msgstr "Yakınlığı"
#. Label of the release_date (Date) field in DocType 'Purchase Invoice'
#. Label of the release_date (Date) field in DocType 'Supplier'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:268
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:312
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:274
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:318
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
msgstr "Fatura Kesilme Tarihi"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:315
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:317
msgid "Release date must be in the future"
msgstr "Çıkış tarihi gelecekte olmalıdır"
@@ -43877,7 +43938,7 @@ msgstr "Açıklama"
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1254
#: erpnext/accounts/report/general_ledger/general_ledger.html:84
#: erpnext/accounts/report/general_ledger/general_ledger.html:110
-#: erpnext/accounts/report/general_ledger/general_ledger.py:752
+#: erpnext/accounts/report/general_ledger/general_ledger.py:785
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112
#: erpnext/accounts/report/purchase_register/purchase_register.py:296
#: erpnext/accounts/report/sales_register/sales_register.py:335
@@ -43974,8 +44035,8 @@ msgstr "Kira"
#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:58
#: erpnext/crm/doctype/opportunity/opportunity.js:130
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:354
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:305
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:360
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:312
#: erpnext/support/doctype/issue/issue.js:39
msgid "Reopen"
msgstr "Yeniden Aç"
@@ -44607,7 +44668,7 @@ msgstr "Alt Yüklenici İçin Ayrılan Miktar"
msgid "Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items."
msgstr "Alt Yüklenici İçin Ayrılan Miktar: Alt yükleniciye yapılan ürünler için gerekli hammadde miktarı."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:606
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:608
msgid "Reserved Qty should be greater than Delivered Qty."
msgstr "Ayrılan Miktar, Teslim Edilen Miktardan büyük olmalıdır."
@@ -44908,7 +44969,7 @@ msgstr "Sonuç Başlık Alanı"
msgid "Resume"
msgstr "Özgeçmiş"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:200
+#: erpnext/manufacturing/doctype/job_card/job_card.js:208
msgid "Resume Job"
msgstr "İşi Devam Ettir"
@@ -44938,7 +44999,7 @@ msgstr "Numuneyi Sakla"
msgid "Retained Earnings"
msgstr "Birikmiş Kazançlar"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:295
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:302
msgid "Retention Stock Entry"
msgstr "Stok Tutma Girişi"
@@ -45032,13 +45093,13 @@ msgstr "Bileşenleri İade Et"
msgid "Return Issued"
msgstr "İade Edildi"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:355
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:362
msgid "Return Qty"
msgstr "İade Miktarı"
#. Label of the return_qty_from_rejected_warehouse (Check) field in DocType
#. 'Purchase Receipt Item'
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:331
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:338
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
msgid "Return Qty from Rejected Warehouse"
msgstr "Reddedilen Depodan İade Miktarı"
@@ -45504,12 +45565,12 @@ msgstr "Satır # {0}: İade Edilen Ürün {1} {2} {3} içinde mevcut değil"
msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:518
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1919
msgid "Row #{0} (Payment Table): Amount must be negative"
msgstr "Satır #{0} (Ödeme Tablosu): Tutar negatif olmalıdır"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:515
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:516
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr "Satır #{0} (Ödeme Tablosu): Tutar pozitif olmalıdır"
@@ -45568,7 +45629,7 @@ msgstr ""
msgid "Row #{0}: BOM is not specified for subcontracting item {0}"
msgstr "Satır #{0}: {0} alt yüklenici kalemi için ürün ağacı belirtilmemiş"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:405
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:407
msgid "Row #{0}: Batch No {1} is already selected."
msgstr "Satır #{0}: Parti No {1} zaten seçili."
@@ -45604,7 +45665,7 @@ msgstr ""
msgid "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}"
msgstr "Satır #{0}: İş Kartı {3} için {2} Ürünü için Gerekli Olan {1} Miktardan fazlasını aktaramazsınız."
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:86
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:87
msgid "Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save"
msgstr "Satır #{0}: Alt Öğe bir Ürün Paketi olmamalıdır. Lütfen {1} öğesini kaldırın ve kaydedin"
@@ -45644,7 +45705,7 @@ msgstr "Satır #{0}: Diğer satırla çakışan tarihler var"
msgid "Row #{0}: Default BOM not found for FG Item {1}"
msgstr "Satır #{0}: Bitmiş Ürün için varsayılan {1} Ürün Ağacı bulunamadı"
-#: erpnext/assets/doctype/asset/asset.py:533
+#: erpnext/assets/doctype/asset/asset.py:549
msgid "Row #{0}: Depreciation Start Date is required"
msgstr "Satır #{0}: Amortisman Başlangıç Tarihi gerekli"
@@ -45696,7 +45757,7 @@ msgstr "Satır #{0}: Başlangıç Tarihi Bitiş Tarihinden önce olamaz"
msgid "Row #{0}: From Time and To Time fields are required"
msgstr ""
-#: erpnext/public/js/utils/barcode_scanner.js:394
+#: erpnext/public/js/utils/barcode_scanner.js:428
msgid "Row #{0}: Item added"
msgstr "Satır # {0}: Ürün eklendi"
@@ -45704,7 +45765,7 @@ msgstr "Satır # {0}: Ürün eklendi"
msgid "Row #{0}: Item {1} does not exist"
msgstr "Satır #{0}: {1} öğesi mevcut değil"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1549
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr "Satır #{0}: Ürün {1} toplandı, lütfen Toplama Listesinden stok ayırın."
@@ -45728,11 +45789,11 @@ msgstr "Satır #{0}: {1} bir stok kalemi değildir"
msgid "Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher"
msgstr "Satır #{0}: Defter Girişi {1} için , {2} hesabı mevcut değil veya zaten başka bir giriş ile eşleştirilmiş."
-#: erpnext/assets/doctype/asset/asset.py:527
+#: erpnext/assets/doctype/asset/asset.py:543
msgid "Row #{0}: Next Depreciation Date cannot be before Available-for-use Date"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:522
+#: erpnext/assets/doctype/asset/asset.py:538
msgid "Row #{0}: Next Depreciation Date cannot be before Purchase Date"
msgstr ""
@@ -45740,11 +45801,11 @@ msgstr ""
msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
msgstr "Satır #{0}: Satın Alma Emri zaten mevcut olduğundan Tedarikçiyi değiştirmenize izin verilmiyor"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1632
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr "Satır #{0}: Yalnızca {1} Öğesi {2} için rezerve edilebilir"
-#: erpnext/assets/doctype/asset/asset.py:499
+#: erpnext/assets/doctype/asset/asset.py:515
msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}"
msgstr ""
@@ -45752,15 +45813,15 @@ msgstr ""
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 "Satır #{0}: {1} Operasyonu {3} İş Emrindeki {2} adet için tamamlanamadı. Lütfen önce {4} İş Kartındaki operasyon durumunu güncelleyin."
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1009
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1010
msgid "Row #{0}: Please select Item Code in Assembly Items"
msgstr "Satır #{0}: Lütfen Montaj Öğelerinde Ürün Kodunu seçin"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1012
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1013
msgid "Row #{0}: Please select the BOM No in Assembly Items"
msgstr "Satır #{0}: Lütfen Montaj Kalemleri için Ürün Ağacı No'yu seçin"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1006
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1007
msgid "Row #{0}: Please select the Sub Assembly Warehouse"
msgstr "Satır #{0}: Lütfen Alt Montaj Deposunu seçin"
@@ -45772,7 +45833,7 @@ msgstr "Satır #{0}: Lütfen yeniden sipariş miktarını ayarlayın"
msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master"
msgstr "Satır #{0}: Lütfen kalem satırındaki ertelenmiş gelir/gider hesabını veya şirket ana sayfasındaki varsayılan hesabı güncelleyin"
-#: erpnext/public/js/utils/barcode_scanner.js:392
+#: erpnext/public/js/utils/barcode_scanner.js:426
msgid "Row #{0}: Qty increased by {1}"
msgstr "Satır #{0}: Miktar {1} oranında artırıldı"
@@ -45781,7 +45842,7 @@ msgstr "Satır #{0}: Miktar {1} oranında artırıldı"
msgid "Row #{0}: Qty must be a positive number"
msgstr "Satır #{0}: Miktar pozitif bir sayı olmalıdır"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:393
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:395
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 "Satır #{0}: Miktar, {4} deposunda {3} Partisi için {2} ürününe karşı Rezerve Edilebilir Miktar'dan (Gerçek Miktar - Rezerve Edilen Miktar) {1} küçük veya eşit olmalıdır."
@@ -45797,12 +45858,16 @@ msgstr "Satır #{0}: {1} Kalite Kontrol {2} Ürünü için gönderilmemiş"
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr "Satır #{0}: {1} Kalite Kontrolü {2} Ürünü için reddedildi"
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:96
+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:1375
#: erpnext/controllers/accounts_controller.py:3663
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr "Satır #{0}: {1} kalemi için miktar sıfır olamaz."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1617
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr "Satır #{0}: {1} Kalemi için rezerve edilecek miktar 0'dan büyük olmalıdır."
@@ -45855,11 +45920,11 @@ msgstr ""
msgid "Row #{0}: Serial No {1} does not belong to Batch {2}"
msgstr "Satır #{0}: Seri No {1} , Parti {2}'ye ait değil"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:342
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:344
msgid "Row #{0}: Serial No {1} for Item {2} is not available in {3} {4} or might be reserved in another {5}."
msgstr "Satır #{0}: {2} ürünü için Seri No {1}, {3} {4} için mevcut değil veya başka bir {5} içinde rezerve edilmiş olabilir."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:358
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:360
msgid "Row #{0}: Serial No {1} is already selected."
msgstr "Satır #{0}: Seri No {1} zaten seçilidir."
@@ -45879,6 +45944,10 @@ msgstr "Satır #{0}: Ertelenmiş muhasebe için Hizmet Başlangıç ve Bitiş Ta
msgid "Row #{0}: Set Supplier for item {1}"
msgstr "Satır #{0}: {1} kalemi için Tedarikçiyi Ayarla"
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1017
+msgid "Row #{0}: Since 'Track Semi Finished Goods' is enabled, the BOM {1} cannot be used for Sub Assembly Items"
+msgstr ""
+
#: erpnext/manufacturing/doctype/workstation/workstation.py:92
msgid "Row #{0}: Start Time and End Time are required"
msgstr "Satır #{0}: Başlangıç Saati ve Bitiş Saati gereklidir"
@@ -45895,32 +45964,32 @@ msgstr "Satır #{0}: Durum zorunludur"
msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}"
msgstr "Satır # {0}: Fatura İndirimi {2} için durum {1} olmalı"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:367
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:369
msgid "Row #{0}: Stock cannot be reserved for Item {1} against a disabled Batch {2}."
msgstr "Satır #{0}: Stok, devre dışı bırakılmış bir Parti {2} karşılığında {1} Kalemi için ayrılamaz."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1562
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr "Satır #{0}: Stok, stokta olmayan bir Ürün için rezerve edilemez {1}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1575
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr "Satır #{0}: {1} deposu bir Grup Deposu olduğundan, stok rezerve edilemez."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1589
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr "Satır #{0}: Stok zaten {1} kalemi için ayrılmıştır."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:539
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr "Satır #{0}: Stok, {2} Deposunda bulunan {1} Ürünü için ayrılmıştır."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:377
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:379
msgid "Row #{0}: Stock not available to reserve for Item {1} against Batch {2} in Warehouse {3}."
msgstr "Satır #{0}: {3} Deposunda, {2} Partisi için {1} ürününe ayrılacak stok bulunmamaktadır."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1224
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1603
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr "Satır #{0}: {2} Deposundaki {1} Ürünü için rezerve edilecek stok mevcut değil."
@@ -45936,7 +46005,7 @@ msgstr "Satır #{0}: {1} deposu, {2} grup deposunun alt deposu değildir."
msgid "Row #{0}: Timings conflicts with row {1}"
msgstr "Satır #{0}: Zamanlamalar {1} satırı ile çakışıyor"
-#: erpnext/assets/doctype/asset/asset.py:512
+#: erpnext/assets/doctype/asset/asset.py:528
msgid "Row #{0}: Total Number of Depreciations cannot be less than or equal to Opening Number of Booked Depreciations"
msgstr "Satır #{0}: Toplam Amortisman Sayısı, Kayıtlı Amortismanların Açılış Sayısından az veya eşit olamaz"
@@ -46008,11 +46077,11 @@ msgstr ""
msgid "Row #{}: Currency of {} - {} doesn't matches company currency."
msgstr "Satır #{}: {} - {} para birimi şirket para birimiyle eşleşmiyor."
-#: erpnext/assets/doctype/asset/asset.py:349
+#: erpnext/assets/doctype/asset/asset.py:350
msgid "Row #{}: Finance Book should not be empty since you're using multiple."
msgstr "Satır #{}: Birden fazla kullandığınız için Finans Defteri boş olmamalıdır."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:406
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:407
msgid "Row #{}: Item Code: {} is not available under warehouse {}."
msgstr "Satır #{}: Ürün Kodu: {}, {} deposunda mevcut değil."
@@ -46032,23 +46101,23 @@ msgstr "Satır #{}: POS Faturası {} henüz gönderilmedi"
msgid "Row #{}: Please assign task to a member."
msgstr "Satır #{}: Lütfen bir üyeye görev atayın."
-#: erpnext/assets/doctype/asset/asset.py:341
+#: erpnext/assets/doctype/asset/asset.py:342
msgid "Row #{}: Please use a different Finance Book."
msgstr "Satır #{}: Lütfen farklı bir Finans Defteri kullanın."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:477
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:478
msgid "Row #{}: Serial No {} cannot be returned since it was not transacted in original invoice {}"
msgstr "Satır #{}: Seri No {}, orijinal faturada işlem görmediği için iade edilemez {}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:413
-msgid "Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}. Available quantity {}."
-msgstr "Satır #{}: {} deposu altındaki Ürün Kodu: {} için stok miktarı yeterli değil. Mevcut miktar {}."
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:414
+msgid "Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}."
+msgstr ""
#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:104
msgid "Row #{}: The original Invoice {} of return invoice {} is not consolidated."
msgstr "Satır #{}: İade faturasının {} orijinal Faturası {} birleştirilmemiştir."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:450
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:451
msgid "Row #{}: You cannot add positive quantities in a return invoice. Please remove item {} to complete the return."
msgstr "Satır #{}: Bir iade faturasına pozitif miktarlar ekleyemezsiniz. İadeyi tamamlamak için lütfen {} öğesini kaldırın."
@@ -46069,7 +46138,7 @@ msgstr "Satır #{}: {} {} mevcut değil."
msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}."
msgstr "Satır #{}: {} {}, {} Şirketine ait değil. Lütfen geçerli {} seçin."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:434
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:436
msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}"
msgstr "Satır No {0}: Depo gereklidir. Lütfen {1} ürünü ve {2} Şirketi için Varsayılan Depoyu ayarlayın."
@@ -46178,19 +46247,19 @@ msgstr "Satır {0}: Ya İrsaliye Kalemi ya da Paketlenmiş Kalem referansı zoru
msgid "Row {0}: Exchange Rate is mandatory"
msgstr "Satır {0}: Döviz Kuru zorunludur"
-#: erpnext/assets/doctype/asset/asset.py:474
+#: erpnext/assets/doctype/asset/asset.py:490
msgid "Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount"
msgstr "Satır {0}: Faydalı Ömürden Sonra Beklenen Değer, Brüt Satın Alma Tutarından az olmalıdır"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:525
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:527
msgid "Row {0}: Expense Head changed to {1} as no Purchase Receipt is created against Item {2}."
msgstr "Satır {0}: Ürün {2} için Satın Alma İrsaliyesi oluşturulmadığından Gider Başlığı {1} olarak değiştirildi"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:482
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:484
msgid "Row {0}: Expense Head changed to {1} because account {2} is not linked to warehouse {3} or it is not the default inventory account"
msgstr "Satır {0}: {2} hesabı {3} deposu ile bağlantılı değil veya varsayılan stok hesabı değil, bu yüzden Gider Hesabı {1} olarak değiştirildi."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:507
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:509
msgid "Row {0}: Expense Head changed to {1} because expense is booked against this account in Purchase Receipt {2}"
msgstr "Satır {0}: Gider Başlığı {1} olarak değiştirildi çünkü bu hesaba Satın Alma İrsaliyesi {2} kapsamında gider kaydedildi"
@@ -46243,7 +46312,7 @@ msgstr "Satır {0}: Ürün {1} bir alt yüklenici kalemi olmalıdır."
msgid "Row {0}: Item {1}'s quantity cannot be higher than the available quantity."
msgstr "Satır {0}: Öğe {1} miktarı mevcut miktardan daha fazla olamaz."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:596
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr "Satır {0}: Paketlenen Miktar {1} Miktarına eşit olmalıdır."
@@ -46359,7 +46428,7 @@ msgstr "Satır {0}: {1} periyodunu ayarlamak için başlangıç ve bitiş tarihl
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr "Satır {0}: Ölçü Birimi Dönüşüm Faktörü zorunludur"
-#: erpnext/manufacturing/doctype/bom/bom.py:1072
+#: erpnext/manufacturing/doctype/bom/bom.py:1109
#: erpnext/manufacturing/doctype/work_order/work_order.py:277
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr "Satır {0}: Bir Operasyon için İş İstasyonu veya İş İstasyonu Türü zorunludur {1}"
@@ -46586,6 +46655,8 @@ msgstr "Maaş Ödemesi"
#: erpnext/accounts/doctype/shipping_rule/shipping_rule_dashboard.py:10
#: erpnext/accounts/doctype/tax_category/tax_category_dashboard.py:9
#: erpnext/accounts/doctype/tax_rule/tax_rule.json
+#: erpnext/crm/doctype/opportunity/opportunity.js:288
+#: erpnext/crm/doctype/opportunity/opportunity.py:158
#: erpnext/projects/doctype/project/project_dashboard.py:15
#: erpnext/regional/report/vat_audit_report/vat_audit_report.py:185
#: erpnext/selling/doctype/quotation/quotation.json
@@ -46678,8 +46749,8 @@ msgstr "Satış Gelen Oranı"
#: erpnext/accounts/doctype/sales_invoice_reference/sales_invoice_reference.json
#: erpnext/accounts/print_format/sales_auditing_voucher/sales_auditing_voucher.html:5
#: erpnext/accounts/report/gross_profit/gross_profit.js:30
-#: erpnext/accounts/report/gross_profit/gross_profit.py:256
-#: erpnext/accounts/report/gross_profit/gross_profit.py:263
+#: erpnext/accounts/report/gross_profit/gross_profit.py:262
+#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: erpnext/accounts/workspace/accounting/accounting.json
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/crm/doctype/contract/contract.json
@@ -46691,7 +46762,7 @@ msgstr "Satış Gelen Oranı"
#: erpnext/selling/workspace/selling/selling.json
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/setup/workspace/home/home.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:343
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:349
#: erpnext/stock/doctype/delivery_note/delivery_note_list.js:65
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
msgid "Sales Invoice"
@@ -46769,11 +46840,11 @@ msgstr "Satış Faturası gönderilmedi"
msgid "Sales Invoice isn't created by user {}"
msgstr "Satış Faturası {} kullanıcısı tarafından oluşturulmadı"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:422
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:423
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:616
msgid "Sales Invoice {0} has already been submitted"
msgstr "Satış Faturası {0} zaten kaydedildi"
@@ -46917,7 +46988,7 @@ msgstr "Kaynağa Göre Satış Fırsatları"
#: erpnext/selling/workspace/selling/selling.json
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.js:160
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:223
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:226
#: erpnext/stock/doctype/material_request/material_request.js:219
#: erpnext/stock/doctype/material_request_item/material_request_item.json
#: erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -46969,7 +47040,7 @@ msgstr "Satış Siparişi Tarihi"
#: erpnext/manufacturing/doctype/production_plan_item_reference/production_plan_item_reference.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/selling/doctype/sales_order/sales_order.js:313
-#: erpnext/selling/doctype/sales_order/sales_order.js:870
+#: erpnext/selling/doctype/sales_order/sales_order.js:873
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/stock/doctype/material_request_item/material_request_item.json
#: erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -47002,7 +47073,7 @@ msgstr "Satış Siparişi Durumu"
msgid "Sales Order Trends"
msgstr "Satış Trendleri"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:268
msgid "Sales Order required for Item {0}"
msgstr "Ürün için Satış Siparişi gerekli {0}"
@@ -47172,7 +47243,7 @@ msgstr "Satış Ödeme Özeti"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:191
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:80
#: erpnext/accounts/report/gross_profit/gross_profit.js:50
-#: erpnext/accounts/report/gross_profit/gross_profit.py:371
+#: erpnext/accounts/report/gross_profit/gross_profit.py:377
#: erpnext/crm/workspace/crm/crm.json
#: erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
#: erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
@@ -47253,8 +47324,8 @@ msgstr "Satış Kaydı"
msgid "Sales Representative"
msgstr "Satış Temsilcisi"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:857
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:267
+#: erpnext/accounts/report/gross_profit/gross_profit.py:874
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:273
msgid "Sales Return"
msgstr "Satış İadesi"
@@ -47512,8 +47583,8 @@ msgstr "Cumartesi"
#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js:119
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:628
#: erpnext/accounts/doctype/ledger_merge/ledger_merge.js:75
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:292
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:328
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47551,7 +47622,7 @@ msgstr "Sazhen"
#: 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/public/js/utils/barcode_scanner.js:215
+#: erpnext/public/js/utils/barcode_scanner.js:241
#: erpnext/selling/doctype/quotation/quotation.json
#: erpnext/selling/doctype/sales_order/sales_order.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -47583,7 +47654,7 @@ msgstr "Tarama Modu"
msgid "Scan Serial No"
msgstr "Seri Numarasını Tara"
-#: erpnext/public/js/utils/barcode_scanner.js:179
+#: erpnext/public/js/utils/barcode_scanner.js:205
msgid "Scan barcode for item {0}"
msgstr "Ürün için barkod tarama {0}"
@@ -47597,7 +47668,7 @@ msgstr "Tarama modu etkin, mevcut miktar getirilmeyecek."
msgid "Scanned Cheque"
msgstr "taranan çek"
-#: erpnext/public/js/utils/barcode_scanner.js:247
+#: erpnext/public/js/utils/barcode_scanner.js:273
msgid "Scanned Quantity"
msgstr "Taranan Miktar"
@@ -47891,7 +47962,7 @@ msgid "Segregate Serial / Batch Bundle"
msgstr "Seri / Parti Paketini Ayır"
#: erpnext/buying/doctype/purchase_order/purchase_order.js:250
-#: erpnext/selling/doctype/sales_order/sales_order.js:1107
+#: erpnext/selling/doctype/sales_order/sales_order.js:1110
#: erpnext/selling/doctype/sales_order/sales_order_list.js:96
#: erpnext/selling/report/sales_analytics/sales_analytics.js:93
msgid "Select"
@@ -47913,15 +47984,15 @@ msgstr "Satış Siparişi için Alternatif Ürünleri Seçin"
msgid "Select Attribute Values"
msgstr "Özellik Değerlerini Seç"
-#: erpnext/selling/doctype/sales_order/sales_order.js:853
+#: erpnext/selling/doctype/sales_order/sales_order.js:856
msgid "Select BOM"
msgstr "Ürün Ağacı Seçin"
-#: erpnext/selling/doctype/sales_order/sales_order.js:834
+#: erpnext/selling/doctype/sales_order/sales_order.js:837
msgid "Select BOM and Qty for Production"
msgstr "Üretim için Ürün Ağacı ve Miktar Seçin"
-#: erpnext/selling/doctype/sales_order/sales_order.js:985
+#: erpnext/selling/doctype/sales_order/sales_order.js:988
msgid "Select BOM, Qty and For Warehouse"
msgstr "Ürün Ağacını, Miktarı ve Depoyu Seçin"
@@ -47951,7 +48022,7 @@ msgstr "Sütunları ve Filtreleri Seçin"
msgid "Select Company"
msgstr "Şirket Seç"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:468
+#: erpnext/manufacturing/doctype/job_card/job_card.js:476
msgid "Select Corrective Operation"
msgstr "Düzeltici Faaliyet Seçimi"
@@ -47992,7 +48063,7 @@ msgstr "Sevkiyat Adresini Seçin "
msgid "Select DocType"
msgstr "Belge Tipi Seçin"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:186
+#: erpnext/manufacturing/doctype/job_card/job_card.js:194
msgid "Select Employees"
msgstr "Personel Seçin"
@@ -48000,12 +48071,12 @@ msgstr "Personel Seçin"
msgid "Select Finished Good"
msgstr "Bitmiş Ürünü Seçin"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1186
-#: erpnext/selling/doctype/sales_order/sales_order.js:1198
+#: erpnext/selling/doctype/sales_order/sales_order.js:1189
+#: erpnext/selling/doctype/sales_order/sales_order.js:1201
msgid "Select Items"
msgstr "Ürünleri Seçin"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1072
+#: erpnext/selling/doctype/sales_order/sales_order.js:1075
msgid "Select Items based on Delivery Date"
msgstr "Ürünleri Teslimat Tarihine Göre Seçin"
@@ -48016,7 +48087,7 @@ msgstr "Kalite Kontrolü için Ürün Seçimi"
#. Label of the select_items_to_manufacture_section (Section Break) field in
#. DocType 'Production Plan'
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:881
+#: erpnext/selling/doctype/sales_order/sales_order.js:884
msgid "Select Items to Manufacture"
msgstr "Üretilecek Ürünleri Seçin"
@@ -48030,7 +48101,7 @@ msgstr "Teslimat Tarihine Kadar Ürün Seçin"
msgid "Select Job Worker Address"
msgstr "Alt Yüklenici Adresini Seçin"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1118
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1127
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:955
msgid "Select Loyalty Program"
msgstr "Sadakat Programı Seç"
@@ -48164,7 +48235,7 @@ msgstr "{1} satırındaki {0} kalemi için finans defterini seçin"
msgid "Select item group"
msgstr "Ürün Grubunu Seçin"
-#: erpnext/manufacturing/doctype/bom/bom.js:376
+#: erpnext/manufacturing/doctype/bom/bom.js:397
msgid "Select template item"
msgstr "Şablon öğesini seçin"
@@ -48181,7 +48252,7 @@ msgstr "İşlemin gerçekleştirileceği Varsayılan İş İstasyonunu seçin.
msgid "Select the Item to be manufactured."
msgstr "Üretilecek Ürünleri Seçin."
-#: erpnext/manufacturing/doctype/bom/bom.js:858
+#: erpnext/manufacturing/doctype/bom/bom.js:879
msgid "Select the Item to be manufactured. The Item name, UoM, Company, and Currency will be fetched automatically."
msgstr "Üretilecek Ürünü seçin. Ürün adı, Ölçü Birimi, Şirket ve Para Birimi otomatik olarak alınacaktır."
@@ -48202,11 +48273,11 @@ msgstr "Tarihi seçin"
msgid "Select the date and your timezone"
msgstr "Tarihi ve saat diliminizi seçin"
-#: erpnext/manufacturing/doctype/bom/bom.js:877
+#: erpnext/manufacturing/doctype/bom/bom.js:898
msgid "Select the raw materials (Items) required to manufacture the Item"
msgstr "Ürünü üretmek için gerekli ham maddeleri seçin"
-#: erpnext/manufacturing/doctype/bom/bom.js:431
+#: erpnext/manufacturing/doctype/bom/bom.js:452
msgid "Select variant item code for the template item {0}"
msgstr "Şablon ürün için değişken ürün kodunu seçin {0}"
@@ -48291,7 +48362,7 @@ msgstr "Varlığı Sat"
msgid "Selling"
msgstr "Satış"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:330
+#: erpnext/accounts/report/gross_profit/gross_profit.py:336
msgid "Selling Amount"
msgstr "Satış Tutarı"
@@ -48463,7 +48534,7 @@ msgstr "Seri ve Parti Ayarları"
msgid "Serial / Batch Bundle"
msgstr "Seri ve Parti Paketi"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:441
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:442
msgid "Serial / Batch Bundle Missing"
msgstr "Seri / Toplu Paket Eksik"
@@ -48540,7 +48611,7 @@ msgstr "Seri ve Parti Numaraları"
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:65
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:149
#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:37
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:409
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:436
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:38
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:60
#: erpnext/stock/report/stock_ledger/stock_ledger.py:336
@@ -48640,7 +48711,7 @@ msgstr "Ürün {0} için Seri no zorunludur"
msgid "Serial No {0} already exists"
msgstr "Seri No {0} zaten mevcut"
-#: erpnext/public/js/utils/barcode_scanner.js:321
+#: erpnext/public/js/utils/barcode_scanner.js:347
msgid "Serial No {0} already scanned"
msgstr "Seri No {0} zaten tarandı"
@@ -48661,7 +48732,7 @@ msgstr "Seri No {0} mevcut değil"
msgid "Serial No {0} does not exists"
msgstr "Seri No {0} mevcut değil"
-#: erpnext/public/js/utils/barcode_scanner.js:402
+#: erpnext/public/js/utils/barcode_scanner.js:436
msgid "Serial No {0} is already added"
msgstr "Seri No {0} zaten eklendi"
@@ -48689,7 +48760,7 @@ msgstr "Seri No {0} bulunamadı"
msgid "Serial No: {0} has already been transacted into another POS Invoice."
msgstr "Seri No: {0} başka bir POS Faturasına aktarılmış."
-#: erpnext/public/js/utils/barcode_scanner.js:271
+#: erpnext/public/js/utils/barcode_scanner.js:297
#: erpnext/public/js/utils/serial_no_batch_selector.js:16
#: erpnext/public/js/utils/serial_no_batch_selector.js:190
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:50
@@ -49186,8 +49257,8 @@ msgstr "Birim Fiyatı Elle Ayarla"
msgid "Set Default Supplier"
msgstr "Varsayılan Tedarikçi"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:339
-#: erpnext/manufacturing/doctype/job_card/job_card.js:408
+#: erpnext/manufacturing/doctype/job_card/job_card.js:347
+#: erpnext/manufacturing/doctype/job_card/job_card.js:416
msgid "Set Finished Good Quantity"
msgstr "Bitmiş Ürün Miktarını Ayarlayın"
@@ -49218,11 +49289,11 @@ msgstr "Bu Bölgede Ürün Grubu bazında bütçeler belirleyin. Dağıtımı ay
msgid "Set Landed Cost Based on Purchase Invoice Rate"
msgstr "Alış Faturası Fiyatına Göre İndirgenmiş Maliyeti Belirle"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1130
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1139
msgid "Set Loyalty Program"
msgstr "Sadakat Programı Ayarla"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:312
msgid "Set New Release Date"
msgstr "Yeni Yayın Tarihi Belirle"
@@ -49251,7 +49322,7 @@ msgstr "Şifre Belirle"
msgid "Set Posting Date"
msgstr "Kayıt Tarihini Ayarla"
-#: erpnext/manufacturing/doctype/bom/bom.js:904
+#: erpnext/manufacturing/doctype/bom/bom.js:925
msgid "Set Process Loss Item Quantity"
msgstr "Süreç Kaybı Kalem Miktarını Ayarla"
@@ -49265,7 +49336,7 @@ msgstr "Proje Durumunu Ayarla"
msgid "Set Project and all Tasks to status {0}?"
msgstr "Proje ve tüm Görevlerin durumunu {0} olarak ayarla?"
-#: erpnext/manufacturing/doctype/bom/bom.js:905
+#: erpnext/manufacturing/doctype/bom/bom.js:926
msgid "Set Quantity"
msgstr "Miktarı Ayarla"
@@ -49372,7 +49443,7 @@ msgstr "Stokta olmayan ürünler için varsayılan {0} hesabını ayarlayın"
msgid "Set fieldname from which you want to fetch the data from the parent form."
msgstr "Üst formdan veri almak istediğiniz alanı ayarlayın."
-#: erpnext/manufacturing/doctype/bom/bom.js:894
+#: erpnext/manufacturing/doctype/bom/bom.js:915
msgid "Set quantity of process loss item:"
msgstr "İşlem kaybı kaleminin miktarını ayarlayın:"
@@ -49402,15 +49473,15 @@ msgstr "Durumu manuel olarak ayarlayın."
msgid "Set this if the customer is a Public Administration company."
msgstr "Müşteri bir Kamu Yönetimi şirketi ise bunu ayarlayın."
-#: erpnext/assets/doctype/asset/asset.py:750
+#: erpnext/assets/doctype/asset/asset.py:766
msgid "Set {0} in asset category {1} for company {2}"
msgstr "Şirket {2} için {1} varlık kategorisinde {0} değerini ayarlayın"
-#: erpnext/assets/doctype/asset/asset.py:1083
+#: erpnext/assets/doctype/asset/asset.py:1099
msgid "Set {0} in asset category {1} or company {2}"
msgstr "Varlık kategorisi {1} veya şirket {2} için {0} değerini ayarlayın"
-#: erpnext/assets/doctype/asset/asset.py:1080
+#: erpnext/assets/doctype/asset/asset.py:1096
msgid "Set {0} in company {1}"
msgstr "{1} şirketinde {0} Ayarlayın"
@@ -49477,7 +49548,7 @@ msgstr "Hesabın Şirket Hesabı olarak ayarlanması Banka Mutabakatı için ger
msgid "Setting up company"
msgstr "Şirket kuruluyor"
-#: erpnext/manufacturing/doctype/bom/bom.py:1051
+#: erpnext/manufacturing/doctype/bom/bom.py:1088
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr ""
@@ -49610,7 +49681,7 @@ msgid "Shift Name"
msgstr "Vardiya Adı"
#. Name of a DocType
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:243
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:249
#: erpnext/stock/doctype/shipment/shipment.json
msgid "Shipment"
msgstr "Sevkiyat"
@@ -49661,7 +49732,7 @@ msgstr "Sevkiyat Türü"
msgid "Shipment details"
msgstr "Sevkiyat detayları"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:787
msgid "Shipments"
msgstr "Sevkiyatlar"
@@ -50347,7 +50418,7 @@ msgstr ""
msgid "Source Document Name"
msgstr "Kaynak Belge Adı"
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:478
msgid "Source Document No"
msgstr ""
@@ -50397,7 +50468,7 @@ msgstr "Kaynak Türü"
#. Label of the s_warehouse (Link) field in DocType 'Stock Entry Detail'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/manufacturing/doctype/bom/bom.js:403
+#: erpnext/manufacturing/doctype/bom/bom.js:424
#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
@@ -50425,7 +50496,7 @@ msgstr "Kaynak Depo Adresi"
msgid "Source Warehouse Address Link"
msgstr "Kaynak Depo Adres Bağlantısı"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1154
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr "{0} satırı için Kaynak Depo zorunludur."
@@ -50521,7 +50592,7 @@ msgstr "Sorunu Böl"
msgid "Split Qty"
msgstr "Bölünmüş Miktar"
-#: erpnext/assets/doctype/asset/asset.py:1222
+#: erpnext/assets/doctype/asset/asset.py:1238
msgid "Split Quantity must be less than Asset Quantity"
msgstr "Bölünmüş Miktar, Varlık Miktarından az olmalıdır"
@@ -50714,7 +50785,7 @@ msgstr "Silme İşlemini Başlat"
msgid "Start Import"
msgstr "İçe Aktarmayı Başlat"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:180
+#: erpnext/manufacturing/doctype/job_card/job_card.js:188
#: erpnext/manufacturing/doctype/workstation/workstation.js:124
msgid "Start Job"
msgstr "İşi Başlat"
@@ -51023,14 +51094,14 @@ msgstr "Mahalle"
#: erpnext/setup/doctype/driver/driver.json
#: erpnext/setup/doctype/employee/employee.json
#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:323
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:358
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:329
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:364
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_trip/delivery_trip.json
#: erpnext/stock/doctype/material_request/material_request.json
#: erpnext/stock/doctype/pick_list/pick_list.json
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:276
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:305
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:283
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:312
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
#: erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
@@ -51109,8 +51180,8 @@ msgstr "Stok"
#: erpnext/accounts/doctype/account/account.json
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:50
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:73
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1337
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1363
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1339
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1365
#: erpnext/accounts/report/account_balance/account_balance.js:58
msgid "Stock Adjustment"
msgstr "Stok Ayarlama"
@@ -51267,7 +51338,7 @@ msgstr ""
msgid "Stock Entry Type"
msgstr "Stok Hareket Türü"
-#: erpnext/stock/doctype/pick_list/pick_list.py:1384
+#: erpnext/stock/doctype/pick_list/pick_list.py:1396
msgid "Stock Entry has been already created against this Pick List"
msgstr "Stok Girişi bu Seçim Listesine karşı zaten oluşturuldu"
@@ -51501,14 +51572,14 @@ msgstr "Stok Yeniden Gönderim Ayarları"
#: erpnext/stock/doctype/pick_list/pick_list.js:166
#: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12
#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:714
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:666
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1225
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1563
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1576
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1590
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1604
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1618
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1635
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:668
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1227
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1565
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1578
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1592
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1606
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1620
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1637
#: erpnext/stock/doctype/stock_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51517,13 +51588,13 @@ msgstr "Stok Yeniden Gönderim Ayarları"
msgid "Stock Reservation"
msgstr "Stok Rezervasyonu"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1746
msgid "Stock Reservation Entries Cancelled"
msgstr "Stok Rezervasyon Girişleri İptal Edildi"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2156
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1698
msgid "Stock Reservation Entries Created"
msgstr "Stok Rezervasyon Girişleri Oluşturuldu"
@@ -51531,25 +51602,25 @@ msgstr "Stok Rezervasyon Girişleri Oluşturuldu"
#: erpnext/public/js/stock_reservation.js:308
#: erpnext/selling/doctype/sales_order/sales_order.js:444
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:352
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:354
#: erpnext/stock/report/reserved_stock/reserved_stock.js:53
#: erpnext/stock/report/reserved_stock/reserved_stock.py:171
msgid "Stock Reservation Entry"
msgstr "Stok Rezervasyon Girişi"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:528
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:530
msgid "Stock Reservation Entry cannot be updated as it has been delivered."
msgstr "Stok Rezervasyon Girişi teslim edildiği için güncellenemiyor."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:522
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:524
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 "Bir Seçim Listesi için oluşturulan Stok Rezervi Girişi güncellenemez. Değişiklik yapmanız gerekiyorsa, mevcut girişi iptal etmenizi ve yeni bir giriş oluşturmanızı öneririz.\n"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:547
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:549
msgid "Stock Reservation Warehouse Mismatch"
msgstr "Rezerv Stok Depo Uyuşmazlığı"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:675
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:677
msgid "Stock Reservation can only be created against {0}."
msgstr "Stok Rezervasyonu yalnızca {0} karşılığında oluşturulabilir."
@@ -51584,7 +51655,7 @@ msgstr "Stok Rezerv Miktarı (Stok Ölçü Birimi)"
#. Label of a Link in the Stock Workspace
#: erpnext/setup/doctype/company/company.json
#: erpnext/setup/workspace/settings/settings.json
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:667
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:669
#: erpnext/stock/doctype/stock_settings/stock_settings.json
#: erpnext/stock/workspace/stock/stock.json
msgid "Stock Settings"
@@ -51790,11 +51861,11 @@ msgstr "Stok ve Üretim"
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr "{0} Grup Deposunda Stok Rezerve edilemez."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1510
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr "{0} Grup Deposunda Stok Rezerve edilemez."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:727
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:729
msgid "Stock cannot be updated against Purchase Receipt {0}"
msgstr "Stok Satın Alma İrsaliyesi {0} için güncellenemez"
@@ -51806,11 +51877,11 @@ msgstr "Aşağıdaki İrsaliyelere göre stok güncellenemez: {0}"
msgid "Stock cannot be updated because the invoice contains a drop shipping item. Please disable 'Update Stock' or remove the drop shipping item."
msgstr "Stok güncellenemiyor çünkü faturada drop shipping ürünü var. Lütfen 'Stok Güncelle'yi devre dışı bırakın veya drop shipping ürününü kaldırın."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1121
msgid "Stock has been unreserved for work order {0}."
msgstr "İş Emri {0} için ayrılmış stok iptal edildi."
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:323
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:325
msgid "Stock not available for Item {0} in Warehouse {1}."
msgstr "{1} Deposunda {0} Ürünü için stok mevcut değil."
@@ -52122,7 +52193,7 @@ msgstr "Alt Yüklenici Sipariş Kalemi"
msgid "Subcontracting Order Supplied Item"
msgstr "Alt Yüklenici Siparişi Tedarik Edilen Ürün"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:943
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:965
msgid "Subcontracting Order {0} created."
msgstr "Alt Sözleşme Siparişi {0} oluşturuldu."
@@ -52212,7 +52283,7 @@ msgstr "Konu"
msgid "Submit"
msgstr "Gönder"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:939
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:961
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:910
msgid "Submit Action Failed"
msgstr "Gönderim Eylemi Başarısız Oldu"
@@ -52663,7 +52734,7 @@ msgstr "Tedarik Edilen Miktar"
#: erpnext/selling/doctype/customer/customer.js:230
#: erpnext/selling/doctype/party_specific_item/party_specific_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:160
-#: erpnext/selling/doctype/sales_order/sales_order.js:1231
+#: erpnext/selling/doctype/sales_order/sales_order.js:1235
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/doctype/sms_center/sms_center.json
#: erpnext/setup/workspace/home/home.json
@@ -52674,7 +52745,7 @@ msgstr "Tedarik Edilen Miktar"
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
#: erpnext/stock/doctype/shipment/shipment.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:462
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:505
#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr "Tedarikçi"
@@ -52799,7 +52870,7 @@ msgstr "Tedarikçi Faturası"
msgid "Supplier Invoice Date"
msgstr "Tedarikçi Fatura Tarihi"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1730
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1732
msgid "Supplier Invoice Date cannot be greater than Posting Date"
msgstr "Tedarikçi Fatura Tarihi, Kaydedilme Tarihinden büyük olamaz"
@@ -52809,12 +52880,12 @@ msgstr "Tedarikçi Fatura Tarihi, Kaydedilme Tarihinden büyük olamaz"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:59
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/report/general_ledger/general_ledger.html:104
-#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/general_ledger/general_ledger.py:780
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr "Tedarikçi Fatura No"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1757
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1759
msgid "Supplier Invoice No exists in Purchase Invoice {0}"
msgstr "Tedarikçi Fatura Numarası, {0} nolu Satın Alma Faturasında bulunuyor."
@@ -53042,7 +53113,7 @@ msgstr "Tedarikçi Türü"
#. 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:62
+#: erpnext/manufacturing/doctype/job_card/job_card.js:70
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
msgid "Supplier Warehouse"
msgstr "Tedarikçi Deposu"
@@ -53375,7 +53446,7 @@ msgstr "Stopaj Vergisi Tutarı"
msgid "TDS Computation Summary"
msgstr "Stopaj Vergisi Hesaplama Özeti"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1514
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1516
msgid "TDS Deducted"
msgstr "Kesilen Stopaj Vergisi"
@@ -54230,7 +54301,7 @@ msgstr "Televizyon"
msgid "Template"
msgstr "Şablon"
-#: erpnext/manufacturing/doctype/bom/bom.js:355
+#: erpnext/manufacturing/doctype/bom/bom.js:376
msgid "Template Item"
msgstr "Şablon Ürünü"
@@ -54466,7 +54537,7 @@ msgstr "Şartlar ve Koşullar"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:182
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:68
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:221
-#: erpnext/accounts/report/gross_profit/gross_profit.py:399
+#: erpnext/accounts/report/gross_profit/gross_profit.py:411
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js:8
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:21
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:263
@@ -54565,7 +54636,7 @@ msgstr "Portaldan Teklif İsteğine Erişim Devre Dışı Bırakıldı. Erişime
msgid "The BOM which will be replaced"
msgstr "Değiştirilecek Ürün Ağacı"
-#: erpnext/stock/serial_batch_bundle.py:1378
+#: erpnext/stock/serial_batch_bundle.py:1394
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr "{0} Partisinin {2} deposunda negatif {1} değer var. Lütfen miktarı düzeltin."
@@ -54680,7 +54751,7 @@ msgstr "Hissedardan alanı boş bırakılamaz"
msgid "The field To Shareholder cannot be blank"
msgstr "Hissedara alanı boş bırakılamaz"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:399
msgid "The field {0} in row {1} is not set"
msgstr "{1} satırındaki {0} alanı ayarlanmamış"
@@ -54749,6 +54820,10 @@ msgstr "{0} iş kartı {1} durumundadır ve tamamlayamazsınız."
msgid "The job card {0} is in {1} state and you cannot start it again."
msgstr "İş kartı {0} {1} durumundadır ve tekrar başlatamazsınız."
+#: erpnext/public/js/utils/barcode_scanner.js:533
+msgid "The last scanned warehouse has been cleared and won't be set in the subsequently scanned items"
+msgstr ""
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.py:46
msgid "The lowest tier must have a minimum spent amount of 0. Customers need to be part of a tier as soon as they are enrolled in the program."
msgstr "En düşük seviye, minimum harcama tutarı olarak 0 değerine sahip olmalıdır. Müşteriler, programa dahil edildikleri anda bir seviyenin parçası olmalıdır."
@@ -54827,7 +54902,7 @@ msgstr "Kök hesap {0} bir grup olmalıdır"
msgid "The selected BOMs are not for the same item"
msgstr "Seçilen Ürün Ağaçları aynı ürün için değil"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:493
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:494
msgid "The selected change account {} doesn't belongs to Company {}."
msgstr "Seçilen değişim hesabı {} {} Şirketine ait değil."
@@ -54961,7 +55036,7 @@ msgstr "{0} {1} , bitmiş ürün {2} adına değerleme maliyetini hesaplamak iç
msgid "Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc."
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:579
+#: erpnext/assets/doctype/asset/asset.py:595
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr "Varlık üzerinde aktif bakım veya onarımlar var. Varlığı iptal etmeden önce bunların hepsini tamamlamanız gerekir."
@@ -55064,7 +55139,7 @@ msgstr "Bu Ürün {0} Kodlu Ürünün Bir Varyantıdır."
msgid "This Month's Summary"
msgstr "Bu Ayın Özeti"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:952
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:974
msgid "This PO has been fully subcontracted."
msgstr "Bu Satın Alma Emri tamamen alt yükleniciye bağlanmıştır."
@@ -55088,7 +55163,7 @@ msgstr "Bu eylem gelecekteki faturalandırmayı durduracaktır. Bu aboneliği ip
msgid "This action will unlink this account from any external service integrating ERPNext with your bank accounts. It cannot be undone. Are you certain ?"
msgstr "Bu eylem, bu hesabı ERPNext'i banka hesaplarınızla entegre eden herhangi bir harici hizmetten ayıracaktır. Geri alınamaz. Emin misiniz?"
-#: erpnext/assets/doctype/asset/asset.py:359
+#: erpnext/assets/doctype/asset/asset.py:360
msgid "This asset category is marked as non-depreciable. Please disable depreciation calculation or choose a different category."
msgstr ""
@@ -55100,7 +55175,7 @@ msgstr "Kuruluma bağlı tüm puan kartlarını kapsar"
msgid "This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?"
msgstr "Bu belge, {4} ürünü için {0} {1} sınırını aşmış. Aynı {2} için başka bir {3} mi oluşturuyorsunuz?"
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:483
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:489
msgid "This field is used to set the 'Customer'."
msgstr "Bu alan 'Müşteri'yi ayarlamak için kullanılır."
@@ -55110,11 +55185,11 @@ msgstr "Bu alan 'Müşteri'yi ayarlamak için kullanılır."
msgid "This filter will be applied to Journal Entry."
msgstr "Bu filtre Muhasebe Defterine uygulanacaktır."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:812
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:813
msgid "This invoice has already been paid."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:219
+#: erpnext/manufacturing/doctype/bom/bom.js:240
msgid "This is a Template BOM and will be used to make the work order for {0} of the item {1}"
msgstr "Bu bir Şablon Ürün Ağacıdır ve {0} miktarındaki {1} Ürünü için İş Emri oluşturmak amacıyla kullanılacaktır"
@@ -55187,7 +55262,7 @@ msgstr "Bu, bu Satış Elemanına karşı yapılan işlemlere dayanmaktadır. Ay
msgid "This is considered dangerous from accounting point of view."
msgstr "Bu durum muhasebe açısından tehlikeli kabul edilmektedir."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:531
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:533
msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice"
msgstr "Bu işlem, Satın Alma Faturası oluşturulduktan sonra Satın Alma İrsaliyesi oluşturulduğunda muhasebe işlemlerini yönetmek için yapılır"
@@ -55203,7 +55278,7 @@ msgstr "Bu, bitmiş ürünlerin üretiminde kullanılacak ham madde ürünleri i
msgid "This item filter has already been applied for the {0}"
msgstr "Bu ürün filtresi {0} için zaten uygulandı"
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:496
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:502
msgid "This option can be checked to edit the 'Posting Date' and 'Posting Time' fields."
msgstr "Bu seçenek, 'Gönderi Tarihi' ve 'Gönderi Saati' alanlarını düzenlemek için işaretlenebilir."
@@ -55239,7 +55314,7 @@ msgstr "Bu çizelge, Varlık {0} 'ın Satış Faturası {1} aracılığıyla iad
msgid "This schedule was created when Asset {0} was scrapped."
msgstr "Bu program, Varlık {0} hurdaya çıkarıldığında oluşturuldu."
-#: erpnext/assets/doctype/asset/asset.py:1356
+#: erpnext/assets/doctype/asset/asset.py:1372
msgid "This schedule was created when Asset {0} was {1} into new Asset {2}."
msgstr ""
@@ -55261,7 +55336,7 @@ msgstr "Bu çizelge, Varlık {0} Varlık Değeri Ayarlaması {1} aracılığıyl
msgid "This section allows the user to set the Body and Closing text of the Dunning Letter for the Dunning Type based on language, which can be used in Print."
msgstr "Bu bölüm, kullanıcının Yazdır'da kullanılabilecek dile bağlı olarak İhtar Mektubunun Gövde ve Kapanış metnini İhtar Türü için ayarlamasına olanak tanır."
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:489
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:495
msgid "This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc."
msgstr "Bu tablo, 'Ürün', 'Miktar', 'Birim Fiyat' vb. ile ilgili ayrıntıları ayarlamak için kullanılır."
@@ -55461,7 +55536,7 @@ msgstr "Zamanlayıcı belirtilen saati aştı."
#. Name of a DocType
#. Label of a Link in the Projects Workspace
#. Label of a shortcut in the Projects Workspace
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1014
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1023
#: erpnext/projects/doctype/timesheet/timesheet.json
#: erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py:26
#: erpnext/projects/report/timesheet_billing_summary/timesheet_billing_summary.py:59
@@ -55576,7 +55651,7 @@ msgstr "Başlık"
#. Label of the to_uom (Link) field in DocType 'UOM Conversion Factor'
#. Label of the to (Data) field in DocType 'Call Log'
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1046
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1055
#: erpnext/setup/doctype/uom_conversion_factor/uom_conversion_factor.json
#: erpnext/telephony/doctype/call_log/call_log.json
#: erpnext/templates/pages/projects.html:68
@@ -55947,7 +56022,7 @@ msgstr "Hedef Depo"
msgid "To Warehouse (Optional)"
msgstr "Depo (İsteğe bağlı)"
-#: erpnext/manufacturing/doctype/bom/bom.js:872
+#: erpnext/manufacturing/doctype/bom/bom.js:893
msgid "To add Operations tick the 'With Operations' checkbox."
msgstr "Operasyonları Yönetmek için 'Operasyonlar' kutusunu işaretleyin."
@@ -56022,11 +56097,11 @@ msgstr "Bunu geçersiz kılmak için {1} şirketinde '{0}' ayarını etkinleşti
msgid "To still proceed with editing this Attribute Value, enable {0} in Item Variant Settings."
msgstr "Bu Özellik Değerini düzenlemeye devam etmek için Ürün Varyant Ayarlarında {0} seçeneğini etkinleştirin."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:621
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:623
msgid "To submit the invoice without purchase order please set {0} as {1} in {2}"
msgstr "Alış irsaliyesi olmadan faturayı göndermek için {0} değerini {1} olarak {2} içinde ayarlayın"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:642
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:644
msgid "To submit the invoice without purchase receipt please set {0} as {1} in {2}"
msgstr "Satın alma irsaliyesi olmadan faturayı göndermek için {0} değerini {1} olarak {2} içinde ayarlayın"
@@ -56036,7 +56111,7 @@ msgid "To use a different finance book, please uncheck 'Include Default FB Asset
msgstr "Farklı bir finans defteri kullanmak için lütfen 'Varsayılan FD Varlıklarını Dahil Et' seçeneğinin işaretini kaldırın"
#: erpnext/accounts/report/financial_statements.py:603
-#: erpnext/accounts/report/general_ledger/general_ledger.py:304
+#: erpnext/accounts/report/general_ledger/general_ledger.py:310
#: erpnext/accounts/report/trial_balance/trial_balance.py:292
msgid "To use a different finance book, please uncheck 'Include Default FB Entries'"
msgstr "Farklı bir finans defteri kullanmak için lütfen 'Varsayılan FD Girişlerini Dahil Et' seçeneğinin işaretini kaldırın"
@@ -56130,7 +56205,7 @@ msgstr "Torr"
#: erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py:229
#: erpnext/accounts/report/financial_statements.py:699
#: erpnext/accounts/report/general_ledger/general_ledger.html:132
-#: erpnext/accounts/report/general_ledger/general_ledger.py:378
+#: erpnext/accounts/report/general_ledger/general_ledger.py:398
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:699
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:93
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:98
@@ -56939,7 +57014,7 @@ msgstr "Toplam katkı yüzdesi 100'e eşit olmalıdır"
msgid "Total hours: {0}"
msgstr "Toplam saat: {0}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:523
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:524
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:536
msgid "Total payments amount can't be greater than {}"
msgstr "Toplam ödeme tutarı {} miktarından büyük olamaz."
@@ -57599,7 +57674,7 @@ msgstr "BAE KDV Ayarları"
#: erpnext/quality_management/doctype/quality_review_objective/quality_review_objective.json
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
#: erpnext/selling/doctype/quotation_item/quotation_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1225
+#: erpnext/selling/doctype/sales_order/sales_order.js:1228
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:43
#: erpnext/selling/report/sales_analytics/sales_analytics.py:138
@@ -57673,7 +57748,7 @@ msgstr "Ölçü Birimi Dönüşüm Faktörü Detayı"
msgid "UOM Conversion Factor"
msgstr "Ölçü Birimi Dönüşüm Faktörü"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1387
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1404
msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}"
msgstr "Ölçü Birimi Dönüşüm faktörü ({0} -> {1}) {2} Ürünü için bulunamadı"
@@ -58057,11 +58132,11 @@ msgstr "Yaklaşan Takvim Etkinlikleri "
#: erpnext/accounts/doctype/account/account.js:204
#: erpnext/accounts/doctype/cost_center/cost_center.js:107
-#: erpnext/manufacturing/doctype/job_card/job_card.js:338
-#: erpnext/manufacturing/doctype/job_card/job_card.js:407
+#: erpnext/manufacturing/doctype/job_card/job_card.js:346
+#: erpnext/manufacturing/doctype/job_card/job_card.js:415
#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:500
#: erpnext/public/js/utils.js:608 erpnext/public/js/utils.js:912
-#: erpnext/public/js/utils/barcode_scanner.js:183
+#: erpnext/public/js/utils/barcode_scanner.js:209
#: erpnext/public/js/utils/serial_no_batch_selector.js:17
#: erpnext/public/js/utils/serial_no_batch_selector.js:191
#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js:179
@@ -58162,7 +58237,7 @@ msgstr "Projede Tüketilen Malzeme Maliyetini Güncelle"
#. Option for the 'Update Type' (Select) field in DocType 'BOM Update Log'
#. Label of the update_cost_section (Section Break) field in DocType 'BOM
#. Update Tool'
-#: erpnext/manufacturing/doctype/bom/bom.js:135
+#: erpnext/manufacturing/doctype/bom/bom.js:156
#: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.json
#: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json
msgid "Update Cost"
@@ -58256,7 +58331,7 @@ msgstr "Projenin güncelleme sıklığı"
msgid "Update latest price in all BOMs"
msgstr "Tüm Ürün Ağaçlarındaki Fiyatları Güncelle"
-#: erpnext/assets/doctype/asset/asset.py:401
+#: erpnext/assets/doctype/asset/asset.py:402
msgid "Update stock must be enabled for the purchase invoice {0}"
msgstr "Satın Alma faturası için stok güncelleme etkinleştirilmelidir {0}"
@@ -58272,7 +58347,7 @@ msgstr "Yeni iletişimlerde Potansiyel Müşteri ve Fırsat kayıtlarının değ
msgid "Update timestamp on new communication"
msgstr "Yeni İletişimde Zaman Damgasını Güncelle"
-#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:534
+#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:539
msgid "Updated successfully"
msgstr "Başarıyla Güncellendi"
@@ -58380,7 +58455,7 @@ msgstr "Ürün Bazlı Yeniden Kayıt Kullan"
#. Label of the use_multi_level_bom (Check) field in DocType 'Work Order'
#. Label of the use_multi_level_bom (Check) field in DocType 'Stock Entry'
-#: erpnext/manufacturing/doctype/bom/bom.js:337
+#: erpnext/manufacturing/doctype/bom/bom.js:358
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Use Multi-Level BOM"
@@ -58710,7 +58785,7 @@ msgstr "Toplu alım için geçerlilik tarihi ve geçerlilik tarihine kadar alanl
msgid "Valid till Date cannot be before Transaction Date"
msgstr "Geçerlilik Tarihi İşlem Tarihinden önce olamaz"
-#: erpnext/selling/doctype/quotation/quotation.py:154
+#: erpnext/selling/doctype/quotation/quotation.py:156
msgid "Valid till date cannot be before transaction date"
msgstr "Son geçerlilik tarihi işlem tarihinden önce olamaz"
@@ -58772,7 +58847,7 @@ msgstr "Kullanım ve Kullanım"
msgid "Validity in Days"
msgstr "Geçerlilik Gün olarak"
-#: erpnext/selling/doctype/quotation/quotation.py:361
+#: erpnext/selling/doctype/quotation/quotation.py:363
msgid "Validity period of this quotation has ended."
msgstr "Bu teklifin geçerlilik süresi sona ermiştir."
@@ -58821,7 +58896,7 @@ msgstr "Değerleme Yöntemi"
#. Label of the valuation_rate (Currency) field in DocType 'Stock
#. Reconciliation Item'
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:323
+#: erpnext/accounts/report/gross_profit/gross_profit.py:329
#: erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
#: erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json
#: erpnext/manufacturing/doctype/bom/bom.json
@@ -59050,7 +59125,7 @@ msgstr "Varyant Özelliği Hatası"
msgid "Variant Attributes"
msgstr "Varyant Özellikleri"
-#: erpnext/manufacturing/doctype/bom/bom.js:176
+#: erpnext/manufacturing/doctype/bom/bom.js:197
msgid "Variant BOM"
msgstr "Varyant Ürün Ağacı"
@@ -59072,8 +59147,8 @@ msgstr "Varyant Ayrıntıları Raporu"
msgid "Variant Field"
msgstr "Varyant Alanı"
-#: erpnext/manufacturing/doctype/bom/bom.js:291
-#: erpnext/manufacturing/doctype/bom/bom.js:370
+#: erpnext/manufacturing/doctype/bom/bom.js:312
+#: erpnext/manufacturing/doctype/bom/bom.js:391
msgid "Variant Item"
msgstr "Varyant Ürün"
@@ -59207,7 +59282,7 @@ msgstr "Video Ayarları"
#: erpnext/accounts/doctype/cost_center/cost_center_tree.js:56
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js:205
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:76
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:14
#: erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:24
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:167
@@ -59231,8 +59306,8 @@ msgstr "Video Ayarları"
#: erpnext/stock/doctype/item/item.js:142
#: erpnext/stock/doctype/item/item.js:150
#: erpnext/stock/doctype/item/item.js:158
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:228
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:239
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:232
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:243
#: erpnext/stock/doctype/stock_entry/stock_entry.js:297
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:46
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:62
@@ -59260,7 +59335,7 @@ msgstr "Genel Muhasebeyi Görüntüle"
msgid "View Leads"
msgstr "Müşteri Adaylarını Göster"
-#: erpnext/accounts/doctype/account/account_tree.js:275
+#: erpnext/accounts/doctype/account/account_tree.js:270
#: erpnext/stock/doctype/batch/batch.js:18
msgid "View Ledger"
msgstr "Defteri Göster"
@@ -59398,7 +59473,7 @@ msgstr "Belge Adı"
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:209
#: erpnext/accounts/report/general_ledger/general_ledger.js:49
-#: erpnext/accounts/report/general_ledger/general_ledger.py:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:735
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js:41
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:33
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:65
@@ -59437,7 +59512,7 @@ msgstr "Belge Miktarı"
#. Label of the voucher_subtype (Small Text) field in DocType 'GL Entry'
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:729
msgid "Voucher Subtype"
msgstr "Giriş Türü"
@@ -59469,7 +59544,7 @@ msgstr "Giriş Türü"
#: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1184
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:200
-#: erpnext/accounts/report/general_ledger/general_ledger.py:707
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
@@ -59490,7 +59565,7 @@ msgstr "Giriş Türü"
#: erpnext/stock/report/reserved_stock/reserved_stock.py:145
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:40
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:107
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:429
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:472
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:27
#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:114
#: erpnext/stock/report/stock_ledger/stock_ledger.py:320
@@ -59624,7 +59699,7 @@ msgstr "Rezervasyonsuz Müşteri"
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/gross_profit/gross_profit.js:56
-#: erpnext/accounts/report/gross_profit/gross_profit.py:308
+#: erpnext/accounts/report/gross_profit/gross_profit.py:314
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:41
#: erpnext/accounts/report/purchase_register/purchase_register.js:52
#: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py:28
@@ -59674,7 +59749,7 @@ msgstr "Rezervasyonsuz Müşteri"
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:350
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:352
#: erpnext/stock/doctype/warehouse/warehouse.json
#: erpnext/stock/page/stock_balance/stock_balance.js:11
#: erpnext/stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:25
@@ -59700,7 +59775,7 @@ msgstr "Rezervasyonsuz Müşteri"
#: erpnext/stock/report/reserved_stock/reserved_stock.py:96
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:34
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:138
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:442
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:485
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:21
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:47
#: erpnext/stock/report/stock_ageing/stock_ageing.js:30
@@ -59822,7 +59897,7 @@ msgid "Warehouse not found against the account {0}"
msgstr "Hesap {0} karşılığında depo bulunamadı."
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1160
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:426
msgid "Warehouse required for stock Item {0}"
msgstr "Stok Ürünü {0} için depo gereklidir"
@@ -60011,6 +60086,10 @@ msgstr "Garanti / Bakım Anlaşması Durumu"
msgid "Warranty Claim"
msgstr "Garanti Talebi"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:525
+msgid "Warranty Expiry (Serial)"
+msgstr ""
+
#. Label of the warranty_expiry_date (Date) field in DocType 'Serial No'
#. Label of the warranty_expiry_date (Date) field in DocType 'Warranty Claim'
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -60434,7 +60513,7 @@ msgstr "Devam Eden İş Deposu"
#. Entry'
#. Option for the 'From Voucher Type' (Select) field in DocType 'Stock
#. Reservation Entry'
-#: erpnext/manufacturing/doctype/bom/bom.js:167
+#: erpnext/manufacturing/doctype/bom/bom.js:188
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
@@ -60456,7 +60535,7 @@ msgstr "Devam Eden İş Deposu"
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:455
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:498
#: erpnext/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr "İş Emri"
@@ -60520,7 +60599,7 @@ msgstr "İş Emri bir Ürün Şablonuna karşı oluşturulamaz"
msgid "Work Order has been {0}"
msgstr "İş Emri {0}"
-#: erpnext/selling/doctype/sales_order/sales_order.js:823
+#: erpnext/selling/doctype/sales_order/sales_order.js:826
msgid "Work Order not created"
msgstr "İş Emri oluşturulmadı"
@@ -60533,7 +60612,7 @@ msgstr "İş Emri {0}: {1} operasyonu için İş Kartı bulunamadı"
msgid "Work Orders"
msgstr "İş Emirleri"
-#: erpnext/selling/doctype/sales_order/sales_order.js:908
+#: erpnext/selling/doctype/sales_order/sales_order.js:911
msgid "Work Orders Created: {0}"
msgstr "Oluşturulan İş Emirleri: {0}"
@@ -60973,7 +61052,7 @@ msgid "You can only have Plans with the same billing cycle in a Subscription"
msgstr "Abonelikte yalnızca aynı faturalama döngüsüne sahip Planlara sahip olabilirsiniz"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:412
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:876
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:885
msgid "You can only redeem max {0} points in this order."
msgstr "Bu siparişte en fazla {0} puan kullanabilirsiniz."
@@ -61001,7 +61080,7 @@ msgstr "Seri ve Parti Paketi {1} içinde zaten kullanılmış olduğu için seri
msgid "You can't redeem Loyalty Points having more value than the Total Amount."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:653
+#: erpnext/manufacturing/doctype/bom/bom.js:674
msgid "You cannot change the rate if BOM is mentioned against any Item."
msgstr "Herhangi bir Ürün için Ürün Ağacı belirtilmişse fiyatı değiştiremezsiniz."
@@ -61101,7 +61180,7 @@ msgstr "Henüz bir {0} oluşturmadınız."
msgid "You must select a customer before adding an item."
msgstr "Bir Ürün eklemeden önce Müşteri seçmelisiniz."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:267
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:268
msgid "You need to cancel POS Closing Entry {} to be able to cancel this document."
msgstr "Bu belgeyi iptal edebilmek için POS Kapanış Girişini {} iptal etmeniz gerekmektedir."
@@ -61198,7 +61277,7 @@ msgstr "Açıklama olarak"
msgid "as Title"
msgstr "Başlık olarak"
-#: erpnext/manufacturing/doctype/bom/bom.js:896
+#: erpnext/manufacturing/doctype/bom/bom.js:917
msgid "as a percentage of finished item quantity"
msgstr "bitmiş ürün miktarının yüzdesi olarak"
@@ -61218,7 +61297,7 @@ msgstr "{} ile"
msgid "cannot be greater than 100"
msgstr "100'den büyük olamaz"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:331
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:333
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1046
msgid "dated {0}"
msgstr "{0} tarihli"
@@ -61591,7 +61670,7 @@ msgstr ""
msgid "{0} account is not of type {1}"
msgstr "{0} hesabı {1} türünde değil"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:496
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:498
msgid "{0} account not found while submitting purchase receipt"
msgstr "{0} Satın Alma İrsaliyesi gönderilirken hesap bulunamadı"
@@ -61615,7 +61694,7 @@ msgstr "{0} Satış Siparişi {1}"
msgid "{0} already has a Parent Procedure {1}."
msgstr "{0} zaten bir Üst Prosedüre {1} sahip."
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:544
msgid "{0} and {1}"
msgstr "{0} ve {1}"
@@ -61786,6 +61865,10 @@ msgstr ""
msgid "{0} is required"
msgstr "{0} gerekli"
+#: erpnext/assets/doctype/asset/asset.py:431
+msgid "{0} is still in Draft. Please submit it before saving the Asset."
+msgstr ""
+
#: erpnext/manufacturing/doctype/work_order/work_order.js:454
msgid "{0} items in progress"
msgstr "{0} devam eden ürünler"
@@ -61871,6 +61954,10 @@ msgstr "{0} varyantları oluşturuldu."
msgid "{0} will be given as discount."
msgstr "{0} indirim olarak verilecektir."
+#: erpnext/public/js/utils/barcode_scanner.js:523
+msgid "{0} will be set as the {1} in subsequently scanned items"
+msgstr ""
+
#: erpnext/manufacturing/doctype/job_card/job_card.py:883
msgid "{0} {1}"
msgstr "{0} {1}"
@@ -61883,7 +61970,7 @@ msgstr "{0} {1} Manuel olarak"
msgid "{0} {1} Partially Reconciled"
msgstr "{0} {1} Kısmen Matubakat Sağlandı"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:516
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:518
msgid "{0} {1} cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr "{0} {1} güncellenemez. Değişiklik yapmanız gerekiyorsa, mevcut girişi iptal etmenizi ve yeni bir giriş oluşturmanızı öneririz."
diff --git a/erpnext/locale/vi.po b/erpnext/locale/vi.po
index df8d1ba312d..980c7abfd68 100644
--- a/erpnext/locale/vi.po
+++ b/erpnext/locale/vi.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: frappe\n"
"Report-Msgid-Bugs-To: hello@frappe.io\n"
-"POT-Creation-Date: 2025-08-10 09:37+0000\n"
-"PO-Revision-Date: 2025-08-11 17:06\n"
+"POT-Creation-Date: 2025-08-17 09:36+0000\n"
+"PO-Revision-Date: 2025-08-17 18:14\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Vietnamese\n"
"MIME-Version: 1.0\n"
@@ -143,7 +143,7 @@ msgstr ""
msgid "% Delivered"
msgstr "% Đã giao"
-#: erpnext/manufacturing/doctype/bom/bom.js:892
+#: erpnext/manufacturing/doctype/bom/bom.js:913
#, python-format
msgid "% Finished Item Quantity"
msgstr ""
@@ -988,6 +988,10 @@ msgstr ""
msgid "ACC-PINV-.YYYY.-"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:531
+msgid "AMC Expiry (Serial)"
+msgstr ""
+
#. Label of the amc_expiry_date (Date) field in DocType 'Serial No'
#. Label of the amc_expiry_date (Date) field in DocType 'Warranty Claim'
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -1215,7 +1219,7 @@ msgstr ""
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:30
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:190
#: erpnext/accounts/report/general_ledger/general_ledger.js:38
-#: erpnext/accounts/report/general_ledger/general_ledger.py:652
+#: erpnext/accounts/report/general_ledger/general_ledger.py:672
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js:30
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:30
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
@@ -1426,7 +1430,7 @@ msgstr ""
msgid "Account is not set for the dashboard chart {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:755
+#: erpnext/assets/doctype/asset/asset.py:771
msgid "Account not Found"
msgstr ""
@@ -1808,8 +1812,8 @@ msgstr ""
msgid "Accounting Entries"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:789
-#: erpnext/assets/doctype/asset/asset.py:804
+#: erpnext/assets/doctype/asset/asset.py:805
+#: erpnext/assets/doctype/asset/asset.py:820
#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:559
msgid "Accounting Entry for Asset"
msgstr ""
@@ -1823,29 +1827,29 @@ msgstr ""
msgid "Accounting Entry for Landed Cost Voucher for SCR {0}"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:814
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:816
msgid "Accounting Entry for Service"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:999
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1020
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1038
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1059
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1080
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1104
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1211
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1447
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1469
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1001
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1022
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1040
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1061
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1082
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1106
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1213
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1449
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1471
#: erpnext/controllers/stock_controller.py:579
#: erpnext/controllers/stock_controller.py:596
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:909
#: erpnext/stock/doctype/stock_entry/stock_entry.py:1627
#: erpnext/stock/doctype/stock_entry/stock_entry.py:1641
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:613
msgid "Accounting Entry for Stock"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:716
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:718
msgid "Accounting Entry for {0}"
msgstr ""
@@ -2388,9 +2392,9 @@ msgstr ""
#: erpnext/buying/doctype/supplier/supplier.js:128
#: erpnext/buying/doctype/supplier/supplier.js:137
#: erpnext/buying/doctype/supplier_scorecard_scoring_standing/supplier_scorecard_scoring_standing.json
-#: erpnext/manufacturing/doctype/bom/bom.js:139
-#: erpnext/manufacturing/doctype/bom/bom.js:150
-#: erpnext/manufacturing/doctype/bom/bom.js:161
+#: erpnext/manufacturing/doctype/bom/bom.js:160
+#: erpnext/manufacturing/doctype/bom/bom.js:171
+#: erpnext/manufacturing/doctype/bom/bom.js:182
#: erpnext/projects/doctype/project/project.js:87
#: erpnext/projects/doctype/project/project.js:95
#: erpnext/projects/doctype/project/project.js:151
@@ -2679,7 +2683,7 @@ msgstr ""
#: erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json
#: erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
#: erpnext/crm/doctype/lead/lead.js:85
-#: erpnext/manufacturing/doctype/bom/bom.js:922
+#: erpnext/manufacturing/doctype/bom/bom.js:943
#: erpnext/manufacturing/doctype/plant_floor/stock_summary_template.html:55
#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:235
#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:264
@@ -2696,7 +2700,7 @@ msgstr ""
msgid "Add / Edit Prices"
msgstr ""
-#: erpnext/accounts/doctype/account/account_tree.js:252
+#: erpnext/accounts/doctype/account/account_tree.js:248
msgid "Add Child"
msgstr ""
@@ -2792,7 +2796,7 @@ msgid "Add Quote"
msgstr ""
#. Label of the add_raw_materials (Button) field in DocType 'BOM Operation'
-#: erpnext/manufacturing/doctype/bom/bom.js:920
+#: erpnext/manufacturing/doctype/bom/bom.js:941
#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
msgid "Add Raw Materials"
msgstr ""
@@ -3369,11 +3373,11 @@ msgstr ""
msgid "Adjust Asset Value"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1078
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1087
msgid "Adjustment Against"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:644
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:646
msgid "Adjustment based on Purchase Invoice rate"
msgstr ""
@@ -3563,7 +3567,7 @@ msgstr ""
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
#: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:39
#: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:91
-#: erpnext/accounts/report/general_ledger/general_ledger.py:721
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Account"
msgstr ""
@@ -3582,7 +3586,7 @@ msgstr ""
msgid "Against Customer Order {0}"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:1191
+#: erpnext/selling/doctype/sales_order/sales_order.js:1194
msgid "Against Default Supplier"
msgstr ""
@@ -3674,13 +3678,13 @@ msgstr ""
msgid "Against Stock Entry"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:329
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:331
msgid "Against Supplier Invoice {0}"
msgstr ""
#. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry'
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:741
+#: erpnext/accounts/report/general_ledger/general_ledger.py:774
msgid "Against Voucher"
msgstr ""
@@ -3704,7 +3708,7 @@ msgstr ""
#: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/general_ledger/general_ledger.py:772
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr ""
@@ -3995,11 +3999,11 @@ msgstr ""
msgid "All items are already requested"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1335
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1342
msgid "All items have already been Invoiced/Returned"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1196
msgid "All items have already been received"
msgstr ""
@@ -4025,7 +4029,7 @@ msgstr ""
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:840
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:847
msgid "All these items have already been Invoiced/Returned"
msgstr ""
@@ -4090,7 +4094,7 @@ msgstr ""
#: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json
#: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
#: erpnext/accounts/doctype/unreconcile_payment_entries/unreconcile_payment_entries.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:378
+#: erpnext/accounts/report/gross_profit/gross_profit.py:384
#: erpnext/public/js/utils/unreconcile.js:87
msgid "Allocated Amount"
msgstr ""
@@ -4572,7 +4576,7 @@ msgstr ""
msgid "Also you can't switch back to FIFO after setting the valuation method to Moving Average for this item."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:200
+#: erpnext/manufacturing/doctype/bom/bom.js:221
#: erpnext/manufacturing/doctype/work_order/work_order.js:151
#: erpnext/manufacturing/doctype/work_order/work_order.js:166
#: erpnext/public/js/utils.js:518
@@ -5668,11 +5672,11 @@ msgstr ""
msgid "As there are reserved stock, you cannot disable {0}."
msgstr ""
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1031
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1046
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:1743
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1760
msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}."
msgstr ""
@@ -5722,7 +5726,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/workspace/assets/assets.json
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:221
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:225
#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Asset"
msgstr ""
@@ -5840,7 +5844,7 @@ msgstr ""
msgid "Asset Depreciation Schedule {0} for Asset {1} and Finance Book {2} already exists."
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:176
+#: erpnext/assets/doctype/asset/asset.py:177
msgid "Asset Depreciation Schedules created/updated:
{0}
Please check, edit if needed, and submit the Asset."
msgstr ""
@@ -5913,7 +5917,7 @@ msgstr ""
#. Label of a Link in the Assets Workspace
#: erpnext/assets/doctype/asset_movement/asset_movement.json
#: erpnext/assets/workspace/assets/assets.json
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:232
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:236
msgid "Asset Movement"
msgstr ""
@@ -5922,7 +5926,7 @@ msgstr ""
msgid "Asset Movement Item"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:1035
+#: erpnext/assets/doctype/asset/asset.py:1051
msgid "Asset Movement record {0} created"
msgstr ""
@@ -6051,11 +6055,11 @@ msgstr ""
msgid "Asset Value Analytics"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:208
+#: erpnext/assets/doctype/asset/asset.py:209
msgid "Asset cancelled"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:584
+#: erpnext/assets/doctype/asset/asset.py:600
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr ""
@@ -6067,15 +6071,15 @@ msgstr ""
msgid "Asset capitalized after Asset Capitalization {0} was submitted"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:217
+#: erpnext/assets/doctype/asset/asset.py:218
msgid "Asset created"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:1275
+#: erpnext/assets/doctype/asset/asset.py:1291
msgid "Asset created after being split from Asset {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:220
+#: erpnext/assets/doctype/asset/asset.py:221
msgid "Asset deleted"
msgstr ""
@@ -6116,7 +6120,7 @@ msgstr ""
msgid "Asset sold"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:195
+#: erpnext/assets/doctype/asset/asset.py:196
msgid "Asset submitted"
msgstr ""
@@ -6124,7 +6128,7 @@ msgstr ""
msgid "Asset transferred to Location {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:1284
+#: erpnext/assets/doctype/asset/asset.py:1300
msgid "Asset updated after being split into Asset {0}"
msgstr ""
@@ -6215,7 +6219,7 @@ msgstr ""
msgid "Assets {assets_link} created for {item_code}"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:193
+#: erpnext/manufacturing/doctype/job_card/job_card.js:201
msgid "Assign Job to Employee"
msgstr ""
@@ -6265,11 +6269,11 @@ msgstr ""
msgid "At least one account with exchange gain or loss is required"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:1141
+#: erpnext/assets/doctype/asset/asset.py:1157
msgid "At least one asset has to be selected."
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:930
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:965
msgid "At least one invoice has to be selected."
msgstr ""
@@ -6277,7 +6281,7 @@ msgstr ""
msgid "At least one item should be entered with negative quantity in return document"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:484
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:485
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:540
msgid "At least one mode of payment is required for POS invoice."
msgstr ""
@@ -6827,7 +6831,7 @@ msgstr ""
msgid "Available Stock for Packing Items"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:313
+#: erpnext/assets/doctype/asset/asset.py:314
msgid "Available for use date is required"
msgstr ""
@@ -6844,7 +6848,7 @@ msgstr ""
msgid "Available-for-use Date"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:418
+#: erpnext/assets/doctype/asset/asset.py:419
msgid "Available-for-use Date should be after purchase date"
msgstr ""
@@ -6899,7 +6903,7 @@ msgstr ""
msgid "Avg. Selling Price List Rate"
msgstr ""
-#: erpnext/accounts/report/gross_profit/gross_profit.py:316
+#: erpnext/accounts/report/gross_profit/gross_profit.py:322
msgid "Avg. Selling Rate"
msgstr ""
@@ -6954,7 +6958,7 @@ msgstr ""
#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js:5
#: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:109
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1005
+#: erpnext/selling/doctype/sales_order/sales_order.js:1008
#: erpnext/stock/doctype/material_request/material_request.js:334
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/stock/doctype/stock_entry/stock_entry.js:633
@@ -6968,7 +6972,7 @@ msgstr ""
msgid "BOM 1"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1519
+#: erpnext/manufacturing/doctype/bom/bom.py:1556
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr ""
@@ -7187,7 +7191,7 @@ msgstr ""
msgid "BOM Website Operation"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.js:1208
+#: erpnext/stock/doctype/stock_entry/stock_entry.js:1214
msgid "BOM and Manufacturing Quantity are required"
msgstr ""
@@ -7210,19 +7214,19 @@ msgstr ""
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1332
+#: erpnext/manufacturing/doctype/bom/bom.py:1369
msgid "BOM {0} does not belong to Item {1}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1314
+#: erpnext/manufacturing/doctype/bom/bom.py:1351
msgid "BOM {0} must be active"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1317
+#: erpnext/manufacturing/doctype/bom/bom.py:1354
msgid "BOM {0} must be submitted"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:734
+#: erpnext/manufacturing/doctype/bom/bom.py:765
msgid "BOM {0} not found for the item {1}"
msgstr ""
@@ -7293,7 +7297,7 @@ msgstr ""
msgid "Balance (Dr - Cr)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:673
+#: erpnext/accounts/report/general_ledger/general_ledger.py:693
msgid "Balance ({0})"
msgstr ""
@@ -7685,7 +7689,7 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
-#: erpnext/public/js/utils/barcode_scanner.js:282
+#: erpnext/public/js/utils/barcode_scanner.js:308
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#: erpnext/stock/doctype/item_barcode/item_barcode.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -7906,6 +7910,7 @@ msgid "Batch Details"
msgstr ""
#: erpnext/stock/doctype/batch/batch.py:197
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:455
msgid "Batch Expiry Date"
msgstr ""
@@ -7958,7 +7963,7 @@ msgstr ""
#: 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:2446
-#: erpnext/public/js/utils/barcode_scanner.js:260
+#: erpnext/public/js/utils/barcode_scanner.js:286
#: erpnext/public/js/utils/serial_no_batch_selector.js:438
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#: erpnext/stock/doctype/item_price/item_price.json
@@ -7979,7 +7984,7 @@ msgstr ""
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:81
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:160
#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:19
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:416
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:448
#: erpnext/stock/report/stock_ledger/stock_ledger.js:78
#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
#: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
@@ -7994,7 +7999,7 @@ msgstr ""
msgid "Batch No {0} does not exists"
msgstr ""
-#: erpnext/stock/utils.py:632
+#: erpnext/stock/utils.py:638
msgid "Batch No {0} is linked with Item {1} which has serial no. Please scan serial no instead."
msgstr ""
@@ -8062,7 +8067,7 @@ msgstr ""
msgid "Batch not created for item {} since it does not have a batch series."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:348
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:350
msgid "Batch {0} and Warehouse"
msgstr ""
@@ -8139,7 +8144,7 @@ msgstr ""
#. Label of a Card Break in the Manufacturing Workspace
#. Label of a Link in the Manufacturing Workspace
-#: erpnext/manufacturing/doctype/bom/bom.py:1188
+#: erpnext/manufacturing/doctype/bom/bom.py:1225
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8453,7 +8458,7 @@ msgid "Blanket Order Rate"
msgstr ""
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:268
msgid "Block Invoice"
msgstr ""
@@ -8651,7 +8656,7 @@ msgstr ""
#: erpnext/accounts/doctype/pricing_rule_brand/pricing_rule_brand.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:300
+#: erpnext/accounts/report/gross_profit/gross_profit.py:306
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:53
#: erpnext/accounts/report/sales_register/sales_register.js:64
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -8724,7 +8729,7 @@ msgstr ""
msgid "Brokerage"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:143
+#: erpnext/manufacturing/doctype/bom/bom.js:164
msgid "Browse BOM"
msgstr ""
@@ -8946,7 +8951,7 @@ msgstr ""
msgid "Buying & Selling Settings"
msgstr ""
-#: erpnext/accounts/report/gross_profit/gross_profit.py:337
+#: erpnext/accounts/report/gross_profit/gross_profit.py:343
msgid "Buying Amount"
msgstr ""
@@ -9617,11 +9622,11 @@ msgstr ""
msgid "Cannot covert to Group because Account Type is selected."
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:988
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:990
msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts."
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.py:1758
+#: erpnext/selling/doctype/sales_order/sales_order.py:1774
#: erpnext/stock/doctype/pick_list/pick_list.py:199
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 ""
@@ -9634,15 +9639,11 @@ msgstr ""
msgid "Cannot create return for consolidated invoice {0}."
msgstr ""
-#: erpnext/accounts/doctype/account/account_tree.js:241
-msgid "Cannot create root account."
-msgstr ""
-
-#: erpnext/manufacturing/doctype/bom/bom.py:1044
+#: erpnext/manufacturing/doctype/bom/bom.py:1081
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr ""
-#: erpnext/crm/doctype/opportunity/opportunity.py:277
+#: erpnext/crm/doctype/opportunity/opportunity.py:282
msgid "Cannot declare as lost, because Quotation has been made."
msgstr ""
@@ -9672,7 +9673,11 @@ msgstr ""
msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No."
msgstr ""
-#: erpnext/public/js/utils/barcode_scanner.js:54
+#: erpnext/public/js/utils/barcode_scanner.js:62
+msgid "Cannot find Item or Warehouse with this Barcode"
+msgstr ""
+
+#: erpnext/public/js/utils/barcode_scanner.js:63
msgid "Cannot find Item with this Barcode"
msgstr ""
@@ -9723,7 +9728,7 @@ msgstr ""
msgid "Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row"
msgstr ""
-#: erpnext/selling/doctype/quotation/quotation.py:283
+#: erpnext/selling/doctype/quotation/quotation.py:285
msgid "Cannot set as Lost as Sales Order is made."
msgstr ""
@@ -9910,7 +9915,7 @@ msgstr ""
msgid "Cash In Hand"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:321
msgid "Cash or Bank Account is mandatory for making payment entry"
msgstr ""
@@ -10536,8 +10541,8 @@ msgstr ""
#: erpnext/selling/doctype/sales_order/sales_order.js:591
#: erpnext/selling/doctype/sales_order/sales_order.js:623
#: erpnext/selling/doctype/sales_order/sales_order_list.js:66
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:319
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:276
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:325
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:283
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:170
#: erpnext/support/doctype/issue/issue.js:23
msgid "Close"
@@ -10642,7 +10647,7 @@ msgstr ""
msgid "Closing (Dr)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:379
+#: erpnext/accounts/report/general_ledger/general_ledger.py:399
msgid "Closing (Opening + Total)"
msgstr ""
@@ -11502,7 +11507,7 @@ msgstr ""
msgid "Company name not same"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:261
+#: erpnext/assets/doctype/asset/asset.py:262
msgid "Company of asset {0} and purchase document {1} doesn't matches."
msgstr ""
@@ -11545,7 +11550,7 @@ msgstr ""
msgid "Company {} does not exist yet. Taxes setup aborted."
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:528
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:529
msgid "Company {} does not match with POS Profile Company {}"
msgstr ""
@@ -11582,7 +11587,7 @@ msgstr ""
msgid "Complete"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:230
+#: erpnext/manufacturing/doctype/job_card/job_card.js:238
#: erpnext/manufacturing/doctype/workstation/workstation.js:151
msgid "Complete Job"
msgstr ""
@@ -11715,8 +11720,8 @@ msgstr ""
msgid "Completed Qty cannot be greater than 'Qty to Manufacture'"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:278
-#: erpnext/manufacturing/doctype/job_card/job_card.js:373
+#: erpnext/manufacturing/doctype/job_card/job_card.js:286
+#: erpnext/manufacturing/doctype/job_card/job_card.js:381
#: erpnext/manufacturing/doctype/workstation/workstation.js:296
msgid "Completed Quantity"
msgstr ""
@@ -12608,13 +12613,13 @@ msgstr ""
msgid "Corrective Action"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:430
+#: erpnext/manufacturing/doctype/job_card/job_card.js:438
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:437
+#: erpnext/manufacturing/doctype/job_card/job_card.js:445
#: erpnext/manufacturing/doctype/job_card/job_card.json
msgid "Corrective Operation"
msgstr ""
@@ -12758,9 +12763,9 @@ msgstr ""
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:197
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98
#: erpnext/accounts/report/general_ledger/general_ledger.js:153
-#: erpnext/accounts/report/general_ledger/general_ledger.py:734
+#: erpnext/accounts/report/general_ledger/general_ledger.py:767
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
-#: erpnext/accounts/report/gross_profit/gross_profit.py:364
+#: erpnext/accounts/report/gross_profit/gross_profit.py:370
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
#: erpnext/accounts/report/purchase_register/purchase_register.js:46
#: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py:29
@@ -12845,8 +12850,8 @@ msgstr ""
msgid "Cost Center is a part of Cost Center Allocation, hence cannot be converted to a group"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1412
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:873
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1414
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:875
msgid "Cost Center is required in row {0} in Taxes table for type {1}"
msgstr ""
@@ -12866,11 +12871,11 @@ msgstr ""
msgid "Cost Center {0} cannot be used for allocation as it is used as main cost center in other allocation record."
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:289
+#: erpnext/assets/doctype/asset/asset.py:290
msgid "Cost Center {} doesn't belong to Company {}"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:296
+#: erpnext/assets/doctype/asset/asset.py:297
msgid "Cost Center {} is a group cost center and group cost centers cannot be used in transactions"
msgstr ""
@@ -12986,11 +12991,11 @@ msgstr ""
msgid "Could Not Delete Demo Data"
msgstr ""
-#: erpnext/selling/doctype/quotation/quotation.py:584
+#: erpnext/selling/doctype/quotation/quotation.py:606
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:674
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr ""
@@ -13119,9 +13124,9 @@ msgstr ""
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:127
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:135
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:146
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:222
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:659
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:683
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:228
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:665
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:689
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13161,14 +13166,14 @@ msgstr ""
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:34
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:48
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:64
-#: erpnext/manufacturing/doctype/bom/bom.js:171
-#: erpnext/manufacturing/doctype/bom/bom.js:180
-#: erpnext/manufacturing/doctype/bom/bom.js:190
-#: erpnext/manufacturing/doctype/bom/bom.js:194
-#: erpnext/manufacturing/doctype/bom/bom.js:438
+#: erpnext/manufacturing/doctype/bom/bom.js:192
+#: erpnext/manufacturing/doctype/bom/bom.js:201
+#: erpnext/manufacturing/doctype/bom/bom.js:211
+#: erpnext/manufacturing/doctype/bom/bom.js:215
+#: erpnext/manufacturing/doctype/bom/bom.js:459
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.js:99
-#: erpnext/manufacturing/doctype/job_card/job_card.js:137
-#: erpnext/manufacturing/doctype/job_card/job_card.js:151
+#: erpnext/manufacturing/doctype/job_card/job_card.js:145
+#: erpnext/manufacturing/doctype/job_card/job_card.js:159
#: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:268
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:145
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:159
@@ -13180,7 +13185,7 @@ msgstr ""
#: erpnext/projects/doctype/task/task_tree.js:81
#: erpnext/public/js/communication.js:19 erpnext/public/js/communication.js:31
#: erpnext/public/js/communication.js:41
-#: erpnext/public/js/controllers/transaction.js:361
+#: erpnext/public/js/controllers/transaction.js:362
#: erpnext/public/js/controllers/transaction.js:2494
#: erpnext/selling/doctype/customer/customer.js:181
#: erpnext/selling/doctype/quotation/quotation.js:125
@@ -13199,18 +13204,18 @@ msgstr ""
#: erpnext/selling/doctype/sales_order/sales_order.js:759
#: erpnext/selling/doctype/sales_order/sales_order.js:766
#: erpnext/selling/doctype/sales_order/sales_order.js:770
-#: erpnext/selling/doctype/sales_order/sales_order.js:917
-#: erpnext/selling/doctype/sales_order/sales_order.js:1056
+#: erpnext/selling/doctype/sales_order/sales_order.js:920
+#: erpnext/selling/doctype/sales_order/sales_order.js:1059
#: erpnext/stock/doctype/delivery_note/delivery_note.js:96
#: erpnext/stock/doctype/delivery_note/delivery_note.js:98
#: erpnext/stock/doctype/delivery_note/delivery_note.js:121
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:247
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:261
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:271
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:281
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:300
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:305
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:347
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:253
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:277
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:287
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:306
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:311
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:353
#: erpnext/stock/doctype/item/item.js:167
#: erpnext/stock/doctype/item/item.js:174
#: erpnext/stock/doctype/item/item.js:182
@@ -13234,15 +13239,15 @@ msgstr ""
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:70
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:82
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:108
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:279
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:284
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:286
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:291
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:297
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:300
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:298
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:304
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:307
#: erpnext/stock/doctype/stock_entry/stock_entry.js:170
#: erpnext/stock/doctype/stock_entry/stock_entry.js:172
#: erpnext/stock/doctype/stock_entry/stock_entry.js:247
-#: erpnext/stock/doctype/stock_entry/stock_entry.js:1283
+#: erpnext/stock/doctype/stock_entry/stock_entry.js:1289
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:231
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:264
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:277
@@ -13367,7 +13372,7 @@ msgstr ""
msgid "Create Payment Entry"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:806
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:807
msgid "Create Payment Entry for Consolidated POS Invoices."
msgstr ""
@@ -13383,7 +13388,7 @@ msgstr ""
msgid "Create Prospect"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:1238
+#: erpnext/selling/doctype/sales_order/sales_order.js:1242
#: erpnext/utilities/activation.py:106
msgid "Create Purchase Order"
msgstr ""
@@ -13515,7 +13520,7 @@ msgstr ""
msgid "Creating Accounts..."
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:1133
+#: erpnext/selling/doctype/sales_order/sales_order.js:1136
msgid "Creating Delivery Note ..."
msgstr ""
@@ -13535,11 +13540,11 @@ msgstr ""
msgid "Creating Purchase Invoices ..."
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:1258
+#: erpnext/selling/doctype/sales_order/sales_order.js:1262
msgid "Creating Purchase Order ..."
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:746
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13608,11 +13613,11 @@ msgstr ""
msgid "Credit"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:691
+#: erpnext/accounts/report/general_ledger/general_ledger.py:711
msgid "Credit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:666
+#: erpnext/accounts/report/general_ledger/general_ledger.py:686
msgid "Credit ({0})"
msgstr ""
@@ -13755,14 +13760,14 @@ msgstr ""
msgid "Credit Note will update it's own outstanding amount, even if 'Return Against' is specified."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:671
msgid "Credit Note {0} has been created automatically"
msgstr ""
#. Label of the credit_to (Link) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:369
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:377
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:371
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:379
#: erpnext/controllers/accounts_controller.py:2282
msgid "Credit To"
msgstr ""
@@ -13961,7 +13966,7 @@ msgstr ""
#: erpnext/accounts/report/financial_statements.html:29
#: erpnext/accounts/report/financial_statements.py:678
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
-#: erpnext/accounts/report/gross_profit/gross_profit.py:427
+#: erpnext/accounts/report/gross_profit/gross_profit.py:443
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
@@ -14062,7 +14067,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2319
+#: erpnext/accounts/utils.py:2323
msgid "Currency for {0} must be {1}"
msgstr ""
@@ -14328,13 +14333,13 @@ msgstr ""
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:286
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:289
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/accounts/doctype/sales_invoice_reference/sales_invoice_reference.json
#: erpnext/accounts/doctype/tax_rule/tax_rule.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:38
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:29
-#: erpnext/accounts/report/gross_profit/gross_profit.py:385
+#: erpnext/accounts/report/gross_profit/gross_profit.py:391
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:37
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:22
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:225
@@ -14397,8 +14402,8 @@ msgstr ""
#: erpnext/setup/doctype/customer_group/customer_group.json
#: erpnext/setup/doctype/territory/territory.json
#: erpnext/setup/workspace/home/home.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:215
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:482
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:218
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:488
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
#: erpnext/stock/doctype/item/item.json
@@ -14412,7 +14417,7 @@ msgstr ""
#: erpnext/stock/report/delayed_item_report/delayed_item_report.py:121
#: erpnext/stock/report/delayed_order_report/delayed_order_report.js:36
#: erpnext/stock/report/delayed_order_report/delayed_order_report.py:46
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:469
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:512
#: erpnext/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14590,7 +14595,7 @@ msgstr ""
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:185
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:56
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:228
-#: erpnext/accounts/report/gross_profit/gross_profit.py:392
+#: erpnext/accounts/report/gross_profit/gross_profit.py:398
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:212
#: erpnext/accounts/report/sales_register/sales_register.js:27
#: erpnext/accounts/report/sales_register/sales_register.py:202
@@ -14698,6 +14703,7 @@ msgstr ""
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:156
#: 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
+#: erpnext/accounts/report/gross_profit/gross_profit.py:405
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:232
#: erpnext/accounts/report/sales_register/sales_register.py:193
#: erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -14845,7 +14851,7 @@ msgstr ""
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1087
#: erpnext/selling/doctype/sales_order/sales_order.py:373
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:418
msgid "Customer {0} does not belong to project {1}"
msgstr ""
@@ -15334,11 +15340,11 @@ msgstr ""
msgid "Debit"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:684
+#: erpnext/accounts/report/general_ledger/general_ledger.py:704
msgid "Debit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:659
+#: erpnext/accounts/report/general_ledger/general_ledger.py:679
msgid "Debit ({0})"
msgstr ""
@@ -16280,7 +16286,7 @@ msgstr ""
#. Label of the delivery_date (Date) field in DocType 'Sales Order'
#. Label of the delivery_date (Date) field in DocType 'Sales Order Item'
#: erpnext/public/js/utils.js:813
-#: erpnext/selling/doctype/sales_order/sales_order.js:1076
+#: erpnext/selling/doctype/sales_order/sales_order.js:1079
#: erpnext/selling/doctype/sales_order/sales_order.json
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:321
@@ -16315,7 +16321,7 @@ msgstr ""
#. Label of a Link in the Stock Workspace
#. Label of a shortcut in the Stock Workspace
#: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:306
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:312
#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:36
#: 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
@@ -16422,7 +16428,7 @@ msgstr ""
#. Label of the delivery_trip (Link) field in DocType 'Delivery Note'
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:277
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:283
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_trip/delivery_trip.json
#: erpnext/stock/workspace/stock/stock.json
@@ -16612,7 +16618,7 @@ msgstr ""
msgid "Depreciation Entry Posting Status"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:1109
+#: erpnext/assets/doctype/asset/asset.py:1125
msgid "Depreciation Entry against asset {0}"
msgstr ""
@@ -16659,11 +16665,11 @@ msgstr ""
msgid "Depreciation Posting Date cannot be before Available-for-use Date"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:318
+#: erpnext/assets/doctype/asset/asset.py:319
msgid "Depreciation Row {0}: Depreciation Posting Date cannot be before Available-for-use Date"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:569
+#: erpnext/assets/doctype/asset/asset.py:585
msgid "Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1}"
msgstr ""
@@ -16690,7 +16696,7 @@ msgstr ""
msgid "Depreciation Schedule View"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:412
+#: erpnext/assets/doctype/asset/asset.py:413
msgid "Depreciation cannot be calculated for fully depreciated assets"
msgstr ""
@@ -16868,7 +16874,7 @@ msgstr ""
#: erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
#: erpnext/accounts/doctype/share_type/share_type.json
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:72
-#: erpnext/accounts/report/gross_profit/gross_profit.py:302
+#: erpnext/accounts/report/gross_profit/gross_profit.py:308
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:175
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:196
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:72
@@ -17161,7 +17167,7 @@ msgstr ""
msgid "Difference Value"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:491
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:497
msgid "Different 'Source Warehouse' and 'Target Warehouse' can be set for each row."
msgstr ""
@@ -17931,7 +17937,7 @@ msgstr ""
msgid "Do you want to submit the material request"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:76
+#: erpnext/manufacturing/doctype/job_card/job_card.js:84
msgid "Do you want to submit the stock entry?"
msgstr ""
@@ -18438,7 +18444,7 @@ msgstr ""
msgid "Duplicate Entry. Please check Authorization Rule {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:342
+#: erpnext/assets/doctype/asset/asset.py:343
msgid "Duplicate Finance Book"
msgstr ""
@@ -18631,7 +18637,7 @@ msgstr ""
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:495
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:501
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -19069,7 +19075,7 @@ msgstr ""
msgid "Ems(Pica)"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1642
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr ""
@@ -19306,8 +19312,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:311
-#: erpnext/manufacturing/doctype/job_card/job_card.js:380
+#: erpnext/manufacturing/doctype/job_card/job_card.js:319
+#: erpnext/manufacturing/doctype/job_card/job_card.js:388
#: 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
@@ -19398,8 +19404,8 @@ msgstr ""
msgid "Enter Supplier"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:337
-#: erpnext/manufacturing/doctype/job_card/job_card.js:406
+#: erpnext/manufacturing/doctype/job_card/job_card.js:345
+#: erpnext/manufacturing/doctype/job_card/job_card.js:414
#: erpnext/manufacturing/doctype/workstation/workstation.js:312
msgid "Enter Value"
msgstr ""
@@ -19440,7 +19446,7 @@ msgstr ""
msgid "Enter date to scrap asset"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:410
+#: erpnext/assets/doctype/asset/asset.py:411
msgid "Enter depreciation details"
msgstr ""
@@ -19473,7 +19479,7 @@ msgstr ""
msgid "Enter the opening stock units."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:865
+#: erpnext/manufacturing/doctype/bom/bom.js:886
msgid "Enter the quantity of the Item that will be manufactured from this Bill of Materials."
msgstr ""
@@ -19829,7 +19835,7 @@ msgstr ""
msgid "Excise Entry"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.js:1276
+#: erpnext/stock/doctype/stock_entry/stock_entry.js:1282
msgid "Excise Invoice"
msgstr ""
@@ -20001,7 +20007,7 @@ msgstr ""
#: erpnext/accounts/doctype/cashier_closing/cashier_closing.json
#: erpnext/accounts/doctype/ledger_merge/ledger_merge.json
#: erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:596
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:598
#: erpnext/accounts/report/account_balance/account_balance.js:28
#: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:89
#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:178
@@ -20069,13 +20075,13 @@ msgstr ""
msgid "Expense Head"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:490
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:514
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:534
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:492
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:516
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:536
msgid "Expense Head Changed"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:592
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:594
msgid "Expense account is mandatory for item {0}"
msgstr ""
@@ -20216,6 +20222,11 @@ msgstr ""
msgid "Extra Small"
msgstr ""
+#. Label of the finished_good (Link) field in DocType 'BOM Operation'
+#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
+msgid "FG / Semi FG Item"
+msgstr ""
+
#. Option for the 'Valuation Method' (Select) field in DocType 'Item'
#. Option for the 'Default Valuation Method' (Select) field in DocType 'Stock
#. Settings'
@@ -20424,7 +20435,7 @@ msgstr ""
msgid "Fetch Customers"
msgstr ""
-#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js:76
+#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js:77
msgid "Fetch Items from Warehouse"
msgstr ""
@@ -20440,7 +20451,7 @@ msgstr ""
msgid "Fetch Subscription Updates"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1017
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1026
msgid "Fetch Timesheet"
msgstr ""
@@ -20832,11 +20843,6 @@ msgstr ""
msgid "Finished Goods"
msgstr ""
-#. Label of the finished_good (Link) field in DocType 'BOM Operation'
-#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
-msgid "Finished Goods / Semi Finished Goods Item"
-msgstr ""
-
#. Label of the fg_based_section_section (Section Break) field in DocType 'BOM'
#: erpnext/manufacturing/doctype/bom/bom.json
msgid "Finished Goods Based Operating Cost"
@@ -20847,11 +20853,6 @@ msgstr ""
msgid "Finished Goods Item"
msgstr ""
-#. Label of the finished_good_qty (Float) field in DocType 'BOM Operation'
-#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
-msgid "Finished Goods Qty"
-msgstr ""
-
#. Label of the fg_reference_id (Data) field in DocType 'BOM Creator Item'
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
msgid "Finished Goods Reference"
@@ -21015,7 +21016,7 @@ msgstr ""
#. Capitalization Asset Item'
#. Label of the fixed_asset_account (Link) field in DocType 'Asset Category
#. Account'
-#: erpnext/assets/doctype/asset/asset.py:751
+#: erpnext/assets/doctype/asset/asset.py:767
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
#: erpnext/assets/doctype/asset_category_account/asset_category_account.json
msgid "Fixed Asset Account"
@@ -21181,7 +21182,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:450
+#: erpnext/manufacturing/doctype/job_card/job_card.js:458
#: erpnext/manufacturing/doctype/job_card/job_card.json
msgid "For Operation"
msgstr ""
@@ -21230,7 +21231,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:466
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:997
+#: erpnext/selling/doctype/sales_order/sales_order.js:1000
#: erpnext/stock/doctype/material_request/material_request.js:344
#: erpnext/templates/form_grid/material_request_grid.html:36
msgid "For Warehouse"
@@ -21300,7 +21301,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:1635
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1652
msgid "For row {0}: Enter Planned Qty"
msgstr ""
@@ -21475,7 +21476,7 @@ msgstr ""
#. Label of the from_uom (Link) field in DocType 'UOM Conversion Factor'
#. Label of the from (Data) field in DocType 'Call Log'
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1020
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1029
#: erpnext/setup/doctype/uom_conversion_factor/uom_conversion_factor.json
#: erpnext/telephony/doctype/call_log/call_log.json
#: erpnext/templates/pages/projects.html:67
@@ -22079,7 +22080,7 @@ msgstr ""
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:644
+#: erpnext/accounts/report/general_ledger/general_ledger.py:664
msgid "GL Entry"
msgstr ""
@@ -22345,12 +22346,12 @@ msgid "Get Items"
msgstr ""
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:170
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:192
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:270
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:299
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:330
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1073
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:173
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:198
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:273
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:305
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:339
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1082
#: erpnext/buying/doctype/purchase_order/purchase_order.js:612
#: erpnext/buying/doctype/purchase_order/purchase_order.js:632
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:366
@@ -22366,13 +22367,13 @@ msgstr ""
#: erpnext/public/js/controllers/buying.js:296
#: erpnext/selling/doctype/quotation/quotation.js:167
#: erpnext/selling/doctype/sales_order/sales_order.js:174
-#: erpnext/selling/doctype/sales_order/sales_order.js:798
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:187
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:236
+#: erpnext/selling/doctype/sales_order/sales_order.js:801
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:190
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:242
#: erpnext/stock/doctype/material_request/material_request.js:126
#: erpnext/stock/doctype/material_request/material_request.js:221
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:156
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:270
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:160
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:277
#: erpnext/stock/doctype/stock_entry/stock_entry.js:319
#: erpnext/stock/doctype/stock_entry/stock_entry.js:366
#: erpnext/stock/doctype/stock_entry/stock_entry.js:395
@@ -22500,7 +22501,7 @@ msgstr ""
msgid "Get Suppliers By"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1069
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1078
msgid "Get Timesheets"
msgstr ""
@@ -22818,7 +22819,7 @@ msgstr ""
#. Label of the gross_profit (Currency) field in DocType 'Quotation Item'
#. Label of the gross_profit (Currency) field in DocType 'Sales Order Item'
#: erpnext/accounts/report/gross_profit/gross_profit.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:344
+#: erpnext/accounts/report/gross_profit/gross_profit.py:350
#: erpnext/accounts/workspace/financial_reports/financial_reports.json
#: erpnext/selling/doctype/quotation_item/quotation_item.json
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -22829,7 +22830,7 @@ msgstr ""
msgid "Gross Profit / Loss"
msgstr ""
-#: erpnext/accounts/report/gross_profit/gross_profit.py:351
+#: erpnext/accounts/report/gross_profit/gross_profit.py:357
msgid "Gross Profit Percent"
msgstr ""
@@ -22841,11 +22842,11 @@ msgstr ""
msgid "Gross Purchase Amount"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:380
+#: erpnext/assets/doctype/asset/asset.py:381
msgid "Gross Purchase Amount is mandatory"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:425
+#: erpnext/assets/doctype/asset/asset.py:441
msgid "Gross Purchase Amount should be equal to purchase amount of one single Asset."
msgstr ""
@@ -23887,11 +23888,11 @@ msgstr ""
msgid "If you need to reconcile particular transactions against each other, then please select accordingly. If not, all the transactions will be allocated in FIFO order."
msgstr ""
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1036
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1051
msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox."
msgstr ""
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1748
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1765
msgid "If you still want to proceed, please enable {0}."
msgstr ""
@@ -23965,11 +23966,11 @@ msgstr ""
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:980
+#: erpnext/selling/doctype/sales_order/sales_order.js:983
msgid "Ignore Existing Ordered Qty"
msgstr ""
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1740
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1757
msgid "Ignore Existing Projected Quantity"
msgstr ""
@@ -24614,7 +24615,7 @@ msgstr ""
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:976
+#: erpnext/selling/doctype/sales_order/sales_order.js:979
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -24813,7 +24814,7 @@ msgstr ""
msgid "Incorrect Component Quantity"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:321
+#: erpnext/assets/doctype/asset/asset.py:322
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py:56
msgid "Incorrect Date"
msgstr ""
@@ -25059,7 +25060,7 @@ msgstr ""
#. 'Installation Note'
#. Label of a Link in the Stock Workspace
#: erpnext/selling/doctype/installation_note/installation_note.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:257
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:263
#: erpnext/stock/workspace/stock/stock.json
msgid "Installation Note"
msgstr ""
@@ -25069,7 +25070,7 @@ msgstr ""
msgid "Installation Note Item"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:625
msgid "Installation Note {0} has already been submitted"
msgstr ""
@@ -25127,7 +25128,7 @@ msgstr ""
#: erpnext/stock/doctype/pick_list/pick_list.py:132
#: erpnext/stock/doctype/pick_list/pick_list.py:1003
#: erpnext/stock/doctype/stock_entry/stock_entry.py:788
-#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1103 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr ""
@@ -25221,6 +25222,10 @@ msgstr ""
msgid "Inter Company Order Reference"
msgstr ""
+#: erpnext/selling/doctype/sales_order/sales_order.js:742
+msgid "Inter Company Purchase Order"
+msgstr ""
+
#. Label of the inter_company_reference (Link) field in DocType 'Delivery Note'
#. Label of the inter_company_reference (Link) field in DocType 'Purchase
#. Receipt'
@@ -25229,6 +25234,10 @@ msgstr ""
msgid "Inter Company Reference"
msgstr ""
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:485
+msgid "Inter Company Sales Order"
+msgstr ""
+
#. Label of the inter_transfer_reference_section (Section Break) field in
#. DocType 'Sales Order Item'
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -25270,10 +25279,18 @@ msgstr ""
msgid "Internal Customer for company {0} already exists"
msgstr ""
+#: erpnext/selling/doctype/sales_order/sales_order.js:741
+msgid "Internal Purchase Order"
+msgstr ""
+
#: erpnext/controllers/accounts_controller.py:731
msgid "Internal Sale or Delivery Reference missing."
msgstr ""
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:484
+msgid "Internal Sales Order"
+msgstr ""
+
#: erpnext/controllers/accounts_controller.py:733
msgid "Internal Sales Reference Missing"
msgstr ""
@@ -25342,8 +25359,8 @@ msgstr ""
msgid "Invalid"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:370
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:378
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:372
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:380
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:961
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:971
#: erpnext/assets/doctype/asset_category/asset_category.py:69
@@ -25386,8 +25403,8 @@ msgstr ""
msgid "Invalid Company for Inter Company Transaction."
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:292
-#: erpnext/assets/doctype/asset/asset.py:299
+#: erpnext/assets/doctype/asset/asset.py:293
+#: erpnext/assets/doctype/asset/asset.py:300
#: erpnext/controllers/accounts_controller.py:3037
msgid "Invalid Cost Center"
msgstr ""
@@ -25417,7 +25434,7 @@ msgstr ""
msgid "Invalid Formula"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:430
+#: erpnext/assets/doctype/asset/asset.py:446
msgid "Invalid Gross Purchase Amount"
msgstr ""
@@ -25425,7 +25442,7 @@ msgstr ""
msgid "Invalid Group By"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:453
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:454
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:914
msgid "Invalid Item"
msgstr ""
@@ -25468,7 +25485,7 @@ msgstr ""
msgid "Invalid Priority"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1093
+#: erpnext/manufacturing/doctype/bom/bom.py:1130
msgid "Invalid Process Loss Configuration"
msgstr ""
@@ -25496,8 +25513,8 @@ msgstr ""
msgid "Invalid Sales Invoices"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:515
-#: erpnext/assets/doctype/asset/asset.py:534
+#: erpnext/assets/doctype/asset/asset.py:531
+#: erpnext/assets/doctype/asset/asset.py:550
msgid "Invalid Schedule"
msgstr ""
@@ -25530,7 +25547,7 @@ msgstr ""
msgid "Invalid condition expression"
msgstr ""
-#: erpnext/selling/doctype/quotation/quotation.py:270
+#: erpnext/selling/doctype/quotation/quotation.py:272
msgid "Invalid lost reason {0}, please create a new lost reason"
msgstr ""
@@ -25676,7 +25693,7 @@ msgstr ""
msgid "Invoice Number"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:812
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:813
msgid "Invoice Paid"
msgstr ""
@@ -26270,6 +26287,14 @@ msgstr ""
msgid "Is Stock Item"
msgstr ""
+#. Label of the is_sub_assembly_item (Check) field in DocType 'BOM Explosion
+#. Item'
+#. Label of the is_sub_assembly_item (Check) field in DocType 'BOM Item'
+#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
+#: erpnext/manufacturing/doctype/bom_item/bom_item.json
+msgid "Is Sub Assembly Item"
+msgstr ""
+
#. Label of the is_subcontracted (Check) field in DocType 'Purchase Invoice'
#. Label of the is_subcontracted (Check) field in DocType 'Purchase Order'
#. Label of the is_subcontracted (Check) field in DocType 'Supplier Quotation'
@@ -26496,7 +26521,7 @@ msgstr ""
#: erpnext/buying/workspace/buying/buying.json
#: erpnext/controllers/taxes_and_totals.py:1123
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.json
-#: erpnext/manufacturing/doctype/bom/bom.js:944
+#: erpnext/manufacturing/doctype/bom/bom.js:979
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109
#: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:25
@@ -26517,7 +26542,7 @@ msgstr ""
#: erpnext/public/js/stock_analytics.js:92
#: erpnext/selling/doctype/party_specific_item/party_specific_item.json
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1203
+#: erpnext/selling/doctype/sales_order/sales_order.js:1206
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:46
#: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.js:14
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.js:36
@@ -26720,10 +26745,10 @@ msgstr ""
#: erpnext/accounts/doctype/pricing_rule_item_code/pricing_rule_item_code.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1026
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1035
#: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:68
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:37
-#: erpnext/accounts/report/gross_profit/gross_profit.py:281
+#: erpnext/accounts/report/gross_profit/gross_profit.py:287
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:150
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:171
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:37
@@ -26780,8 +26805,8 @@ msgstr ""
#: erpnext/selling/doctype/quotation_item/quotation_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:345
#: erpnext/selling/doctype/sales_order/sales_order.js:453
-#: erpnext/selling/doctype/sales_order/sales_order.js:839
-#: erpnext/selling/doctype/sales_order/sales_order.js:990
+#: erpnext/selling/doctype/sales_order/sales_order.js:842
+#: erpnext/selling/doctype/sales_order/sales_order.js:993
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py:29
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:27
@@ -26824,7 +26849,7 @@ msgstr ""
#: erpnext/stock/report/item_price_stock/item_price_stock.py:18
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:125
#: 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:396
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:419
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:7
#: erpnext/stock/report/stock_ageing/stock_ageing.py:130
#: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:104
@@ -26851,7 +26876,7 @@ msgstr ""
msgid "Item Code cannot be changed for Serial No."
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:445
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:447
msgid "Item Code required at Row No {0}"
msgstr ""
@@ -26956,7 +26981,7 @@ msgstr ""
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/doctype/tax_rule/tax_rule.json
#: erpnext/accounts/report/gross_profit/gross_profit.js:44
-#: erpnext/accounts/report/gross_profit/gross_profit.py:294
+#: erpnext/accounts/report/gross_profit/gross_profit.py:300
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js:21
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:28
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:28
@@ -27168,7 +27193,7 @@ msgstr ""
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:74
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:71
-#: erpnext/accounts/report/gross_profit/gross_profit.py:288
+#: erpnext/accounts/report/gross_profit/gross_profit.py:294
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:33
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:156
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:177
@@ -27217,7 +27242,7 @@ msgstr ""
#: erpnext/public/js/controllers/transaction.js:2414
#: erpnext/public/js/utils.js:756
#: erpnext/selling/doctype/quotation_item/quotation_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:845
+#: erpnext/selling/doctype/sales_order/sales_order.js:848
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py:35
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:33
@@ -27251,7 +27276,7 @@ msgstr ""
#: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143
#: 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:131
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:403
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:426
#: erpnext/stock/report/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -27300,7 +27325,7 @@ msgstr ""
msgid "Item Price Stock"
msgstr ""
-#: erpnext/stock/get_item_details.py:1063
+#: erpnext/stock/get_item_details.py:1058
msgid "Item Price added for {0} in Price List {1}"
msgstr ""
@@ -27308,7 +27333,7 @@ msgstr ""
msgid "Item Price appears multiple times based on Price List, Supplier/Customer, Currency, Item, Batch, UOM, Qty, and Dates."
msgstr ""
-#: erpnext/stock/get_item_details.py:1042
+#: erpnext/stock/get_item_details.py:1037
msgid "Item Price updated for {0} in Price List {1}"
msgstr ""
@@ -27456,8 +27481,8 @@ msgstr ""
msgid "Item UOM"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:409
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:416
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:410
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:417
msgid "Item Unavailable"
msgstr ""
@@ -27573,7 +27598,7 @@ msgid "Item must be added using 'Get Items from Purchase Receipts' button"
msgstr ""
#: erpnext/buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:42
-#: erpnext/selling/doctype/sales_order/sales_order.js:1210
+#: erpnext/selling/doctype/sales_order/sales_order.js:1213
msgid "Item name"
msgstr ""
@@ -27620,7 +27645,7 @@ msgstr ""
msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}."
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:274
+#: erpnext/assets/doctype/asset/asset.py:275
#: erpnext/stock/doctype/item/item.py:634
msgid "Item {0} does not exist"
msgstr ""
@@ -27641,7 +27666,7 @@ msgstr ""
msgid "Item {0} has already been returned"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:276
+#: erpnext/assets/doctype/asset/asset.py:277
msgid "Item {0} has been disabled"
msgstr ""
@@ -27657,7 +27682,7 @@ msgstr ""
msgid "Item {0} ignored since it is not a stock item"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:565
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:567
msgid "Item {0} is already reserved/delivered against Sales Order {1}."
msgstr ""
@@ -27685,7 +27710,7 @@ msgstr ""
msgid "Item {0} is not active or end of life has been reached"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:278
+#: erpnext/assets/doctype/asset/asset.py:279
msgid "Item {0} must be a Fixed Asset Item"
msgstr ""
@@ -27697,7 +27722,7 @@ msgstr ""
msgid "Item {0} must be a Sub-contracted Item"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:280
+#: erpnext/assets/doctype/asset/asset.py:281
msgid "Item {0} must be a non-stock item"
msgstr ""
@@ -27754,7 +27779,7 @@ msgstr ""
msgid "Item-wise Sales Register"
msgstr ""
-#: erpnext/stock/get_item_details.py:703
+#: erpnext/stock/get_item_details.py:698
msgid "Item/Item Code required to get Item Tax Template."
msgstr ""
@@ -27812,11 +27837,11 @@ msgstr ""
#: erpnext/selling/doctype/installation_note/installation_note.json
#: erpnext/selling/doctype/product_bundle/product_bundle.json
#: erpnext/selling/doctype/quotation/quotation.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:831
+#: erpnext/selling/doctype/sales_order/sales_order.js:834
#: erpnext/selling/doctype/sales_order/sales_order.json
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:19
#: erpnext/setup/doctype/item_group/item_group.js:87
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:487
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:493
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/material_request/material_request.json
#: erpnext/stock/doctype/packing_slip/packing_slip.json
@@ -27846,8 +27871,8 @@ msgstr ""
msgid "Items Filter"
msgstr ""
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1601
-#: erpnext/selling/doctype/sales_order/sales_order.js:1246
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1618
+#: erpnext/selling/doctype/sales_order/sales_order.js:1250
msgid "Items Required"
msgstr ""
@@ -27867,7 +27892,7 @@ msgstr ""
msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}."
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:1026
+#: erpnext/selling/doctype/sales_order/sales_order.js:1029
msgid "Items for Raw Material Request"
msgstr ""
@@ -27881,7 +27906,7 @@ msgstr ""
msgid "Items to Be Repost"
msgstr ""
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1600
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1617
msgid "Items to Manufacture are required to pull the Raw Materials associated with it."
msgstr ""
@@ -28378,7 +28403,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:685
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:104
#: erpnext/stock/workspace/stock/stock.json
@@ -28490,6 +28515,35 @@ msgstr ""
msgid "Last Purchase Rate"
msgstr ""
+#. Label of the last_scanned_warehouse (Data) field in DocType 'POS Invoice'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Purchase
+#. Invoice'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Sales Invoice'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Purchase Order'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Quotation'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Sales Order'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Delivery Note'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Material
+#. Request'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Purchase
+#. Receipt'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Stock Entry'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Stock
+#. Reconciliation'
+#: 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/buying/doctype/purchase_order/purchase_order.json
+#: erpnext/selling/doctype/quotation/quotation.json
+#: erpnext/selling/doctype/sales_order/sales_order.json
+#: erpnext/stock/doctype/delivery_note/delivery_note.json
+#: erpnext/stock/doctype/material_request/material_request.json
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+#: erpnext/stock/doctype/stock_entry/stock_entry.json
+#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
+msgid "Last Scanned Warehouse"
+msgstr ""
+
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:328
msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}."
msgstr ""
@@ -29292,7 +29346,7 @@ msgstr ""
#: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.json
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1121
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1130
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/selling/doctype/customer/customer.json
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:952
@@ -29615,7 +29669,7 @@ msgstr ""
#. Label of the make (Data) field in DocType 'Vehicle'
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:109
-#: erpnext/manufacturing/doctype/job_card/job_card.js:471
+#: erpnext/manufacturing/doctype/job_card/job_card.js:479
#: erpnext/setup/doctype/vehicle/vehicle.json
msgid "Make"
msgstr ""
@@ -29649,7 +29703,7 @@ msgstr ""
msgid "Make Quotation"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:356
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:363
msgid "Make Return Entry"
msgstr ""
@@ -29664,12 +29718,12 @@ msgstr ""
msgid "Make Serial No / Batch from Work Order"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:74
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:282
+#: erpnext/manufacturing/doctype/job_card/job_card.js:82
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:289
msgid "Make Stock Entry"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:345
+#: erpnext/manufacturing/doctype/job_card/job_card.js:353
msgid "Make Subcontracting PO"
msgstr ""
@@ -29739,18 +29793,18 @@ msgstr ""
#: erpnext/accounts/doctype/pos_field/pos_field.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:147
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:76
-#: erpnext/manufacturing/doctype/bom/bom.js:85
-#: erpnext/manufacturing/doctype/bom/bom.js:603
+#: erpnext/manufacturing/doctype/bom/bom.js:87
+#: erpnext/manufacturing/doctype/bom/bom.js:624
#: erpnext/manufacturing/doctype/bom/bom.py:261
#: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py:71
#: erpnext/public/js/controllers/accounts.js:249
#: erpnext/public/js/controllers/transaction.js:2812
#: erpnext/public/js/utils/party.js:321
#: erpnext/stock/doctype/delivery_note/delivery_note.js:164
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:203
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:206
#: erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:138
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:250
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:254
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:101
msgid "Mandatory"
msgstr ""
@@ -29781,15 +29835,15 @@ msgstr ""
msgid "Mandatory For Profit and Loss Account"
msgstr ""
-#: erpnext/selling/doctype/quotation/quotation.py:588
+#: erpnext/selling/doctype/quotation/quotation.py:610
msgid "Mandatory Missing"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:628
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:630
msgid "Mandatory Purchase Order"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:649
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:651
msgid "Mandatory Purchase Receipt"
msgstr ""
@@ -30054,7 +30108,7 @@ msgstr ""
msgid "Manufacturing User"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:179
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:183
msgid "Mapping Purchase Receipt ..."
msgstr ""
@@ -30290,7 +30344,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:133
+#: erpnext/manufacturing/doctype/job_card/job_card.js:141
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:155
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
#: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
@@ -30386,7 +30440,7 @@ msgstr ""
msgid "Material Request Type"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.py:1704
+#: erpnext/selling/doctype/sales_order/sales_order.py:1720
msgid "Material Request not created, as quantity for Raw Materials already available."
msgstr ""
@@ -30404,7 +30458,7 @@ msgstr ""
msgid "Material Request {0} is cancelled or stopped"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:1042
+#: erpnext/selling/doctype/sales_order/sales_order.js:1045
msgid "Material Request {0} submitted."
msgstr ""
@@ -30441,7 +30495,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:147
+#: erpnext/manufacturing/doctype/job_card/job_card.js:155
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:90
#: erpnext/stock/doctype/item/item.json
@@ -30612,7 +30666,7 @@ msgstr ""
msgid "Maximum discount for Item {0} is {1}%"
msgstr ""
-#: erpnext/public/js/utils/barcode_scanner.js:99
+#: erpnext/public/js/utils/barcode_scanner.js:125
msgid "Maximum quantity scanned for item {0}."
msgstr ""
@@ -31083,7 +31137,7 @@ msgstr ""
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:87
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:184
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:588
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:590
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2249
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
#: erpnext/assets/doctype/asset_category/asset_category.py:116
@@ -31095,7 +31149,7 @@ msgid "Missing Asset"
msgstr ""
#: erpnext/accounts/doctype/gl_entry/gl_entry.py:178
-#: erpnext/assets/doctype/asset/asset.py:308
+#: erpnext/assets/doctype/asset/asset.py:309
msgid "Missing Cost Center"
msgstr ""
@@ -31103,11 +31157,11 @@ msgstr ""
msgid "Missing Default in Company"
msgstr ""
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:44
msgid "Missing Filters"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:350
+#: erpnext/assets/doctype/asset/asset.py:351
msgid "Missing Finance Book"
msgstr ""
@@ -31139,7 +31193,7 @@ msgstr ""
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1052
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr ""
@@ -31377,7 +31431,7 @@ msgstr ""
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:62
#: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:75
-#: erpnext/accounts/report/gross_profit/gross_profit.py:406
+#: erpnext/accounts/report/gross_profit/gross_profit.py:418
#: erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json
#: erpnext/buying/report/purchase_analytics/purchase_analytics.js:61
#: erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
@@ -31805,7 +31859,7 @@ msgstr ""
msgid "Needs Analysis"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:1381
+#: erpnext/stock/serial_batch_bundle.py:1397
msgid "Negative Batch Quantity"
msgstr ""
@@ -32246,7 +32300,7 @@ msgstr ""
msgid "New Task"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:156
+#: erpnext/manufacturing/doctype/bom/bom.js:177
msgid "New Version"
msgstr ""
@@ -32273,7 +32327,7 @@ msgstr ""
msgid "New invoices will be generated as per schedule even if current invoices are unpaid or past due date"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:258
msgid "New release date should be in the future"
msgstr ""
@@ -32355,8 +32409,8 @@ msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:625
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:646
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:627
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:648
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/buying/doctype/buying_settings/buying_settings.json
#: erpnext/projects/doctype/project/project.json
@@ -32415,11 +32469,11 @@ msgstr ""
msgid "No Items selected for transfer."
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:824
+#: erpnext/selling/doctype/sales_order/sales_order.js:827
msgid "No Items with Bill of Materials to Manufacture"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:962
+#: erpnext/selling/doctype/sales_order/sales_order.js:965
msgid "No Items with Bill of Materials."
msgstr ""
@@ -32435,7 +32489,7 @@ msgstr ""
msgid "No Outstanding Invoices found for this party"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:623
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:624
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr ""
@@ -32455,7 +32509,7 @@ msgstr ""
msgid "No Records for these settings."
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:334
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:336
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1049
msgid "No Remarks"
msgstr ""
@@ -32484,7 +32538,7 @@ msgstr ""
msgid "No Tax Withholding data found for the current posting date."
msgstr ""
-#: erpnext/accounts/report/gross_profit/gross_profit.py:857
+#: erpnext/accounts/report/gross_profit/gross_profit.py:874
msgid "No Terms"
msgstr ""
@@ -32500,7 +32554,7 @@ msgstr ""
msgid "No Work Orders were created"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:803
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:805
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:742
msgid "No accounting entries for the following warehouses"
msgstr ""
@@ -32747,7 +32801,7 @@ msgstr ""
msgid "Non Profit"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1420
+#: erpnext/manufacturing/doctype/bom/bom.py:1457
msgid "Non stock items"
msgstr ""
@@ -32766,19 +32820,19 @@ msgid "None of the items have any change in quantity or value."
msgstr ""
#. Name of a UOM
-#: erpnext/setup/setup_wizard/data/uom_data.json erpnext/stock/utils.py:681
-#: erpnext/stock/utils.py:683
+#: erpnext/setup/setup_wizard/data/uom_data.json erpnext/stock/utils.py:703
+#: erpnext/stock/utils.py:705
msgid "Nos"
msgstr ""
#: erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py:66
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:270
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:271
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:556
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:568
#: erpnext/assets/doctype/asset/asset.js:618
#: erpnext/assets/doctype/asset/asset.js:633
#: erpnext/controllers/buying_controller.py:269
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:72
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:73
#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:80
msgid "Not Allowed"
msgstr ""
@@ -32813,7 +32867,7 @@ msgstr ""
msgid "Not Initiated"
msgstr ""
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:812
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:823
#: erpnext/templates/pages/material_request_info.py:21
#: erpnext/templates/pages/order.py:37 erpnext/templates/pages/rfq.py:46
msgid "Not Permitted"
@@ -32887,7 +32941,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/work_order/work_order.py:2041
#: erpnext/manufacturing/doctype/work_order/work_order.py:2110
#: erpnext/selling/doctype/sales_order/sales_order.py:826
-#: erpnext/selling/doctype/sales_order/sales_order.py:1685
+#: erpnext/selling/doctype/sales_order/sales_order.py:1701
msgid "Not permitted"
msgstr ""
@@ -32897,12 +32951,12 @@ msgstr ""
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:288
#: erpnext/crm/doctype/crm_note/crm_note.json
#: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py:100
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1040
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1750
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1055
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1767
#: erpnext/projects/doctype/timesheet/timesheet.json
#: erpnext/public/js/controllers/buying.js:477
#: erpnext/selling/doctype/customer/customer.py:129
-#: erpnext/selling/doctype/sales_order/sales_order.js:1180
+#: erpnext/selling/doctype/sales_order/sales_order.js:1183
#: erpnext/stock/doctype/item/item.js:526
#: erpnext/stock/doctype/item/item.py:571
#: erpnext/stock/doctype/item_price/item_price.json
@@ -33578,7 +33632,7 @@ msgstr ""
msgid "Open a new ticket"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:377
+#: erpnext/accounts/report/general_ledger/general_ledger.py:397
#: erpnext/public/js/stock_analytics.js:97
msgid "Opening"
msgstr ""
@@ -33675,7 +33729,7 @@ msgstr ""
msgid "Opening Invoice Item"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1628
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1836
msgid "Opening Invoice has rounding adjustment of {0}.
'{1}' account is required to post these values. Please set it in Company: {2}.
Or, '{3}' can be enabled to not post any rounding adjustment."
msgstr ""
@@ -33750,7 +33804,7 @@ msgstr ""
msgid "Operating Cost Per BOM Quantity"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1436
+#: erpnext/manufacturing/doctype/bom/bom.py:1473
msgid "Operating Cost as per Work Order / BOM"
msgstr ""
@@ -33780,7 +33834,7 @@ msgstr ""
#. Label of the operation (Link) field in DocType 'Work Order Item'
#. Label of the operation (Link) field in DocType 'Work Order Operation'
#. Label of a Link in the Manufacturing Workspace
-#: erpnext/manufacturing/doctype/bom/bom.js:409
+#: erpnext/manufacturing/doctype/bom/bom.js:430
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
@@ -33872,7 +33926,7 @@ msgstr ""
msgid "Operation time does not depend on quantity to produce"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:513
+#: erpnext/manufacturing/doctype/job_card/job_card.js:521
msgid "Operation {0} added multiple times in the work order {1}"
msgstr ""
@@ -33906,7 +33960,7 @@ msgstr ""
msgid "Operations Routing"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1098
msgid "Operations cannot be left blank"
msgstr ""
@@ -34480,7 +34534,7 @@ msgstr ""
msgid "Over Billing Allowance (%)"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1260
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1262
msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%"
msgstr ""
@@ -34974,7 +35028,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:293
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:299
#: erpnext/stock/doctype/packing_slip/packing_slip.json
#: erpnext/stock/workspace/stock/stock.json
msgid "Packing Slip"
@@ -34985,7 +35039,7 @@ msgstr ""
msgid "Packing Slip Item"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:641
msgid "Packing Slip(s) cancelled"
msgstr ""
@@ -35116,7 +35170,7 @@ msgstr ""
msgid "Paid To Account Type"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:324
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:326
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1095
msgid "Paid amount + Write Off Amount can not be greater than Grand Total"
msgstr ""
@@ -35271,11 +35325,11 @@ msgstr ""
msgid "Parent Item Group"
msgstr ""
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:80
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:81
msgid "Parent Item {0} must not be a Fixed Asset"
msgstr ""
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:78
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:79
msgid "Parent Item {0} must not be a Stock Item"
msgstr ""
@@ -35295,7 +35349,7 @@ msgstr ""
msgid "Parent Row No"
msgstr ""
-#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:496
+#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:499
msgid "Parent Row No not found for {0}"
msgstr ""
@@ -35346,7 +35400,7 @@ msgstr ""
msgid "Partial Payment in POS Transactions are not allowed."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1645
msgid "Partial Stock Reservation"
msgstr ""
@@ -35540,7 +35594,7 @@ msgstr ""
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:147
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:228
#: erpnext/accounts/report/general_ledger/general_ledger.js:74
-#: erpnext/accounts/report/general_ledger/general_ledger.py:723
+#: erpnext/accounts/report/general_ledger/general_ledger.py:743
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:161
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46
@@ -35645,6 +35699,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:110
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: erpnext/crm/doctype/contract/contract.json
#: erpnext/selling/doctype/party_specific_item/party_specific_item.json
#: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22
@@ -35703,7 +35758,7 @@ msgstr ""
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:141
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:219
#: erpnext/accounts/report/general_ledger/general_ledger.js:65
-#: erpnext/accounts/report/general_ledger/general_ledger.py:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:742
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:157
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35
@@ -35798,7 +35853,7 @@ msgstr ""
msgid "Pause"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:216
+#: erpnext/manufacturing/doctype/job_card/job_card.js:224
msgid "Pause Job"
msgstr ""
@@ -36294,7 +36349,7 @@ msgstr ""
#: 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:1200
-#: erpnext/accounts/report/gross_profit/gross_profit.py:412
+#: erpnext/accounts/report/gross_profit/gross_profit.py:424
#: erpnext/accounts/workspace/accounting/accounting.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:30
msgid "Payment Term"
@@ -36407,7 +36462,7 @@ msgstr ""
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:748
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:749
msgid "Payment amount cannot be less than or equal to 0"
msgstr ""
@@ -36424,7 +36479,7 @@ msgstr ""
msgid "Payment of {0} received successfully. Waiting for other requests to complete..."
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:378
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:379
msgid "Payment related to {0} is not completed"
msgstr ""
@@ -36567,7 +36622,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
#: erpnext/manufacturing/doctype/work_order/work_order.js:312
#: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:183
-#: erpnext/selling/doctype/sales_order/sales_order.js:1217
+#: erpnext/selling/doctype/sales_order/sales_order.js:1220
#: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:45
msgid "Pending Qty"
msgstr ""
@@ -36946,7 +37001,7 @@ msgstr ""
#. Reservation Entry'
#. Label of a Link in the Stock Workspace
#: erpnext/selling/doctype/sales_order/sales_order.js:637
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:199
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:202
#: erpnext/stock/doctype/material_request/material_request.js:140
#: erpnext/stock/doctype/pick_list/pick_list.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -37265,12 +37320,12 @@ msgid "Please Select a Company."
msgstr ""
#: erpnext/stock/doctype/delivery_note/delivery_note.js:165
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:204
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:207
msgid "Please Select a Customer"
msgstr ""
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:139
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:251
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:255
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:102
msgid "Please Select a Supplier"
msgstr ""
@@ -37356,7 +37411,7 @@ msgstr ""
msgid "Please check Process Deferred Accounting {0} and submit manually after resolving errors."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:84
+#: erpnext/manufacturing/doctype/bom/bom.js:86
msgid "Please check either with operations or FG Based Operating Cost."
msgstr ""
@@ -37401,7 +37456,7 @@ msgstr ""
msgid "Please convert the parent account in corresponding child company to a group account."
msgstr ""
-#: erpnext/selling/doctype/quotation/quotation.py:586
+#: erpnext/selling/doctype/quotation/quotation.py:608
msgid "Please create Customer from Lead {0}."
msgstr ""
@@ -37417,7 +37472,7 @@ msgstr ""
msgid "Please create purchase from internal sale or delivery document itself"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:390
+#: erpnext/assets/doctype/asset/asset.py:391
msgid "Please create purchase receipt or purchase invoice for the item {0}"
msgstr ""
@@ -37429,7 +37484,7 @@ msgstr ""
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:429
+#: erpnext/assets/doctype/asset/asset.py:445
msgid "Please do not book expense of multiple assets against one single Asset."
msgstr ""
@@ -37459,7 +37514,7 @@ msgstr ""
msgid "Please enable pop-ups"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:665
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:667
msgid "Please enable {0} in the {1}."
msgstr ""
@@ -37467,11 +37522,11 @@ msgstr ""
msgid "Please enable {} in {} to allow same item in multiple rows"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:367
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:369
msgid "Please ensure that the {0} account is a Balance Sheet account. You can change the parent account to a Balance Sheet account or select a different account."
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:375
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:377
msgid "Please ensure that the {0} account {1} is a Payable account. You can change the account type to Payable or select a different account."
msgstr ""
@@ -37487,7 +37542,7 @@ msgstr ""
msgid "Please enter Difference Account or set default Stock Adjustment Account for company {0}"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:508
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:509
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1188
msgid "Please enter Account for Change Amount"
msgstr ""
@@ -37569,7 +37624,7 @@ msgstr ""
msgid "Please enter Warehouse and Date"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:653
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:655
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1184
msgid "Please enter Write Off Account"
msgstr ""
@@ -37598,7 +37653,7 @@ msgstr ""
msgid "Please enter parent cost center"
msgstr ""
-#: erpnext/public/js/utils/barcode_scanner.js:165
+#: erpnext/public/js/utils/barcode_scanner.js:191
msgid "Please enter quantity for item {0}"
msgstr ""
@@ -37614,7 +37669,7 @@ msgstr ""
msgid "Please enter the company name to confirm"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:751
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:752
msgid "Please enter the phone number first"
msgstr ""
@@ -37717,7 +37772,7 @@ msgstr ""
msgid "Please select Apply Discount On"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.py:1650
+#: erpnext/selling/doctype/sales_order/sales_order.py:1666
msgid "Please select BOM against item {0}"
msgstr ""
@@ -37803,11 +37858,11 @@ msgstr ""
msgid "Please select Posting Date first"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1106
+#: erpnext/manufacturing/doctype/bom/bom.py:1143
msgid "Please select Price List"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.py:1652
+#: erpnext/selling/doctype/sales_order/sales_order.py:1668
msgid "Please select Qty against item {0}"
msgstr ""
@@ -37815,7 +37870,7 @@ msgstr ""
msgid "Please select Sample Retention Warehouse in Stock Settings first"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:415
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:417
msgid "Please select Serial/Batch Nos to reserve or change Reservation Based On to Qty."
msgstr ""
@@ -37835,17 +37890,17 @@ msgstr ""
msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1338
+#: erpnext/manufacturing/doctype/bom/bom.py:1375
msgid "Please select a BOM"
msgstr ""
#: erpnext/accounts/party.py:430
-#: erpnext/stock/doctype/pick_list/pick_list.py:1551
+#: erpnext/stock/doctype/pick_list/pick_list.py:1563
msgid "Please select a Company"
msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.js:267
-#: erpnext/manufacturing/doctype/bom/bom.js:603
+#: erpnext/manufacturing/doctype/bom/bom.js:624
#: erpnext/manufacturing/doctype/bom/bom.py:261
#: erpnext/public/js/controllers/accounts.js:249
#: erpnext/public/js/controllers/transaction.js:2812
@@ -37925,11 +37980,11 @@ msgstr ""
msgid "Please select an item code before setting the warehouse."
msgstr ""
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:26
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:43
msgid "Please select at least one filter: Item Code, Batch, or Serial No."
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:886
+#: erpnext/selling/doctype/sales_order/sales_order.js:889
msgid "Please select atleast one item to continue"
msgstr ""
@@ -38014,7 +38069,7 @@ msgstr ""
msgid "Please select {0} first"
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:99
+#: erpnext/public/js/controllers/transaction.js:100
msgid "Please set 'Apply Additional Discount On'"
msgstr ""
@@ -38056,10 +38111,14 @@ msgstr ""
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:58
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:68
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:78
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:756
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:765
msgid "Please set Company"
msgstr ""
+#: erpnext/regional/united_arab_emirates/utils.py:26
+msgid "Please set Customer Address to determine if the transaction is an export."
+msgstr ""
+
#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr ""
@@ -38082,7 +38141,7 @@ msgstr ""
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:585
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:587
msgid "Please set Fixed Asset Account in {} against {}."
msgstr ""
@@ -38108,7 +38167,7 @@ msgstr ""
msgid "Please set VAT Accounts in {0}"
msgstr ""
-#: erpnext/regional/united_arab_emirates/utils.py:61
+#: erpnext/regional/united_arab_emirates/utils.py:83
msgid "Please set Vat Accounts for Company: \"{0}\" in UAE VAT Settings"
msgstr ""
@@ -38116,11 +38175,11 @@ msgstr ""
msgid "Please set a Company"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:305
+#: erpnext/assets/doctype/asset/asset.py:306
msgid "Please set a Cost Center for the Asset or set an Asset Depreciation Cost Center for the Company {}"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.py:1406
+#: erpnext/selling/doctype/sales_order/sales_order.py:1422
msgid "Please set a Supplier against the Items to be considered in the Purchase Order."
msgstr ""
@@ -38132,7 +38191,7 @@ msgstr ""
msgid "Please set a default Holiday List for Employee {0} or Company {1}"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1095
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1097
msgid "Please set account in Warehouse {0}"
msgstr ""
@@ -38173,7 +38232,7 @@ msgstr ""
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr ""
-#: erpnext/accounts/utils.py:2314
+#: erpnext/accounts/utils.py:2318
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr ""
@@ -38206,7 +38265,7 @@ msgstr ""
msgid "Please set one of the following:"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:506
+#: erpnext/assets/doctype/asset/asset.py:522
msgid "Please set opening number of booked depreciations"
msgstr ""
@@ -38290,8 +38349,8 @@ msgid "Please specify Company"
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:447
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:503
msgid "Please specify Company to proceed"
msgstr ""
@@ -38498,8 +38557,8 @@ msgstr ""
#: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:61
#: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:66
#: erpnext/accounts/report/cheques_and_deposits_incorrectly_cleared/cheques_and_deposits_incorrectly_cleared.py:151
-#: erpnext/accounts/report/general_ledger/general_ledger.py:650
-#: erpnext/accounts/report/gross_profit/gross_profit.py:269
+#: erpnext/accounts/report/general_ledger/general_ledger.py:670
+#: erpnext/accounts/report/gross_profit/gross_profit.py:275
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:183
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:204
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
@@ -38531,7 +38590,7 @@ msgstr ""
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:127
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:104
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:86
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:449
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:492
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:24
#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:112
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:144
@@ -38546,7 +38605,7 @@ msgstr ""
msgid "Posting Date Inheritance for Exchange Gain / Loss"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:254
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:256
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:130
msgid "Posting Date cannot be future date"
msgstr ""
@@ -38586,7 +38645,7 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:275
+#: erpnext/accounts/report/gross_profit/gross_profit.py:281
#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -38885,7 +38944,7 @@ msgstr ""
msgid "Price List Currency"
msgstr ""
-#: erpnext/stock/get_item_details.py:1236
+#: erpnext/stock/get_item_details.py:1231
msgid "Price List Currency not selected"
msgstr ""
@@ -39554,7 +39613,7 @@ msgstr ""
msgid "Process Loss"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1089
+#: erpnext/manufacturing/doctype/bom/bom.py:1126
msgid "Process Loss Percentage cannot be greater than 100"
msgstr ""
@@ -39573,7 +39632,7 @@ msgstr ""
msgid "Process Loss Qty"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:293
+#: erpnext/manufacturing/doctype/job_card/job_card.js:301
msgid "Process Loss Quantity"
msgstr ""
@@ -40038,15 +40097,15 @@ msgstr ""
#: erpnext/accounts/doctype/psoa_project/psoa_project.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1052
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1061
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:109
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:74
#: erpnext/accounts/report/general_ledger/general_ledger.js:164
-#: erpnext/accounts/report/general_ledger/general_ledger.py:727
+#: erpnext/accounts/report/general_ledger/general_ledger.py:760
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
-#: erpnext/accounts/report/gross_profit/gross_profit.py:357
+#: erpnext/accounts/report/gross_profit/gross_profit.py:363
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:274
#: erpnext/accounts/report/purchase_register/purchase_register.py:207
@@ -40579,7 +40638,7 @@ msgstr ""
#: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
#: erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:134
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:289
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:296
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js:30
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
@@ -40613,16 +40672,16 @@ msgstr ""
msgid "Purchase Invoice Trends"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:267
+#: erpnext/assets/doctype/asset/asset.py:268
msgid "Purchase Invoice cannot be made against an existing asset {0}"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:431
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:445
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:433
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:447
msgid "Purchase Invoice {0} is already submitted"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:2011
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:2013
msgid "Purchase Invoices"
msgstr ""
@@ -40699,7 +40758,7 @@ msgstr ""
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#: erpnext/stock/doctype/material_request/material_request.js:179
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:246
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:250
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -40775,11 +40834,11 @@ msgstr ""
msgid "Purchase Order Pricing Rule"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:624
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:626
msgid "Purchase Order Required"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:619
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:621
msgid "Purchase Order Required for item {}"
msgstr ""
@@ -40791,19 +40850,19 @@ msgstr ""
msgid "Purchase Order Trends"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:1179
+#: erpnext/selling/doctype/sales_order/sales_order.js:1182
msgid "Purchase Order already created for all Sales Order items"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:320
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:322
msgid "Purchase Order number required for Item {0}"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:662
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:664
msgid "Purchase Order {0} is not submitted"
msgstr ""
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:907
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:929
msgid "Purchase Orders"
msgstr ""
@@ -40851,9 +40910,9 @@ msgstr ""
#. Reservation Entry'
#. Label of a Link in the Stock Workspace
#. Label of a shortcut in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:174
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:655
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:665
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:177
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:661
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:671
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:49
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:246
@@ -40916,11 +40975,11 @@ msgstr ""
msgid "Purchase Receipt No"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:645
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:647
msgid "Purchase Receipt Required"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:640
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:642
msgid "Purchase Receipt Required for item {}"
msgstr ""
@@ -40933,7 +40992,7 @@ msgstr ""
msgid "Purchase Receipt Trends"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:384
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:391
msgid "Purchase Receipt doesn't have any Item for which Retain Sample is enabled."
msgstr ""
@@ -40941,7 +41000,7 @@ msgstr ""
msgid "Purchase Receipt {0} created."
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:669
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:671
msgid "Purchase Receipt {0} is not submitted"
msgstr ""
@@ -40952,7 +41011,7 @@ msgstr ""
msgid "Purchase Register"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:279
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:286
msgid "Purchase Return"
msgstr ""
@@ -41148,14 +41207,14 @@ msgstr ""
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91
-#: erpnext/accounts/report/gross_profit/gross_profit.py:314
+#: erpnext/accounts/report/gross_profit/gross_profit.py:320
#: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json
#: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240
#: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:224
#: erpnext/controllers/trends.py:242 erpnext/controllers/trends.py:254
#: erpnext/controllers/trends.py:259
#: erpnext/crm/doctype/opportunity_item/opportunity_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:964
+#: erpnext/manufacturing/doctype/bom/bom.js:999
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
#: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
@@ -41175,8 +41234,8 @@ msgstr ""
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:367
#: erpnext/selling/doctype/sales_order/sales_order.js:471
-#: erpnext/selling/doctype/sales_order/sales_order.js:863
-#: erpnext/selling/doctype/sales_order/sales_order.js:1015
+#: erpnext/selling/doctype/sales_order/sales_order.js:866
+#: erpnext/selling/doctype/sales_order/sales_order.js:1018
#: 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_voucher/landed_cost_voucher.json
@@ -41260,7 +41319,7 @@ msgstr ""
#. Label of the for_quantity (Float) field in DocType 'Job Card'
#. Label of the qty (Float) field in DocType 'Work Order'
-#: erpnext/manufacturing/doctype/bom/bom.js:309
+#: erpnext/manufacturing/doctype/bom/bom.js:330
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/manufacturing/report/process_loss_report/process_loss_report.py:82
@@ -41375,7 +41434,7 @@ msgstr ""
msgid "Qty to Fetch"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:265
+#: erpnext/manufacturing/doctype/job_card/job_card.js:273
#: erpnext/manufacturing/doctype/job_card/job_card.py:765
msgid "Qty to Manufacture"
msgstr ""
@@ -41388,6 +41447,8 @@ msgstr ""
msgid "Qty to Order"
msgstr ""
+#. Label of the finished_good_qty (Float) field in DocType 'BOM Operation'
+#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
#: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:129
msgid "Qty to Produce"
msgstr ""
@@ -41514,7 +41575,7 @@ msgstr ""
#: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:186
+#: erpnext/manufacturing/doctype/bom/bom.js:207
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/quality_management/workspace/quality/quality.json
@@ -41589,7 +41650,7 @@ msgstr ""
msgid "Quality Inspection Template Name"
msgstr ""
-#: erpnext/public/js/controllers/transaction.js:359
+#: erpnext/public/js/controllers/transaction.js:360
#: erpnext/stock/doctype/stock_entry/stock_entry.js:165
msgid "Quality Inspection(s)"
msgstr ""
@@ -41707,7 +41768,7 @@ msgstr ""
#: erpnext/buying/report/purchase_analytics/purchase_analytics.js:28
#: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:213
#: erpnext/manufacturing/doctype/blanket_order_item/blanket_order_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:396
+#: erpnext/manufacturing/doctype/bom/bom.js:417
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.js:68
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.json
@@ -41734,7 +41795,7 @@ msgstr ""
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py:36
#: erpnext/stock/report/delayed_item_report/delayed_item_report.py:154
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:423
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:466
#: erpnext/stock/report/stock_analytics/stock_analytics.js:27
#: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
#: erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json
@@ -41856,8 +41917,8 @@ msgid "Quantity required for Item {0} in row {1}"
msgstr ""
#: erpnext/manufacturing/doctype/bom/bom.py:604
-#: erpnext/manufacturing/doctype/job_card/job_card.js:321
-#: erpnext/manufacturing/doctype/job_card/job_card.js:390
+#: erpnext/manufacturing/doctype/job_card/job_card.js:329
+#: erpnext/manufacturing/doctype/job_card/job_card.js:398
#: erpnext/manufacturing/doctype/workstation/workstation.js:303
msgid "Quantity should be greater than 0"
msgstr ""
@@ -41886,7 +41947,7 @@ msgstr ""
msgid "Quantity to Produce should be greater than zero."
msgstr ""
-#: erpnext/public/js/utils/barcode_scanner.js:236
+#: erpnext/public/js/utils/barcode_scanner.js:262
msgid "Quantity to Scan"
msgstr ""
@@ -42017,7 +42078,7 @@ msgstr ""
#. Label of the prevdoc_docname (Link) field in DocType 'Sales Order Item'
#. Label of a Link in the Selling Workspace
#. Option for the 'Transaction' (Select) field in DocType 'Authorization Rule'
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:277
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:280
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:36
#: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html:20
#: erpnext/crm/doctype/contract/contract.json
@@ -42084,7 +42145,7 @@ msgstr ""
msgid "Quotation {0} not of type {1}"
msgstr ""
-#: erpnext/selling/doctype/quotation/quotation.py:343
+#: erpnext/selling/doctype/quotation/quotation.py:345
#: erpnext/selling/page/sales_funnel/sales_funnel.py:57
msgid "Quotations"
msgstr ""
@@ -42536,8 +42597,8 @@ msgstr ""
#. Label of the materials_section (Section Break) field in DocType 'BOM'
#. Label of the section_break_8 (Section Break) field in DocType 'Job Card'
#. Label of the mr_items (Table) field in DocType 'Production Plan'
-#: erpnext/manufacturing/doctype/bom/bom.js:349
-#: erpnext/manufacturing/doctype/bom/bom.js:938
+#: erpnext/manufacturing/doctype/bom/bom.js:370
+#: erpnext/manufacturing/doctype/bom/bom.js:972
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
@@ -42700,7 +42761,7 @@ msgid "Reason"
msgstr ""
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:282
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr ""
@@ -42711,7 +42772,7 @@ msgid "Reason for Failure"
msgstr ""
#: erpnext/buying/doctype/purchase_order/purchase_order.js:748
-#: erpnext/selling/doctype/sales_order/sales_order.js:1338
+#: erpnext/selling/doctype/sales_order/sales_order.js:1341
msgid "Reason for Hold"
msgstr ""
@@ -42720,7 +42781,7 @@ msgstr ""
msgid "Reason for Leaving"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:1353
+#: erpnext/selling/doctype/sales_order/sales_order.js:1356
msgid "Reason for hold:"
msgstr ""
@@ -43090,7 +43151,7 @@ msgstr ""
msgid "Records"
msgstr ""
-#: erpnext/regional/united_arab_emirates/utils.py:171
+#: erpnext/regional/united_arab_emirates/utils.py:193
msgid "Recoverable Standard Rated expenses should not be set when Reverse Charge Applicable is Y"
msgstr ""
@@ -43532,11 +43593,11 @@ msgstr ""
msgid "References"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:385
msgid "References to Sales Invoices are Incomplete"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:380
msgid "References to Sales Orders are Incomplete"
msgstr ""
@@ -43681,14 +43742,14 @@ msgstr ""
#. Label of the release_date (Date) field in DocType 'Purchase Invoice'
#. Label of the release_date (Date) field in DocType 'Supplier'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:268
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:312
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:274
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:318
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:315
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:317
msgid "Release date must be in the future"
msgstr ""
@@ -43763,7 +43824,7 @@ msgstr ""
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1254
#: erpnext/accounts/report/general_ledger/general_ledger.html:84
#: erpnext/accounts/report/general_ledger/general_ledger.html:110
-#: erpnext/accounts/report/general_ledger/general_ledger.py:752
+#: erpnext/accounts/report/general_ledger/general_ledger.py:785
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112
#: erpnext/accounts/report/purchase_register/purchase_register.py:296
#: erpnext/accounts/report/sales_register/sales_register.py:335
@@ -43860,8 +43921,8 @@ msgstr ""
#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:58
#: erpnext/crm/doctype/opportunity/opportunity.js:130
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:354
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:305
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:360
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:312
#: erpnext/support/doctype/issue/issue.js:39
msgid "Reopen"
msgstr ""
@@ -44493,7 +44554,7 @@ msgstr ""
msgid "Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:606
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:608
msgid "Reserved Qty should be greater than Delivered Qty."
msgstr ""
@@ -44794,7 +44855,7 @@ msgstr ""
msgid "Resume"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:200
+#: erpnext/manufacturing/doctype/job_card/job_card.js:208
msgid "Resume Job"
msgstr ""
@@ -44824,7 +44885,7 @@ msgstr ""
msgid "Retained Earnings"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:295
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:302
msgid "Retention Stock Entry"
msgstr ""
@@ -44918,13 +44979,13 @@ msgstr ""
msgid "Return Issued"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:355
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:362
msgid "Return Qty"
msgstr ""
#. Label of the return_qty_from_rejected_warehouse (Check) field in DocType
#. 'Purchase Receipt Item'
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:331
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:338
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
msgid "Return Qty from Rejected Warehouse"
msgstr ""
@@ -45390,12 +45451,12 @@ msgstr ""
msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:518
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1919
msgid "Row #{0} (Payment Table): Amount must be negative"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:515
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:516
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr ""
@@ -45454,7 +45515,7 @@ msgstr ""
msgid "Row #{0}: BOM is not specified for subcontracting item {0}"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:405
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:407
msgid "Row #{0}: Batch No {1} is already selected."
msgstr ""
@@ -45490,7 +45551,7 @@ msgstr ""
msgid "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}"
msgstr ""
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:86
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:87
msgid "Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save"
msgstr ""
@@ -45530,7 +45591,7 @@ msgstr ""
msgid "Row #{0}: Default BOM not found for FG Item {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:533
+#: erpnext/assets/doctype/asset/asset.py:549
msgid "Row #{0}: Depreciation Start Date is required"
msgstr ""
@@ -45582,7 +45643,7 @@ msgstr ""
msgid "Row #{0}: From Time and To Time fields are required"
msgstr ""
-#: erpnext/public/js/utils/barcode_scanner.js:394
+#: erpnext/public/js/utils/barcode_scanner.js:428
msgid "Row #{0}: Item added"
msgstr ""
@@ -45590,7 +45651,7 @@ msgstr ""
msgid "Row #{0}: Item {1} does not exist"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1549
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr ""
@@ -45614,11 +45675,11 @@ msgstr ""
msgid "Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:527
+#: erpnext/assets/doctype/asset/asset.py:543
msgid "Row #{0}: Next Depreciation Date cannot be before Available-for-use Date"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:522
+#: erpnext/assets/doctype/asset/asset.py:538
msgid "Row #{0}: Next Depreciation Date cannot be before Purchase Date"
msgstr ""
@@ -45626,11 +45687,11 @@ msgstr ""
msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1632
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:499
+#: erpnext/assets/doctype/asset/asset.py:515
msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}"
msgstr ""
@@ -45638,15 +45699,15 @@ msgstr ""
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/manufacturing/doctype/production_plan/production_plan.py:1009
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1010
msgid "Row #{0}: Please select Item Code in Assembly Items"
msgstr ""
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1012
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1013
msgid "Row #{0}: Please select the BOM No in Assembly Items"
msgstr ""
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1006
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1007
msgid "Row #{0}: Please select the Sub Assembly Warehouse"
msgstr ""
@@ -45658,7 +45719,7 @@ msgstr ""
msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master"
msgstr ""
-#: erpnext/public/js/utils/barcode_scanner.js:392
+#: erpnext/public/js/utils/barcode_scanner.js:426
msgid "Row #{0}: Qty increased by {1}"
msgstr ""
@@ -45667,7 +45728,7 @@ msgstr ""
msgid "Row #{0}: Qty must be a positive number"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:393
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:395
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 ""
@@ -45683,12 +45744,16 @@ msgstr ""
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr ""
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:96
+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:1375
#: erpnext/controllers/accounts_controller.py:3663
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1617
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr ""
@@ -45738,11 +45803,11 @@ msgstr ""
msgid "Row #{0}: Serial No {1} does not belong to Batch {2}"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:342
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:344
msgid "Row #{0}: Serial No {1} for Item {2} is not available in {3} {4} or might be reserved in another {5}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:358
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:360
msgid "Row #{0}: Serial No {1} is already selected."
msgstr ""
@@ -45762,6 +45827,10 @@ msgstr ""
msgid "Row #{0}: Set Supplier for item {1}"
msgstr ""
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1017
+msgid "Row #{0}: Since 'Track Semi Finished Goods' is enabled, the BOM {1} cannot be used for Sub Assembly Items"
+msgstr ""
+
#: erpnext/manufacturing/doctype/workstation/workstation.py:92
msgid "Row #{0}: Start Time and End Time are required"
msgstr ""
@@ -45778,32 +45847,32 @@ msgstr ""
msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:367
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:369
msgid "Row #{0}: Stock cannot be reserved for Item {1} against a disabled Batch {2}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1562
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1575
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1589
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:539
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:377
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:379
msgid "Row #{0}: Stock not available to reserve for Item {1} against Batch {2} in Warehouse {3}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1224
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1603
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr ""
@@ -45819,7 +45888,7 @@ msgstr ""
msgid "Row #{0}: Timings conflicts with row {1}"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:512
+#: erpnext/assets/doctype/asset/asset.py:528
msgid "Row #{0}: Total Number of Depreciations cannot be less than or equal to Opening Number of Booked Depreciations"
msgstr ""
@@ -45891,11 +45960,11 @@ msgstr ""
msgid "Row #{}: Currency of {} - {} doesn't matches company currency."
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:349
+#: erpnext/assets/doctype/asset/asset.py:350
msgid "Row #{}: Finance Book should not be empty since you're using multiple."
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:406
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:407
msgid "Row #{}: Item Code: {} is not available under warehouse {}."
msgstr ""
@@ -45915,23 +45984,23 @@ msgstr ""
msgid "Row #{}: Please assign task to a member."
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:341
+#: erpnext/assets/doctype/asset/asset.py:342
msgid "Row #{}: Please use a different Finance Book."
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:477
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:478
msgid "Row #{}: Serial No {} cannot be returned since it was not transacted in original invoice {}"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:413
-msgid "Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}. Available quantity {}."
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:414
+msgid "Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}."
msgstr ""
#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:104
msgid "Row #{}: The original Invoice {} of return invoice {} is not consolidated."
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:450
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:451
msgid "Row #{}: You cannot add positive quantities in a return invoice. Please remove item {} to complete the return."
msgstr ""
@@ -45952,7 +46021,7 @@ msgstr ""
msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}."
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:434
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:436
msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}"
msgstr ""
@@ -46061,19 +46130,19 @@ msgstr ""
msgid "Row {0}: Exchange Rate is mandatory"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:474
+#: erpnext/assets/doctype/asset/asset.py:490
msgid "Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:525
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:527
msgid "Row {0}: Expense Head changed to {1} as no Purchase Receipt is created against Item {2}."
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:482
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:484
msgid "Row {0}: Expense Head changed to {1} because account {2} is not linked to warehouse {3} or it is not the default inventory account"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:507
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:509
msgid "Row {0}: Expense Head changed to {1} because expense is booked against this account in Purchase Receipt {2}"
msgstr ""
@@ -46126,7 +46195,7 @@ msgstr ""
msgid "Row {0}: Item {1}'s quantity cannot be higher than the available quantity."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:596
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr ""
@@ -46242,7 +46311,7 @@ msgstr ""
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1072
+#: erpnext/manufacturing/doctype/bom/bom.py:1109
#: erpnext/manufacturing/doctype/work_order/work_order.py:277
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr ""
@@ -46469,6 +46538,8 @@ msgstr ""
#: erpnext/accounts/doctype/shipping_rule/shipping_rule_dashboard.py:10
#: erpnext/accounts/doctype/tax_category/tax_category_dashboard.py:9
#: erpnext/accounts/doctype/tax_rule/tax_rule.json
+#: erpnext/crm/doctype/opportunity/opportunity.js:288
+#: erpnext/crm/doctype/opportunity/opportunity.py:158
#: erpnext/projects/doctype/project/project_dashboard.py:15
#: erpnext/regional/report/vat_audit_report/vat_audit_report.py:185
#: erpnext/selling/doctype/quotation/quotation.json
@@ -46561,8 +46632,8 @@ msgstr ""
#: erpnext/accounts/doctype/sales_invoice_reference/sales_invoice_reference.json
#: erpnext/accounts/print_format/sales_auditing_voucher/sales_auditing_voucher.html:5
#: erpnext/accounts/report/gross_profit/gross_profit.js:30
-#: erpnext/accounts/report/gross_profit/gross_profit.py:256
-#: erpnext/accounts/report/gross_profit/gross_profit.py:263
+#: erpnext/accounts/report/gross_profit/gross_profit.py:262
+#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: erpnext/accounts/workspace/accounting/accounting.json
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/crm/doctype/contract/contract.json
@@ -46574,7 +46645,7 @@ msgstr ""
#: erpnext/selling/workspace/selling/selling.json
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/setup/workspace/home/home.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:343
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:349
#: erpnext/stock/doctype/delivery_note/delivery_note_list.js:65
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
msgid "Sales Invoice"
@@ -46652,11 +46723,11 @@ msgstr ""
msgid "Sales Invoice isn't created by user {}"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:422
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:423
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:616
msgid "Sales Invoice {0} has already been submitted"
msgstr ""
@@ -46800,7 +46871,7 @@ msgstr ""
#: erpnext/selling/workspace/selling/selling.json
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.js:160
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:223
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:226
#: erpnext/stock/doctype/material_request/material_request.js:219
#: erpnext/stock/doctype/material_request_item/material_request_item.json
#: erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -46852,7 +46923,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/production_plan_item_reference/production_plan_item_reference.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/selling/doctype/sales_order/sales_order.js:313
-#: erpnext/selling/doctype/sales_order/sales_order.js:870
+#: erpnext/selling/doctype/sales_order/sales_order.js:873
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/stock/doctype/material_request_item/material_request_item.json
#: erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -46885,7 +46956,7 @@ msgstr ""
msgid "Sales Order Trends"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:268
msgid "Sales Order required for Item {0}"
msgstr ""
@@ -47055,7 +47126,7 @@ msgstr ""
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:191
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:80
#: erpnext/accounts/report/gross_profit/gross_profit.js:50
-#: erpnext/accounts/report/gross_profit/gross_profit.py:371
+#: erpnext/accounts/report/gross_profit/gross_profit.py:377
#: erpnext/crm/workspace/crm/crm.json
#: erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
#: erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
@@ -47136,8 +47207,8 @@ msgstr ""
msgid "Sales Representative"
msgstr ""
-#: erpnext/accounts/report/gross_profit/gross_profit.py:857
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:267
+#: erpnext/accounts/report/gross_profit/gross_profit.py:874
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:273
msgid "Sales Return"
msgstr ""
@@ -47395,8 +47466,8 @@ msgstr ""
#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js:119
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:628
#: erpnext/accounts/doctype/ledger_merge/ledger_merge.js:75
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:292
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:328
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47434,7 +47505,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/public/js/utils/barcode_scanner.js:215
+#: erpnext/public/js/utils/barcode_scanner.js:241
#: erpnext/selling/doctype/quotation/quotation.json
#: erpnext/selling/doctype/sales_order/sales_order.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -47466,7 +47537,7 @@ msgstr ""
msgid "Scan Serial No"
msgstr ""
-#: erpnext/public/js/utils/barcode_scanner.js:179
+#: erpnext/public/js/utils/barcode_scanner.js:205
msgid "Scan barcode for item {0}"
msgstr ""
@@ -47480,7 +47551,7 @@ msgstr ""
msgid "Scanned Cheque"
msgstr ""
-#: erpnext/public/js/utils/barcode_scanner.js:247
+#: erpnext/public/js/utils/barcode_scanner.js:273
msgid "Scanned Quantity"
msgstr ""
@@ -47772,7 +47843,7 @@ msgid "Segregate Serial / Batch Bundle"
msgstr ""
#: erpnext/buying/doctype/purchase_order/purchase_order.js:250
-#: erpnext/selling/doctype/sales_order/sales_order.js:1107
+#: erpnext/selling/doctype/sales_order/sales_order.js:1110
#: erpnext/selling/doctype/sales_order/sales_order_list.js:96
#: erpnext/selling/report/sales_analytics/sales_analytics.js:93
msgid "Select"
@@ -47794,15 +47865,15 @@ msgstr ""
msgid "Select Attribute Values"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:853
+#: erpnext/selling/doctype/sales_order/sales_order.js:856
msgid "Select BOM"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:834
+#: erpnext/selling/doctype/sales_order/sales_order.js:837
msgid "Select BOM and Qty for Production"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:985
+#: erpnext/selling/doctype/sales_order/sales_order.js:988
msgid "Select BOM, Qty and For Warehouse"
msgstr ""
@@ -47832,7 +47903,7 @@ msgstr ""
msgid "Select Company"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:468
+#: erpnext/manufacturing/doctype/job_card/job_card.js:476
msgid "Select Corrective Operation"
msgstr ""
@@ -47873,7 +47944,7 @@ msgstr ""
msgid "Select DocType"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:186
+#: erpnext/manufacturing/doctype/job_card/job_card.js:194
msgid "Select Employees"
msgstr ""
@@ -47881,12 +47952,12 @@ msgstr ""
msgid "Select Finished Good"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:1186
-#: erpnext/selling/doctype/sales_order/sales_order.js:1198
+#: erpnext/selling/doctype/sales_order/sales_order.js:1189
+#: erpnext/selling/doctype/sales_order/sales_order.js:1201
msgid "Select Items"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:1072
+#: erpnext/selling/doctype/sales_order/sales_order.js:1075
msgid "Select Items based on Delivery Date"
msgstr ""
@@ -47897,7 +47968,7 @@ msgstr ""
#. Label of the select_items_to_manufacture_section (Section Break) field in
#. DocType 'Production Plan'
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:881
+#: erpnext/selling/doctype/sales_order/sales_order.js:884
msgid "Select Items to Manufacture"
msgstr ""
@@ -47911,7 +47982,7 @@ msgstr ""
msgid "Select Job Worker Address"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1118
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1127
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:955
msgid "Select Loyalty Program"
msgstr ""
@@ -48045,7 +48116,7 @@ msgstr ""
msgid "Select item group"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:376
+#: erpnext/manufacturing/doctype/bom/bom.js:397
msgid "Select template item"
msgstr ""
@@ -48062,7 +48133,7 @@ msgstr ""
msgid "Select the Item to be manufactured."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:858
+#: erpnext/manufacturing/doctype/bom/bom.js:879
msgid "Select the Item to be manufactured. The Item name, UoM, Company, and Currency will be fetched automatically."
msgstr ""
@@ -48083,11 +48154,11 @@ msgstr ""
msgid "Select the date and your timezone"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:877
+#: erpnext/manufacturing/doctype/bom/bom.js:898
msgid "Select the raw materials (Items) required to manufacture the Item"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:431
+#: erpnext/manufacturing/doctype/bom/bom.js:452
msgid "Select variant item code for the template item {0}"
msgstr ""
@@ -48171,7 +48242,7 @@ msgstr ""
msgid "Selling"
msgstr ""
-#: erpnext/accounts/report/gross_profit/gross_profit.py:330
+#: erpnext/accounts/report/gross_profit/gross_profit.py:336
msgid "Selling Amount"
msgstr ""
@@ -48343,7 +48414,7 @@ msgstr ""
msgid "Serial / Batch Bundle"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:441
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:442
msgid "Serial / Batch Bundle Missing"
msgstr ""
@@ -48420,7 +48491,7 @@ msgstr ""
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:65
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:149
#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:37
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:409
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:436
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:38
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:60
#: erpnext/stock/report/stock_ledger/stock_ledger.py:336
@@ -48520,7 +48591,7 @@ msgstr ""
msgid "Serial No {0} already exists"
msgstr ""
-#: erpnext/public/js/utils/barcode_scanner.js:321
+#: erpnext/public/js/utils/barcode_scanner.js:347
msgid "Serial No {0} already scanned"
msgstr ""
@@ -48541,7 +48612,7 @@ msgstr ""
msgid "Serial No {0} does not exists"
msgstr ""
-#: erpnext/public/js/utils/barcode_scanner.js:402
+#: erpnext/public/js/utils/barcode_scanner.js:436
msgid "Serial No {0} is already added"
msgstr ""
@@ -48569,7 +48640,7 @@ msgstr ""
msgid "Serial No: {0} has already been transacted into another POS Invoice."
msgstr ""
-#: erpnext/public/js/utils/barcode_scanner.js:271
+#: erpnext/public/js/utils/barcode_scanner.js:297
#: erpnext/public/js/utils/serial_no_batch_selector.js:16
#: erpnext/public/js/utils/serial_no_batch_selector.js:190
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:50
@@ -49066,8 +49137,8 @@ msgstr ""
msgid "Set Default Supplier"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:339
-#: erpnext/manufacturing/doctype/job_card/job_card.js:408
+#: erpnext/manufacturing/doctype/job_card/job_card.js:347
+#: erpnext/manufacturing/doctype/job_card/job_card.js:416
msgid "Set Finished Good Quantity"
msgstr ""
@@ -49098,11 +49169,11 @@ msgstr ""
msgid "Set Landed Cost Based on Purchase Invoice Rate"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1130
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1139
msgid "Set Loyalty Program"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:312
msgid "Set New Release Date"
msgstr ""
@@ -49131,7 +49202,7 @@ msgstr ""
msgid "Set Posting Date"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:904
+#: erpnext/manufacturing/doctype/bom/bom.js:925
msgid "Set Process Loss Item Quantity"
msgstr ""
@@ -49145,7 +49216,7 @@ msgstr ""
msgid "Set Project and all Tasks to status {0}?"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:905
+#: erpnext/manufacturing/doctype/bom/bom.js:926
msgid "Set Quantity"
msgstr ""
@@ -49252,7 +49323,7 @@ msgstr ""
msgid "Set fieldname from which you want to fetch the data from the parent form."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:894
+#: erpnext/manufacturing/doctype/bom/bom.js:915
msgid "Set quantity of process loss item:"
msgstr ""
@@ -49282,15 +49353,15 @@ msgstr ""
msgid "Set this if the customer is a Public Administration company."
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:750
+#: erpnext/assets/doctype/asset/asset.py:766
msgid "Set {0} in asset category {1} for company {2}"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:1083
+#: erpnext/assets/doctype/asset/asset.py:1099
msgid "Set {0} in asset category {1} or company {2}"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:1080
+#: erpnext/assets/doctype/asset/asset.py:1096
msgid "Set {0} in company {1}"
msgstr ""
@@ -49357,7 +49428,7 @@ msgstr ""
msgid "Setting up company"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.py:1051
+#: erpnext/manufacturing/doctype/bom/bom.py:1088
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr ""
@@ -49490,7 +49561,7 @@ msgid "Shift Name"
msgstr ""
#. Name of a DocType
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:243
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:249
#: erpnext/stock/doctype/shipment/shipment.json
msgid "Shipment"
msgstr ""
@@ -49541,7 +49612,7 @@ msgstr ""
msgid "Shipment details"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:787
msgid "Shipments"
msgstr ""
@@ -50225,7 +50296,7 @@ msgstr ""
msgid "Source Document Name"
msgstr ""
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:478
msgid "Source Document No"
msgstr ""
@@ -50275,7 +50346,7 @@ msgstr ""
#. Label of the s_warehouse (Link) field in DocType 'Stock Entry Detail'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/manufacturing/doctype/bom/bom.js:403
+#: erpnext/manufacturing/doctype/bom/bom.js:424
#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
@@ -50303,7 +50374,7 @@ msgstr ""
msgid "Source Warehouse Address Link"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1154
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr ""
@@ -50399,7 +50470,7 @@ msgstr ""
msgid "Split Qty"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:1222
+#: erpnext/assets/doctype/asset/asset.py:1238
msgid "Split Quantity must be less than Asset Quantity"
msgstr ""
@@ -50592,7 +50663,7 @@ msgstr ""
msgid "Start Import"
msgstr ""
-#: erpnext/manufacturing/doctype/job_card/job_card.js:180
+#: erpnext/manufacturing/doctype/job_card/job_card.js:188
#: erpnext/manufacturing/doctype/workstation/workstation.js:124
msgid "Start Job"
msgstr ""
@@ -50901,14 +50972,14 @@ msgstr ""
#: erpnext/setup/doctype/driver/driver.json
#: erpnext/setup/doctype/employee/employee.json
#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:323
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:358
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:329
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:364
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_trip/delivery_trip.json
#: erpnext/stock/doctype/material_request/material_request.json
#: erpnext/stock/doctype/pick_list/pick_list.json
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:276
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:305
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:283
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:312
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
#: erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
@@ -50987,8 +51058,8 @@ msgstr ""
#: erpnext/accounts/doctype/account/account.json
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:50
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:73
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1337
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1363
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1339
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1365
#: erpnext/accounts/report/account_balance/account_balance.js:58
msgid "Stock Adjustment"
msgstr ""
@@ -51145,7 +51216,7 @@ msgstr ""
msgid "Stock Entry Type"
msgstr ""
-#: erpnext/stock/doctype/pick_list/pick_list.py:1384
+#: erpnext/stock/doctype/pick_list/pick_list.py:1396
msgid "Stock Entry has been already created against this Pick List"
msgstr ""
@@ -51379,14 +51450,14 @@ msgstr ""
#: erpnext/stock/doctype/pick_list/pick_list.js:166
#: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12
#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:714
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:666
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1225
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1563
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1576
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1590
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1604
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1618
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1635
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:668
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1227
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1565
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1578
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1592
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1606
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1620
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1637
#: erpnext/stock/doctype/stock_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51395,13 +51466,13 @@ msgstr ""
msgid "Stock Reservation"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1746
msgid "Stock Reservation Entries Cancelled"
msgstr ""
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2156
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1698
msgid "Stock Reservation Entries Created"
msgstr ""
@@ -51409,25 +51480,25 @@ msgstr ""
#: erpnext/public/js/stock_reservation.js:308
#: erpnext/selling/doctype/sales_order/sales_order.js:444
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:352
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:354
#: erpnext/stock/report/reserved_stock/reserved_stock.js:53
#: erpnext/stock/report/reserved_stock/reserved_stock.py:171
msgid "Stock Reservation Entry"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:528
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:530
msgid "Stock Reservation Entry cannot be updated as it has been delivered."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:522
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:524
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:547
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:549
msgid "Stock Reservation Warehouse Mismatch"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:675
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:677
msgid "Stock Reservation can only be created against {0}."
msgstr ""
@@ -51462,7 +51533,7 @@ msgstr ""
#. Label of a Link in the Stock Workspace
#: erpnext/setup/doctype/company/company.json
#: erpnext/setup/workspace/settings/settings.json
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:667
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:669
#: erpnext/stock/doctype/stock_settings/stock_settings.json
#: erpnext/stock/workspace/stock/stock.json
msgid "Stock Settings"
@@ -51668,11 +51739,11 @@ msgstr ""
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1510
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:727
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:729
msgid "Stock cannot be updated against Purchase Receipt {0}"
msgstr ""
@@ -51684,11 +51755,11 @@ msgstr ""
msgid "Stock cannot be updated because the invoice contains a drop shipping item. Please disable 'Update Stock' or remove the drop shipping item."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1121
msgid "Stock has been unreserved for work order {0}."
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:323
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:325
msgid "Stock not available for Item {0} in Warehouse {1}."
msgstr ""
@@ -52000,7 +52071,7 @@ msgstr ""
msgid "Subcontracting Order Supplied Item"
msgstr ""
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:943
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:965
msgid "Subcontracting Order {0} created."
msgstr ""
@@ -52090,7 +52161,7 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:939
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:961
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:910
msgid "Submit Action Failed"
msgstr ""
@@ -52541,7 +52612,7 @@ msgstr ""
#: erpnext/selling/doctype/customer/customer.js:230
#: erpnext/selling/doctype/party_specific_item/party_specific_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:160
-#: erpnext/selling/doctype/sales_order/sales_order.js:1231
+#: erpnext/selling/doctype/sales_order/sales_order.js:1235
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/doctype/sms_center/sms_center.json
#: erpnext/setup/workspace/home/home.json
@@ -52552,7 +52623,7 @@ msgstr ""
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
#: erpnext/stock/doctype/shipment/shipment.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:462
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:505
#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr ""
@@ -52677,7 +52748,7 @@ msgstr ""
msgid "Supplier Invoice Date"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1730
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1732
msgid "Supplier Invoice Date cannot be greater than Posting Date"
msgstr ""
@@ -52687,12 +52758,12 @@ msgstr ""
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:59
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/report/general_ledger/general_ledger.html:104
-#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/general_ledger/general_ledger.py:780
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1757
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1759
msgid "Supplier Invoice No exists in Purchase Invoice {0}"
msgstr ""
@@ -52920,7 +52991,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:62
+#: erpnext/manufacturing/doctype/job_card/job_card.js:70
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
msgid "Supplier Warehouse"
msgstr ""
@@ -53253,7 +53324,7 @@ msgstr ""
msgid "TDS Computation Summary"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1514
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1516
msgid "TDS Deducted"
msgstr ""
@@ -54107,7 +54178,7 @@ msgstr ""
msgid "Template"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:355
+#: erpnext/manufacturing/doctype/bom/bom.js:376
msgid "Template Item"
msgstr ""
@@ -54343,7 +54414,7 @@ msgstr ""
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:182
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:68
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:221
-#: erpnext/accounts/report/gross_profit/gross_profit.py:399
+#: erpnext/accounts/report/gross_profit/gross_profit.py:411
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js:8
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:21
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:263
@@ -54442,7 +54513,7 @@ msgstr ""
msgid "The BOM which will be replaced"
msgstr ""
-#: erpnext/stock/serial_batch_bundle.py:1378
+#: erpnext/stock/serial_batch_bundle.py:1394
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr ""
@@ -54557,7 +54628,7 @@ msgstr ""
msgid "The field To Shareholder cannot be blank"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:399
msgid "The field {0} in row {1} is not set"
msgstr ""
@@ -54626,6 +54697,10 @@ msgstr ""
msgid "The job card {0} is in {1} state and you cannot start it again."
msgstr ""
+#: erpnext/public/js/utils/barcode_scanner.js:533
+msgid "The last scanned warehouse has been cleared and won't be set in the subsequently scanned items"
+msgstr ""
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.py:46
msgid "The lowest tier must have a minimum spent amount of 0. Customers need to be part of a tier as soon as they are enrolled in the program."
msgstr ""
@@ -54704,7 +54779,7 @@ msgstr ""
msgid "The selected BOMs are not for the same item"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:493
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:494
msgid "The selected change account {} doesn't belongs to Company {}."
msgstr ""
@@ -54838,7 +54913,7 @@ msgstr ""
msgid "Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc."
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:579
+#: erpnext/assets/doctype/asset/asset.py:595
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr ""
@@ -54941,7 +55016,7 @@ msgstr ""
msgid "This Month's Summary"
msgstr ""
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:952
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:974
msgid "This PO has been fully subcontracted."
msgstr ""
@@ -54965,7 +55040,7 @@ msgstr ""
msgid "This action will unlink this account from any external service integrating ERPNext with your bank accounts. It cannot be undone. Are you certain ?"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:359
+#: erpnext/assets/doctype/asset/asset.py:360
msgid "This asset category is marked as non-depreciable. Please disable depreciation calculation or choose a different category."
msgstr ""
@@ -54977,7 +55052,7 @@ msgstr ""
msgid "This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:483
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:489
msgid "This field is used to set the 'Customer'."
msgstr ""
@@ -54987,11 +55062,11 @@ msgstr ""
msgid "This filter will be applied to Journal Entry."
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:812
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:813
msgid "This invoice has already been paid."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:219
+#: erpnext/manufacturing/doctype/bom/bom.js:240
msgid "This is a Template BOM and will be used to make the work order for {0} of the item {1}"
msgstr ""
@@ -55064,7 +55139,7 @@ msgstr ""
msgid "This is considered dangerous from accounting point of view."
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:531
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:533
msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice"
msgstr ""
@@ -55080,7 +55155,7 @@ msgstr ""
msgid "This item filter has already been applied for the {0}"
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:496
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:502
msgid "This option can be checked to edit the 'Posting Date' and 'Posting Time' fields."
msgstr ""
@@ -55116,7 +55191,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was scrapped."
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:1356
+#: erpnext/assets/doctype/asset/asset.py:1372
msgid "This schedule was created when Asset {0} was {1} into new Asset {2}."
msgstr ""
@@ -55138,7 +55213,7 @@ msgstr ""
msgid "This section allows the user to set the Body and Closing text of the Dunning Letter for the Dunning Type based on language, which can be used in Print."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:489
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:495
msgid "This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc."
msgstr ""
@@ -55338,7 +55413,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Projects Workspace
#. Label of a shortcut in the Projects Workspace
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1014
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1023
#: erpnext/projects/doctype/timesheet/timesheet.json
#: erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py:26
#: erpnext/projects/report/timesheet_billing_summary/timesheet_billing_summary.py:59
@@ -55453,7 +55528,7 @@ msgstr ""
#. Label of the to_uom (Link) field in DocType 'UOM Conversion Factor'
#. Label of the to (Data) field in DocType 'Call Log'
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1046
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1055
#: erpnext/setup/doctype/uom_conversion_factor/uom_conversion_factor.json
#: erpnext/telephony/doctype/call_log/call_log.json
#: erpnext/templates/pages/projects.html:68
@@ -55824,7 +55899,7 @@ msgstr ""
msgid "To Warehouse (Optional)"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:872
+#: erpnext/manufacturing/doctype/bom/bom.js:893
msgid "To add Operations tick the 'With Operations' checkbox."
msgstr ""
@@ -55899,11 +55974,11 @@ msgstr ""
msgid "To still proceed with editing this Attribute Value, enable {0} in Item Variant Settings."
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:621
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:623
msgid "To submit the invoice without purchase order please set {0} as {1} in {2}"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:642
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:644
msgid "To submit the invoice without purchase receipt please set {0} as {1} in {2}"
msgstr ""
@@ -55913,7 +55988,7 @@ msgid "To use a different finance book, please uncheck 'Include Default FB Asset
msgstr ""
#: erpnext/accounts/report/financial_statements.py:603
-#: erpnext/accounts/report/general_ledger/general_ledger.py:304
+#: erpnext/accounts/report/general_ledger/general_ledger.py:310
#: erpnext/accounts/report/trial_balance/trial_balance.py:292
msgid "To use a different finance book, please uncheck 'Include Default FB Entries'"
msgstr ""
@@ -56007,7 +56082,7 @@ msgstr ""
#: erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py:229
#: erpnext/accounts/report/financial_statements.py:699
#: erpnext/accounts/report/general_ledger/general_ledger.html:132
-#: erpnext/accounts/report/general_ledger/general_ledger.py:378
+#: erpnext/accounts/report/general_ledger/general_ledger.py:398
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:699
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:93
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:98
@@ -56816,7 +56891,7 @@ msgstr ""
msgid "Total hours: {0}"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:523
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:524
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:536
msgid "Total payments amount can't be greater than {}"
msgstr ""
@@ -57476,7 +57551,7 @@ msgstr ""
#: erpnext/quality_management/doctype/quality_review_objective/quality_review_objective.json
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
#: erpnext/selling/doctype/quotation_item/quotation_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1225
+#: erpnext/selling/doctype/sales_order/sales_order.js:1228
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:43
#: erpnext/selling/report/sales_analytics/sales_analytics.py:138
@@ -57550,7 +57625,7 @@ msgstr ""
msgid "UOM Conversion Factor"
msgstr ""
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1387
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1404
msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}"
msgstr ""
@@ -57934,11 +58009,11 @@ msgstr ""
#: erpnext/accounts/doctype/account/account.js:204
#: erpnext/accounts/doctype/cost_center/cost_center.js:107
-#: erpnext/manufacturing/doctype/job_card/job_card.js:338
-#: erpnext/manufacturing/doctype/job_card/job_card.js:407
+#: erpnext/manufacturing/doctype/job_card/job_card.js:346
+#: erpnext/manufacturing/doctype/job_card/job_card.js:415
#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:500
#: erpnext/public/js/utils.js:608 erpnext/public/js/utils.js:912
-#: erpnext/public/js/utils/barcode_scanner.js:183
+#: erpnext/public/js/utils/barcode_scanner.js:209
#: erpnext/public/js/utils/serial_no_batch_selector.js:17
#: erpnext/public/js/utils/serial_no_batch_selector.js:191
#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js:179
@@ -58039,7 +58114,7 @@ msgstr ""
#. Option for the 'Update Type' (Select) field in DocType 'BOM Update Log'
#. Label of the update_cost_section (Section Break) field in DocType 'BOM
#. Update Tool'
-#: erpnext/manufacturing/doctype/bom/bom.js:135
+#: erpnext/manufacturing/doctype/bom/bom.js:156
#: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.json
#: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json
msgid "Update Cost"
@@ -58133,7 +58208,7 @@ msgstr ""
msgid "Update latest price in all BOMs"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:401
+#: erpnext/assets/doctype/asset/asset.py:402
msgid "Update stock must be enabled for the purchase invoice {0}"
msgstr ""
@@ -58149,7 +58224,7 @@ msgstr ""
msgid "Update timestamp on new communication"
msgstr ""
-#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:534
+#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:539
msgid "Updated successfully"
msgstr ""
@@ -58257,7 +58332,7 @@ msgstr ""
#. Label of the use_multi_level_bom (Check) field in DocType 'Work Order'
#. Label of the use_multi_level_bom (Check) field in DocType 'Stock Entry'
-#: erpnext/manufacturing/doctype/bom/bom.js:337
+#: erpnext/manufacturing/doctype/bom/bom.js:358
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Use Multi-Level BOM"
@@ -58587,7 +58662,7 @@ msgstr ""
msgid "Valid till Date cannot be before Transaction Date"
msgstr ""
-#: erpnext/selling/doctype/quotation/quotation.py:154
+#: erpnext/selling/doctype/quotation/quotation.py:156
msgid "Valid till date cannot be before transaction date"
msgstr ""
@@ -58649,7 +58724,7 @@ msgstr ""
msgid "Validity in Days"
msgstr ""
-#: erpnext/selling/doctype/quotation/quotation.py:361
+#: erpnext/selling/doctype/quotation/quotation.py:363
msgid "Validity period of this quotation has ended."
msgstr ""
@@ -58698,7 +58773,7 @@ msgstr ""
#. Label of the valuation_rate (Currency) field in DocType 'Stock
#. Reconciliation Item'
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:323
+#: erpnext/accounts/report/gross_profit/gross_profit.py:329
#: erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
#: erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json
#: erpnext/manufacturing/doctype/bom/bom.json
@@ -58927,7 +59002,7 @@ msgstr ""
msgid "Variant Attributes"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:176
+#: erpnext/manufacturing/doctype/bom/bom.js:197
msgid "Variant BOM"
msgstr ""
@@ -58949,8 +59024,8 @@ msgstr ""
msgid "Variant Field"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:291
-#: erpnext/manufacturing/doctype/bom/bom.js:370
+#: erpnext/manufacturing/doctype/bom/bom.js:312
+#: erpnext/manufacturing/doctype/bom/bom.js:391
msgid "Variant Item"
msgstr ""
@@ -59084,7 +59159,7 @@ msgstr ""
#: erpnext/accounts/doctype/cost_center/cost_center_tree.js:56
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js:205
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:76
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:14
#: erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:24
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:167
@@ -59108,8 +59183,8 @@ msgstr ""
#: erpnext/stock/doctype/item/item.js:142
#: erpnext/stock/doctype/item/item.js:150
#: erpnext/stock/doctype/item/item.js:158
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:228
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:239
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:232
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:243
#: erpnext/stock/doctype/stock_entry/stock_entry.js:297
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:46
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:62
@@ -59137,7 +59212,7 @@ msgstr ""
msgid "View Leads"
msgstr ""
-#: erpnext/accounts/doctype/account/account_tree.js:275
+#: erpnext/accounts/doctype/account/account_tree.js:270
#: erpnext/stock/doctype/batch/batch.js:18
msgid "View Ledger"
msgstr ""
@@ -59275,7 +59350,7 @@ msgstr ""
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:209
#: erpnext/accounts/report/general_ledger/general_ledger.js:49
-#: erpnext/accounts/report/general_ledger/general_ledger.py:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:735
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js:41
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:33
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:65
@@ -59314,7 +59389,7 @@ msgstr ""
#. Label of the voucher_subtype (Small Text) field in DocType 'GL Entry'
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:729
msgid "Voucher Subtype"
msgstr ""
@@ -59346,7 +59421,7 @@ msgstr ""
#: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1184
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:200
-#: erpnext/accounts/report/general_ledger/general_ledger.py:707
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
@@ -59367,7 +59442,7 @@ msgstr ""
#: erpnext/stock/report/reserved_stock/reserved_stock.py:145
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:40
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:107
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:429
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:472
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:27
#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:114
#: erpnext/stock/report/stock_ledger/stock_ledger.py:320
@@ -59501,7 +59576,7 @@ msgstr ""
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/gross_profit/gross_profit.js:56
-#: erpnext/accounts/report/gross_profit/gross_profit.py:308
+#: erpnext/accounts/report/gross_profit/gross_profit.py:314
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:41
#: erpnext/accounts/report/purchase_register/purchase_register.js:52
#: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py:28
@@ -59551,7 +59626,7 @@ msgstr ""
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:350
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:352
#: erpnext/stock/doctype/warehouse/warehouse.json
#: erpnext/stock/page/stock_balance/stock_balance.js:11
#: erpnext/stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:25
@@ -59577,7 +59652,7 @@ msgstr ""
#: erpnext/stock/report/reserved_stock/reserved_stock.py:96
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:34
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:138
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:442
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:485
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:21
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:47
#: erpnext/stock/report/stock_ageing/stock_ageing.js:30
@@ -59699,7 +59774,7 @@ msgid "Warehouse not found against the account {0}"
msgstr ""
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1160
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:426
msgid "Warehouse required for stock Item {0}"
msgstr ""
@@ -59888,6 +59963,10 @@ msgstr ""
msgid "Warranty Claim"
msgstr ""
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:525
+msgid "Warranty Expiry (Serial)"
+msgstr ""
+
#. Label of the warranty_expiry_date (Date) field in DocType 'Serial No'
#. Label of the warranty_expiry_date (Date) field in DocType 'Warranty Claim'
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -60311,7 +60390,7 @@ msgstr ""
#. Entry'
#. Option for the 'From Voucher Type' (Select) field in DocType 'Stock
#. Reservation Entry'
-#: erpnext/manufacturing/doctype/bom/bom.js:167
+#: erpnext/manufacturing/doctype/bom/bom.js:188
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
@@ -60333,7 +60412,7 @@ msgstr ""
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:455
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:498
#: erpnext/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr ""
@@ -60397,7 +60476,7 @@ msgstr ""
msgid "Work Order has been {0}"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:823
+#: erpnext/selling/doctype/sales_order/sales_order.js:826
msgid "Work Order not created"
msgstr ""
@@ -60410,7 +60489,7 @@ msgstr ""
msgid "Work Orders"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:908
+#: erpnext/selling/doctype/sales_order/sales_order.js:911
msgid "Work Orders Created: {0}"
msgstr ""
@@ -60850,7 +60929,7 @@ msgid "You can only have Plans with the same billing cycle in a Subscription"
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:412
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:876
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:885
msgid "You can only redeem max {0} points in this order."
msgstr ""
@@ -60878,7 +60957,7 @@ msgstr ""
msgid "You can't redeem Loyalty Points having more value than the Total Amount."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:653
+#: erpnext/manufacturing/doctype/bom/bom.js:674
msgid "You cannot change the rate if BOM is mentioned against any Item."
msgstr ""
@@ -60978,7 +61057,7 @@ msgstr ""
msgid "You must select a customer before adding an item."
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:267
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:268
msgid "You need to cancel POS Closing Entry {} to be able to cancel this document."
msgstr ""
@@ -61075,7 +61154,7 @@ msgstr ""
msgid "as Title"
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:896
+#: erpnext/manufacturing/doctype/bom/bom.js:917
msgid "as a percentage of finished item quantity"
msgstr ""
@@ -61095,7 +61174,7 @@ msgstr ""
msgid "cannot be greater than 100"
msgstr ""
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:331
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:333
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1046
msgid "dated {0}"
msgstr ""
@@ -61468,7 +61547,7 @@ msgstr ""
msgid "{0} account is not of type {1}"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:496
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:498
msgid "{0} account not found while submitting purchase receipt"
msgstr ""
@@ -61492,7 +61571,7 @@ msgstr ""
msgid "{0} already has a Parent Procedure {1}."
msgstr ""
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:544
msgid "{0} and {1}"
msgstr ""
@@ -61663,6 +61742,10 @@ msgstr ""
msgid "{0} is required"
msgstr ""
+#: erpnext/assets/doctype/asset/asset.py:431
+msgid "{0} is still in Draft. Please submit it before saving the Asset."
+msgstr ""
+
#: erpnext/manufacturing/doctype/work_order/work_order.js:454
msgid "{0} items in progress"
msgstr ""
@@ -61748,6 +61831,10 @@ msgstr ""
msgid "{0} will be given as discount."
msgstr ""
+#: erpnext/public/js/utils/barcode_scanner.js:523
+msgid "{0} will be set as the {1} in subsequently scanned items"
+msgstr ""
+
#: erpnext/manufacturing/doctype/job_card/job_card.py:883
msgid "{0} {1}"
msgstr ""
@@ -61760,7 +61847,7 @@ msgstr ""
msgid "{0} {1} Partially Reconciled"
msgstr ""
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:516
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:518
msgid "{0} {1} cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr ""
diff --git a/erpnext/locale/zh.po b/erpnext/locale/zh.po
index fd5a1b37a93..1eea17a90af 100644
--- a/erpnext/locale/zh.po
+++ b/erpnext/locale/zh.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: frappe\n"
"Report-Msgid-Bugs-To: hello@frappe.io\n"
-"POT-Creation-Date: 2025-08-10 09:37+0000\n"
-"PO-Revision-Date: 2025-08-11 17:06\n"
+"POT-Creation-Date: 2025-08-17 09:36+0000\n"
+"PO-Revision-Date: 2025-08-17 18:14\n"
"Last-Translator: hello@frappe.io\n"
"Language-Team: Chinese Simplified\n"
"MIME-Version: 1.0\n"
@@ -143,7 +143,7 @@ msgstr "已完成%"
msgid "% Delivered"
msgstr "已交付%"
-#: erpnext/manufacturing/doctype/bom/bom.js:892
+#: erpnext/manufacturing/doctype/bom/bom.js:913
#, python-format
msgid "% Finished Item Quantity"
msgstr "产成品完成率"
@@ -1088,6 +1088,10 @@ msgstr "AB-"
msgid "ACC-PINV-.YYYY.-"
msgstr "ACC-PINV-.YYYY.-"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:531
+msgid "AMC Expiry (Serial)"
+msgstr ""
+
#. Label of the amc_expiry_date (Date) field in DocType 'Serial No'
#. Label of the amc_expiry_date (Date) field in DocType 'Warranty Claim'
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -1315,7 +1319,7 @@ msgstr "根据物料清单{0},库存交易缺少物料'{1}'"
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:30
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:190
#: erpnext/accounts/report/general_ledger/general_ledger.js:38
-#: erpnext/accounts/report/general_ledger/general_ledger.py:652
+#: erpnext/accounts/report/general_ledger/general_ledger.py:672
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js:30
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:30
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:152
@@ -1526,7 +1530,7 @@ msgstr "请输入科目以获取收付款凭证"
msgid "Account is not set for the dashboard chart {0}"
msgstr "尚未为统计图表{0}设置科目"
-#: erpnext/assets/doctype/asset/asset.py:755
+#: erpnext/assets/doctype/asset/asset.py:771
msgid "Account not Found"
msgstr "未找到科目"
@@ -1908,8 +1912,8 @@ msgstr "辅助核算过滤条件"
msgid "Accounting Entries"
msgstr "会计分录"
-#: erpnext/assets/doctype/asset/asset.py:789
-#: erpnext/assets/doctype/asset/asset.py:804
+#: erpnext/assets/doctype/asset/asset.py:805
+#: erpnext/assets/doctype/asset/asset.py:820
#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:559
msgid "Accounting Entry for Asset"
msgstr "资产会计分录"
@@ -1923,29 +1927,29 @@ msgstr ""
msgid "Accounting Entry for Landed Cost Voucher for SCR {0}"
msgstr ""
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:814
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:816
msgid "Accounting Entry for Service"
msgstr "服务会计凭证"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:999
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1020
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1038
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1059
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1080
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1104
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1211
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1447
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1469
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1001
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1022
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1040
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1061
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1082
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1106
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1213
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1449
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1471
#: erpnext/controllers/stock_controller.py:579
#: erpnext/controllers/stock_controller.py:596
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:909
#: erpnext/stock/doctype/stock_entry/stock_entry.py:1627
#: erpnext/stock/doctype/stock_entry/stock_entry.py:1641
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:613
msgid "Accounting Entry for Stock"
msgstr "库存会计分录"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:716
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:718
msgid "Accounting Entry for {0}"
msgstr "{0}会计凭证"
@@ -2488,9 +2492,9 @@ msgstr ""
#: erpnext/buying/doctype/supplier/supplier.js:128
#: erpnext/buying/doctype/supplier/supplier.js:137
#: erpnext/buying/doctype/supplier_scorecard_scoring_standing/supplier_scorecard_scoring_standing.json
-#: erpnext/manufacturing/doctype/bom/bom.js:139
-#: erpnext/manufacturing/doctype/bom/bom.js:150
-#: erpnext/manufacturing/doctype/bom/bom.js:161
+#: erpnext/manufacturing/doctype/bom/bom.js:160
+#: erpnext/manufacturing/doctype/bom/bom.js:171
+#: erpnext/manufacturing/doctype/bom/bom.js:182
#: erpnext/projects/doctype/project/project.js:87
#: erpnext/projects/doctype/project/project.js:95
#: erpnext/projects/doctype/project/project.js:151
@@ -2779,7 +2783,7 @@ msgstr "实际税额不能包含在第{0}行的物料单价中"
#: erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json
#: erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
#: erpnext/crm/doctype/lead/lead.js:85
-#: erpnext/manufacturing/doctype/bom/bom.js:922
+#: erpnext/manufacturing/doctype/bom/bom.js:943
#: erpnext/manufacturing/doctype/plant_floor/stock_summary_template.html:55
#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:235
#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:264
@@ -2796,7 +2800,7 @@ msgstr "添加"
msgid "Add / Edit Prices"
msgstr "添加/编辑价格"
-#: erpnext/accounts/doctype/account/account_tree.js:252
+#: erpnext/accounts/doctype/account/account_tree.js:248
msgid "Add Child"
msgstr "添加子项"
@@ -2892,7 +2896,7 @@ msgid "Add Quote"
msgstr "添加报价"
#. Label of the add_raw_materials (Button) field in DocType 'BOM Operation'
-#: erpnext/manufacturing/doctype/bom/bom.js:920
+#: erpnext/manufacturing/doctype/bom/bom.js:941
#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
msgid "Add Raw Materials"
msgstr "添加原材料"
@@ -3469,11 +3473,11 @@ msgstr "业务交易用于决定税别的地址"
msgid "Adjust Asset Value"
msgstr "调整资产价值"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1078
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1087
msgid "Adjustment Against"
msgstr "源单"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:644
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:646
msgid "Adjustment based on Purchase Invoice rate"
msgstr "基于采购发票汇率的调整"
@@ -3663,7 +3667,7 @@ msgstr "对方科目"
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
#: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:39
#: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:91
-#: erpnext/accounts/report/general_ledger/general_ledger.py:721
+#: erpnext/accounts/report/general_ledger/general_ledger.py:741
msgid "Against Account"
msgstr "对方科目"
@@ -3682,7 +3686,7 @@ msgstr "框架订单"
msgid "Against Customer Order {0}"
msgstr "对应客户订单{0}"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1191
+#: erpnext/selling/doctype/sales_order/sales_order.js:1194
msgid "Against Default Supplier"
msgstr "对应默认供应商"
@@ -3774,13 +3778,13 @@ msgstr "销售订单明细"
msgid "Against Stock Entry"
msgstr "源物料移动单"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:329
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:331
msgid "Against Supplier Invoice {0}"
msgstr "对应供应商发票{0}"
#. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry'
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:741
+#: erpnext/accounts/report/general_ledger/general_ledger.py:774
msgid "Against Voucher"
msgstr "对销凭证"
@@ -3804,7 +3808,7 @@ msgstr "对销凭证号"
#: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:739
+#: erpnext/accounts/report/general_ledger/general_ledger.py:772
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:183
msgid "Against Voucher Type"
msgstr "对销凭证类型"
@@ -4095,11 +4099,11 @@ msgstr "包括及以上的所有通信均应移至新问题中"
msgid "All items are already requested"
msgstr "所有物料已申请"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1335
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1342
msgid "All items have already been Invoiced/Returned"
msgstr "所有物料已开具发票/退回"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1183
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1196
msgid "All items have already been received"
msgstr "所有物料已收货"
@@ -4125,7 +4129,7 @@ msgstr "所有物料已退回"
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 "所需物料(原材料)将从BOM提取并填充本表,可修改物料的源仓库,生产过程中可在此追踪原材料转移"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:840
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:847
msgid "All these items have already been Invoiced/Returned"
msgstr "所有物料已经开票/被退货"
@@ -4190,7 +4194,7 @@ msgstr "已分配"
#: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json
#: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
#: erpnext/accounts/doctype/unreconcile_payment_entries/unreconcile_payment_entries.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:378
+#: erpnext/accounts/report/gross_profit/gross_profit.py:384
#: erpnext/public/js/utils/unreconcile.js:87
msgid "Allocated Amount"
msgstr "已分配金额"
@@ -4672,7 +4676,7 @@ msgstr "已经在用户{1}的pos配置文件{0}中设置了默认值,请禁用
msgid "Also you can't switch back to FIFO after setting the valuation method to Moving Average for this item."
msgstr "本物料设置为移动平均计价法后不可切换回先进先出法。"
-#: erpnext/manufacturing/doctype/bom/bom.js:200
+#: erpnext/manufacturing/doctype/bom/bom.js:221
#: erpnext/manufacturing/doctype/work_order/work_order.js:151
#: erpnext/manufacturing/doctype/work_order/work_order.js:166
#: erpnext/public/js/utils.js:518
@@ -5768,11 +5772,11 @@ msgstr "存在负库存时不可启用{0}"
msgid "As there are reserved stock, you cannot disable {0}."
msgstr "存在预留库存时不可禁用{0}"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1031
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1046
msgid "As there are sufficient Sub Assembly Items, Work Order is not required for Warehouse {0}."
msgstr "由于子装配件充足,仓库{0}无需工单"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1743
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1760
msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}."
msgstr "因仓库 {0} 有足够库存,未生成物料需求。"
@@ -5822,7 +5826,7 @@ msgstr "装配件"
#: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.json
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
#: erpnext/assets/workspace/assets/assets.json
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:221
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:225
#: erpnext/stock/doctype/serial_no/serial_no.json
msgid "Asset"
msgstr "资产"
@@ -5940,7 +5944,7 @@ msgstr "资产{1}的折旧计划{0}已存在"
msgid "Asset Depreciation Schedule {0} for Asset {1} and Finance Book {2} already exists."
msgstr "资产{1}与财务账簿{2}的折旧计划{0}已存在"
-#: erpnext/assets/doctype/asset/asset.py:176
+#: erpnext/assets/doctype/asset/asset.py:177
msgid "Asset Depreciation Schedules created/updated:
{0}
Please check, edit if needed, and submit the Asset."
msgstr "资产折旧计划已创建/更新:
{0}
请检查并按要求编辑后提交资产。"
@@ -6013,7 +6017,7 @@ msgstr "资产保养小组"
#. Label of a Link in the Assets Workspace
#: erpnext/assets/doctype/asset_movement/asset_movement.json
#: erpnext/assets/workspace/assets/assets.json
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:232
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:236
msgid "Asset Movement"
msgstr "资产变动"
@@ -6022,7 +6026,7 @@ msgstr "资产变动"
msgid "Asset Movement Item"
msgstr "资产移动明细项"
-#: erpnext/assets/doctype/asset/asset.py:1035
+#: erpnext/assets/doctype/asset/asset.py:1051
msgid "Asset Movement record {0} created"
msgstr "资产变动{0}已创建"
@@ -6151,11 +6155,11 @@ msgstr "资产价值调整不可在资产购置日期{0}前过账"
msgid "Asset Value Analytics"
msgstr "固定资产价值分析"
-#: erpnext/assets/doctype/asset/asset.py:208
+#: erpnext/assets/doctype/asset/asset.py:209
msgid "Asset cancelled"
msgstr "资产已取消"
-#: erpnext/assets/doctype/asset/asset.py:584
+#: erpnext/assets/doctype/asset/asset.py:600
msgid "Asset cannot be cancelled, as it is already {0}"
msgstr "资产不能被取消,因为它已经是{0}"
@@ -6167,15 +6171,15 @@ msgstr "在最后折旧分录前不能报废资产"
msgid "Asset capitalized after Asset Capitalization {0} was submitted"
msgstr "资产资本化{0} 增加了资产价值"
-#: erpnext/assets/doctype/asset/asset.py:217
+#: erpnext/assets/doctype/asset/asset.py:218
msgid "Asset created"
msgstr "资产已创建"
-#: erpnext/assets/doctype/asset/asset.py:1275
+#: erpnext/assets/doctype/asset/asset.py:1291
msgid "Asset created after being split from Asset {0}"
msgstr "资产通过拆分自资产{0}创建"
-#: erpnext/assets/doctype/asset/asset.py:220
+#: erpnext/assets/doctype/asset/asset.py:221
msgid "Asset deleted"
msgstr "资产已删除"
@@ -6216,7 +6220,7 @@ msgstr "通过资产日记账凭证报废{0}"
msgid "Asset sold"
msgstr "资产已出售"
-#: erpnext/assets/doctype/asset/asset.py:195
+#: erpnext/assets/doctype/asset/asset.py:196
msgid "Asset submitted"
msgstr "资产已提交"
@@ -6224,7 +6228,7 @@ msgstr "资产已提交"
msgid "Asset transferred to Location {0}"
msgstr "资产已转到 {0}"
-#: erpnext/assets/doctype/asset/asset.py:1284
+#: erpnext/assets/doctype/asset/asset.py:1300
msgid "Asset updated after being split into Asset {0}"
msgstr "资产拆分更新为资产{0}"
@@ -6315,7 +6319,7 @@ msgstr "未为{item_code}创建资产,请手动创建"
msgid "Assets {assets_link} created for {item_code}"
msgstr "已为{item_code}创建资产{assets_link}"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:193
+#: erpnext/manufacturing/doctype/job_card/job_card.js:201
msgid "Assign Job to Employee"
msgstr "派工"
@@ -6365,11 +6369,11 @@ msgstr "行{0}:物料{2}的拣货数量{1}超过仓库{4}的可用库存{3}"
msgid "At least one account with exchange gain or loss is required"
msgstr "必须设置至少一个汇兑损益科目"
-#: erpnext/assets/doctype/asset/asset.py:1141
+#: erpnext/assets/doctype/asset/asset.py:1157
msgid "At least one asset has to be selected."
msgstr "必须选择至少一项资产"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:930
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:965
msgid "At least one invoice has to be selected."
msgstr "必须选择至少一张发票"
@@ -6377,7 +6381,7 @@ msgstr "必须选择至少一张发票"
msgid "At least one item should be entered with negative quantity in return document"
msgstr "退货单据中至少需要录入一项负数量物料"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:484
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:485
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:540
msgid "At least one mode of payment is required for POS invoice."
msgstr "需要为POS发票定义至少付款模式"
@@ -6927,7 +6931,7 @@ msgstr "可用库存"
msgid "Available Stock for Packing Items"
msgstr "包装物料库存"
-#: erpnext/assets/doctype/asset/asset.py:313
+#: erpnext/assets/doctype/asset/asset.py:314
msgid "Available for use date is required"
msgstr "请输入启用日期"
@@ -6944,7 +6948,7 @@ msgstr "可用{0}"
msgid "Available-for-use Date"
msgstr "启用日期"
-#: erpnext/assets/doctype/asset/asset.py:418
+#: erpnext/assets/doctype/asset/asset.py:419
msgid "Available-for-use Date should be after purchase date"
msgstr "启用日应晚于采购日"
@@ -6999,7 +7003,7 @@ msgstr "平均采购标价"
msgid "Avg. Selling Price List Rate"
msgstr "平均销售标价"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:316
+#: erpnext/accounts/report/gross_profit/gross_profit.py:322
msgid "Avg. Selling Rate"
msgstr "平均销售价"
@@ -7054,7 +7058,7 @@ msgstr "库位数量"
#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js:5
#: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:109
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1005
+#: erpnext/selling/doctype/sales_order/sales_order.js:1008
#: erpnext/stock/doctype/material_request/material_request.js:334
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/stock/doctype/stock_entry/stock_entry.js:633
@@ -7068,7 +7072,7 @@ msgstr "物料清单"
msgid "BOM 1"
msgstr "物料清单1"
-#: erpnext/manufacturing/doctype/bom/bom.py:1519
+#: erpnext/manufacturing/doctype/bom/bom.py:1556
msgid "BOM 1 {0} and BOM 2 {1} should not be same"
msgstr "物料清单1 {0} 与物料清单2 {0} 不能相同"
@@ -7287,7 +7291,7 @@ msgstr "展示在网站上的BOM物料"
msgid "BOM Website Operation"
msgstr "展示在网站上的BOM工序"
-#: erpnext/stock/doctype/stock_entry/stock_entry.js:1208
+#: erpnext/stock/doctype/stock_entry/stock_entry.js:1214
msgid "BOM and Manufacturing Quantity are required"
msgstr "BOM和生产量是必需的"
@@ -7310,19 +7314,19 @@ msgstr "物料清单嵌套: {0} 不能是 {1} 的下层"
msgid "BOM recursion: {1} cannot be parent or child of {0}"
msgstr "物料清单递归错误:{1}不能作为{0}的父项或子项"
-#: erpnext/manufacturing/doctype/bom/bom.py:1332
+#: erpnext/manufacturing/doctype/bom/bom.py:1369
msgid "BOM {0} does not belong to Item {1}"
msgstr "BOM{0}不属于物料{1}"
-#: erpnext/manufacturing/doctype/bom/bom.py:1314
+#: erpnext/manufacturing/doctype/bom/bom.py:1351
msgid "BOM {0} must be active"
msgstr "BOM{0}必须处于生效状态"
-#: erpnext/manufacturing/doctype/bom/bom.py:1317
+#: erpnext/manufacturing/doctype/bom/bom.py:1354
msgid "BOM {0} must be submitted"
msgstr "BOM{0}未提交"
-#: erpnext/manufacturing/doctype/bom/bom.py:734
+#: erpnext/manufacturing/doctype/bom/bom.py:765
msgid "BOM {0} not found for the item {1}"
msgstr "未找到物料{1}的物料清单{0}"
@@ -7393,7 +7397,7 @@ msgstr "余额"
msgid "Balance (Dr - Cr)"
msgstr "结余(Dr - Cr)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:673
+#: erpnext/accounts/report/general_ledger/general_ledger.py:693
msgid "Balance ({0})"
msgstr "余额({0})"
@@ -7785,7 +7789,7 @@ msgstr "柱状图"
#: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
-#: erpnext/public/js/utils/barcode_scanner.js:282
+#: erpnext/public/js/utils/barcode_scanner.js:308
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#: erpnext/stock/doctype/item_barcode/item_barcode.json
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -8006,6 +8010,7 @@ msgid "Batch Details"
msgstr "批号信息"
#: erpnext/stock/doctype/batch/batch.py:197
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:455
msgid "Batch Expiry Date"
msgstr "批次有效期"
@@ -8058,7 +8063,7 @@ msgstr "物料批号到期状态"
#: 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:2446
-#: erpnext/public/js/utils/barcode_scanner.js:260
+#: erpnext/public/js/utils/barcode_scanner.js:286
#: erpnext/public/js/utils/serial_no_batch_selector.js:438
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#: erpnext/stock/doctype/item_price/item_price.json
@@ -8079,7 +8084,7 @@ msgstr "物料批号到期状态"
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:81
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:160
#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:19
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:416
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:448
#: erpnext/stock/report/stock_ledger/stock_ledger.js:78
#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
#: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
@@ -8094,7 +8099,7 @@ msgstr "批次号为必填项"
msgid "Batch No {0} does not exists"
msgstr "批次号{0}不存在"
-#: erpnext/stock/utils.py:632
+#: erpnext/stock/utils.py:638
msgid "Batch No {0} is linked with Item {1} which has serial no. Please scan serial no instead."
msgstr "批号 {0} 关联的物料 {1} 启用了序列号,请扫序列号。"
@@ -8162,7 +8167,7 @@ msgstr "批次和序列号"
msgid "Batch not created for item {} since it does not have a batch series."
msgstr "未为物料{}创建批次,因其无批次编号规则"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:348
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:350
msgid "Batch {0} and Warehouse"
msgstr "批号 {0} 和仓库"
@@ -8239,7 +8244,7 @@ msgstr "采购发票含被退货数量"
#. Label of a Card Break in the Manufacturing Workspace
#. Label of a Link in the Manufacturing Workspace
-#: erpnext/manufacturing/doctype/bom/bom.py:1188
+#: erpnext/manufacturing/doctype/bom/bom.py:1225
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#: erpnext/stock/doctype/material_request/material_request.js:124
#: erpnext/stock/doctype/stock_entry/stock_entry.js:615
@@ -8553,7 +8558,7 @@ msgid "Blanket Order Rate"
msgstr "框架订单单价"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:116
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:262
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:268
msgid "Block Invoice"
msgstr "冻结发票"
@@ -8751,7 +8756,7 @@ msgstr "分支机构代码"
#: erpnext/accounts/doctype/pricing_rule_brand/pricing_rule_brand.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:300
+#: erpnext/accounts/report/gross_profit/gross_profit.py:306
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:53
#: erpnext/accounts/report/sales_register/sales_register.js:64
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -8824,7 +8829,7 @@ msgstr "广播"
msgid "Brokerage"
msgstr "佣金"
-#: erpnext/manufacturing/doctype/bom/bom.js:143
+#: erpnext/manufacturing/doctype/bom/bom.js:164
msgid "Browse BOM"
msgstr "浏览BOM"
@@ -9046,7 +9051,7 @@ msgstr "采购"
msgid "Buying & Selling Settings"
msgstr "采购与销售设置"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:337
+#: erpnext/accounts/report/gross_profit/gross_profit.py:343
msgid "Buying Amount"
msgstr "采购金额"
@@ -9717,11 +9722,11 @@ msgstr "科目类型字段清空后才能执行操作->转换为组"
msgid "Cannot covert to Group because Account Type is selected."
msgstr "科目类型字段须为空才能转换为组。"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:988
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:990
msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts."
msgstr "无法为未来日期的采购收据创建库存预留"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1758
+#: erpnext/selling/doctype/sales_order/sales_order.py:1774
#: erpnext/stock/doctype/pick_list/pick_list.py:199
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 "为销售订单 {0} 创建了库存预留,请取消预留后再创建拣货单"
@@ -9734,15 +9739,11 @@ msgstr "无法为已禁用科目{0}创建会计凭证"
msgid "Cannot create return for consolidated invoice {0}."
msgstr "无法为合并发票{0}创建退货。"
-#: erpnext/accounts/doctype/account/account_tree.js:241
-msgid "Cannot create root account."
-msgstr ""
-
-#: erpnext/manufacturing/doctype/bom/bom.py:1044
+#: erpnext/manufacturing/doctype/bom/bom.py:1081
msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs"
msgstr "无法停用或取消BOM,因为它被其他BOM引用。"
-#: erpnext/crm/doctype/opportunity/opportunity.py:277
+#: erpnext/crm/doctype/opportunity/opportunity.py:282
msgid "Cannot declare as lost, because Quotation has been made."
msgstr "已报价,不能更改状态为未成交。"
@@ -9772,7 +9773,11 @@ msgstr "同一公司{1}无法排队多个任务,{0}已在队列/运行中"
msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No."
msgstr "物料{0}同时存在启用和未启用序列号交付,无法确保"
-#: erpnext/public/js/utils/barcode_scanner.js:54
+#: erpnext/public/js/utils/barcode_scanner.js:62
+msgid "Cannot find Item or Warehouse with this Barcode"
+msgstr ""
+
+#: erpnext/public/js/utils/barcode_scanner.js:63
msgid "Cannot find Item with this Barcode"
msgstr "找不到该条码对应的物料"
@@ -9823,7 +9828,7 @@ msgstr "无法获取链接令牌,查看错误日志"
msgid "Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row"
msgstr "第一行的“收取类型”不能是“基于上一行的金额”或者“前一行的总计”"
-#: erpnext/selling/doctype/quotation/quotation.py:283
+#: erpnext/selling/doctype/quotation/quotation.py:285
msgid "Cannot set as Lost as Sales Order is made."
msgstr "已有销售订单时不能更改其状态为未成交。"
@@ -10010,7 +10015,7 @@ msgstr "运营现金流"
msgid "Cash In Hand"
msgstr "现款"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:319
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:321
msgid "Cash or Bank Account is mandatory for making payment entry"
msgstr "“现金”或“银行账户”是付款分录的必须项"
@@ -10636,8 +10641,8 @@ msgstr "客户"
#: erpnext/selling/doctype/sales_order/sales_order.js:591
#: erpnext/selling/doctype/sales_order/sales_order.js:623
#: erpnext/selling/doctype/sales_order/sales_order_list.js:66
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:319
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:276
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:325
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:283
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:170
#: erpnext/support/doctype/issue/issue.js:23
msgid "Close"
@@ -10742,7 +10747,7 @@ msgstr "期末(贷方)"
msgid "Closing (Dr)"
msgstr "期末(借方)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:379
+#: erpnext/accounts/report/general_ledger/general_ledger.py:399
msgid "Closing (Opening + Total)"
msgstr "期末(期初+总计)"
@@ -11602,7 +11607,7 @@ msgstr "生成发票必须指定公司,请在全局设置中设置默认公司
msgid "Company name not same"
msgstr "公司名不一样"
-#: erpnext/assets/doctype/asset/asset.py:261
+#: erpnext/assets/doctype/asset/asset.py:262
msgid "Company of asset {0} and purchase document {1} doesn't matches."
msgstr "资产{0}与采购单据{1}的公司不匹配"
@@ -11645,7 +11650,7 @@ msgstr "公司{0}被多次添加"
msgid "Company {} does not exist yet. Taxes setup aborted."
msgstr "公司{}尚未存在,税务设置已中止"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:528
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:529
msgid "Company {} does not match with POS Profile Company {}"
msgstr "公司{}与POS配置公司{}不匹配"
@@ -11682,7 +11687,7 @@ msgstr "竞争对手"
msgid "Complete"
msgstr "完成"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:230
+#: erpnext/manufacturing/doctype/job_card/job_card.js:238
#: erpnext/manufacturing/doctype/workstation/workstation.js:151
msgid "Complete Job"
msgstr "停止计时"
@@ -11815,8 +11820,8 @@ msgstr "完工数量"
msgid "Completed Qty cannot be greater than 'Qty to Manufacture'"
msgstr "完成数量不可超过'待生产数量'"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:278
-#: erpnext/manufacturing/doctype/job_card/job_card.js:373
+#: erpnext/manufacturing/doctype/job_card/job_card.js:286
+#: erpnext/manufacturing/doctype/job_card/job_card.js:381
#: erpnext/manufacturing/doctype/workstation/workstation.js:296
msgid "Completed Quantity"
msgstr "完成数量"
@@ -12708,13 +12713,13 @@ msgstr "纠正"
msgid "Corrective Action"
msgstr "纠正措施"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:430
+#: erpnext/manufacturing/doctype/job_card/job_card.js:438
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:437
+#: erpnext/manufacturing/doctype/job_card/job_card.js:445
#: erpnext/manufacturing/doctype/job_card/job_card.json
msgid "Corrective Operation"
msgstr "返工工序"
@@ -12858,9 +12863,9 @@ msgstr "成本"
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:197
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98
#: erpnext/accounts/report/general_ledger/general_ledger.js:153
-#: erpnext/accounts/report/general_ledger/general_ledger.py:734
+#: erpnext/accounts/report/general_ledger/general_ledger.py:767
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
-#: erpnext/accounts/report/gross_profit/gross_profit.py:364
+#: erpnext/accounts/report/gross_profit/gross_profit.py:370
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:309
#: erpnext/accounts/report/purchase_register/purchase_register.js:46
#: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py:29
@@ -12945,8 +12950,8 @@ msgstr "物料行的成本中心已更新为{0}"
msgid "Cost Center is a part of Cost Center Allocation, hence cannot be converted to a group"
msgstr "成本中心参与分配,不可转换为组"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1412
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:873
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1414
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:875
msgid "Cost Center is required in row {0} in Taxes table for type {1}"
msgstr "类型{1}税费表的行{0}必须有成本中心"
@@ -12966,11 +12971,11 @@ msgstr "已产生业务交易的成本中心不能转化为记账成本中心"
msgid "Cost Center {0} cannot be used for allocation as it is used as main cost center in other allocation record."
msgstr "成本中心{0}已在其他分配中作为主成本中心使用,不可分配"
-#: erpnext/assets/doctype/asset/asset.py:289
+#: erpnext/assets/doctype/asset/asset.py:290
msgid "Cost Center {} doesn't belong to Company {}"
msgstr "成本中心{}不属于公司{}"
-#: erpnext/assets/doctype/asset/asset.py:296
+#: erpnext/assets/doctype/asset/asset.py:297
msgid "Cost Center {} is a group cost center and group cost centers cannot be used in transactions"
msgstr "成本中心{}为组成本中心,不可用于交易"
@@ -13086,11 +13091,11 @@ msgstr ""
msgid "Could Not Delete Demo Data"
msgstr "无法删除演示数据"
-#: erpnext/selling/doctype/quotation/quotation.py:584
+#: erpnext/selling/doctype/quotation/quotation.py:606
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr "无法自动创建客户,缺失必填字段:"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:672
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:674
msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
msgstr "无法自动创建退款单,请取消选中'退款'并再次提交"
@@ -13219,9 +13224,9 @@ msgstr "贷方"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:127
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:135
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:146
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:222
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:659
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:683
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:228
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:665
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:689
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:89
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:103
@@ -13261,14 +13266,14 @@ msgstr "贷方"
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:34
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:48
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:64
-#: erpnext/manufacturing/doctype/bom/bom.js:171
-#: erpnext/manufacturing/doctype/bom/bom.js:180
-#: erpnext/manufacturing/doctype/bom/bom.js:190
-#: erpnext/manufacturing/doctype/bom/bom.js:194
-#: erpnext/manufacturing/doctype/bom/bom.js:438
+#: erpnext/manufacturing/doctype/bom/bom.js:192
+#: erpnext/manufacturing/doctype/bom/bom.js:201
+#: erpnext/manufacturing/doctype/bom/bom.js:211
+#: erpnext/manufacturing/doctype/bom/bom.js:215
+#: erpnext/manufacturing/doctype/bom/bom.js:459
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.js:99
-#: erpnext/manufacturing/doctype/job_card/job_card.js:137
-#: erpnext/manufacturing/doctype/job_card/job_card.js:151
+#: erpnext/manufacturing/doctype/job_card/job_card.js:145
+#: erpnext/manufacturing/doctype/job_card/job_card.js:159
#: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:268
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:145
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:159
@@ -13280,7 +13285,7 @@ msgstr "贷方"
#: erpnext/projects/doctype/task/task_tree.js:81
#: erpnext/public/js/communication.js:19 erpnext/public/js/communication.js:31
#: erpnext/public/js/communication.js:41
-#: erpnext/public/js/controllers/transaction.js:361
+#: erpnext/public/js/controllers/transaction.js:362
#: erpnext/public/js/controllers/transaction.js:2494
#: erpnext/selling/doctype/customer/customer.js:181
#: erpnext/selling/doctype/quotation/quotation.js:125
@@ -13299,18 +13304,18 @@ msgstr "贷方"
#: erpnext/selling/doctype/sales_order/sales_order.js:759
#: erpnext/selling/doctype/sales_order/sales_order.js:766
#: erpnext/selling/doctype/sales_order/sales_order.js:770
-#: erpnext/selling/doctype/sales_order/sales_order.js:917
-#: erpnext/selling/doctype/sales_order/sales_order.js:1056
+#: erpnext/selling/doctype/sales_order/sales_order.js:920
+#: erpnext/selling/doctype/sales_order/sales_order.js:1059
#: erpnext/stock/doctype/delivery_note/delivery_note.js:96
#: erpnext/stock/doctype/delivery_note/delivery_note.js:98
#: erpnext/stock/doctype/delivery_note/delivery_note.js:121
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:247
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:261
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:271
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:281
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:300
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:305
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:347
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:253
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:267
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:277
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:287
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:306
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:311
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:353
#: erpnext/stock/doctype/item/item.js:167
#: erpnext/stock/doctype/item/item.js:174
#: erpnext/stock/doctype/item/item.js:182
@@ -13334,15 +13339,15 @@ msgstr "贷方"
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:70
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:82
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:108
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:279
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:284
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:286
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:291
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:297
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:300
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:298
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:304
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:307
#: erpnext/stock/doctype/stock_entry/stock_entry.js:170
#: erpnext/stock/doctype/stock_entry/stock_entry.js:172
#: erpnext/stock/doctype/stock_entry/stock_entry.js:247
-#: erpnext/stock/doctype/stock_entry/stock_entry.js:1283
+#: erpnext/stock/doctype/stock_entry/stock_entry.js:1289
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:231
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:264
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:277
@@ -13467,7 +13472,7 @@ msgstr "创建POS接班记录"
msgid "Create Payment Entry"
msgstr "创建收付款凭证"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:806
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:807
msgid "Create Payment Entry for Consolidated POS Invoices."
msgstr ""
@@ -13483,7 +13488,7 @@ msgstr "创建打印格式"
msgid "Create Prospect"
msgstr "创建潜在客户"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1238
+#: erpnext/selling/doctype/sales_order/sales_order.js:1242
#: erpnext/utilities/activation.py:106
msgid "Create Purchase Order"
msgstr "创建采购订单"
@@ -13615,7 +13620,7 @@ msgstr "已为{1}创建{0}张计分卡,时间范围:"
msgid "Creating Accounts..."
msgstr "创建科目......"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1133
+#: erpnext/selling/doctype/sales_order/sales_order.js:1136
msgid "Creating Delivery Note ..."
msgstr "正在创建交货单..."
@@ -13635,11 +13640,11 @@ msgstr "正在创建装箱单..."
msgid "Creating Purchase Invoices ..."
msgstr "正在创建采购发票..."
-#: erpnext/selling/doctype/sales_order/sales_order.js:1258
+#: erpnext/selling/doctype/sales_order/sales_order.js:1262
msgid "Creating Purchase Order ..."
msgstr "正在创建采购订单..."
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:740
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:746
#: erpnext/buying/doctype/purchase_order/purchase_order.js:569
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
@@ -13710,11 +13715,11 @@ msgstr "创建 {0} 部分成功。\n"
msgid "Credit"
msgstr "贷方"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:691
+#: erpnext/accounts/report/general_ledger/general_ledger.py:711
msgid "Credit (Transaction)"
msgstr "贷方(交易货币)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:666
+#: erpnext/accounts/report/general_ledger/general_ledger.py:686
msgid "Credit ({0})"
msgstr "贷方({0})"
@@ -13857,14 +13862,14 @@ msgstr "已退款"
msgid "Credit Note will update it's own outstanding amount, even if 'Return Against' is specified."
msgstr "即使指定'源单',在本单处理付款与核销"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:669
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:671
msgid "Credit Note {0} has been created automatically"
msgstr "退款单{0}已自动创建"
#. Label of the credit_to (Link) field in DocType 'Purchase Invoice'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:369
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:377
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:371
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:379
#: erpnext/controllers/accounts_controller.py:2282
msgid "Credit To"
msgstr "贷记"
@@ -14063,7 +14068,7 @@ msgstr "杯"
#: erpnext/accounts/report/financial_statements.html:29
#: erpnext/accounts/report/financial_statements.py:678
#: erpnext/accounts/report/general_ledger/general_ledger.js:147
-#: erpnext/accounts/report/gross_profit/gross_profit.py:427
+#: erpnext/accounts/report/gross_profit/gross_profit.py:443
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:220
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175
@@ -14164,7 +14169,7 @@ msgstr "货币不能使用其他货币进行输入后更改"
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733
-#: erpnext/accounts/utils.py:2319
+#: erpnext/accounts/utils.py:2323
msgid "Currency for {0} must be {1}"
msgstr "货币{0}必须{1}"
@@ -14430,13 +14435,13 @@ msgstr "自定义?"
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:286
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:289
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/accounts/doctype/sales_invoice_reference/sales_invoice_reference.json
#: erpnext/accounts/doctype/tax_rule/tax_rule.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:38
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:29
-#: erpnext/accounts/report/gross_profit/gross_profit.py:385
+#: erpnext/accounts/report/gross_profit/gross_profit.py:391
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:37
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:22
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:225
@@ -14499,8 +14504,8 @@ msgstr "自定义?"
#: erpnext/setup/doctype/customer_group/customer_group.json
#: erpnext/setup/doctype/territory/territory.json
#: erpnext/setup/workspace/home/home.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:215
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:482
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:218
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:488
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
#: erpnext/stock/doctype/item/item.json
@@ -14514,7 +14519,7 @@ msgstr "自定义?"
#: erpnext/stock/report/delayed_item_report/delayed_item_report.py:121
#: erpnext/stock/report/delayed_order_report/delayed_order_report.js:36
#: erpnext/stock/report/delayed_order_report/delayed_order_report.py:46
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:469
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:512
#: erpnext/support/doctype/issue/issue.json
#: erpnext/support/doctype/service_level_agreement/service_level_agreement.json
#: erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -14692,7 +14697,7 @@ msgstr "客户反馈"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:185
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:56
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:228
-#: erpnext/accounts/report/gross_profit/gross_profit.py:392
+#: erpnext/accounts/report/gross_profit/gross_profit.py:398
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:212
#: erpnext/accounts/report/sales_register/sales_register.js:27
#: erpnext/accounts/report/sales_register/sales_register.py:202
@@ -14800,6 +14805,7 @@ msgstr "客户手机号"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:156
#: 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
+#: erpnext/accounts/report/gross_profit/gross_profit.py:405
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:232
#: erpnext/accounts/report/sales_register/sales_register.py:193
#: erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -14947,7 +14953,7 @@ msgstr "”客户折扣“需要指定客户"
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1087
#: erpnext/selling/doctype/sales_order/sales_order.py:373
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:416
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:418
msgid "Customer {0} does not belong to project {1}"
msgstr "客户{0}不属于项目{1}"
@@ -15436,11 +15442,11 @@ msgstr "亲爱的系统管理员,"
msgid "Debit"
msgstr "借方"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:684
+#: erpnext/accounts/report/general_ledger/general_ledger.py:704
msgid "Debit (Transaction)"
msgstr "借方(交易货币)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:659
+#: erpnext/accounts/report/general_ledger/general_ledger.py:679
msgid "Debit ({0})"
msgstr "借方({0})"
@@ -16382,7 +16388,7 @@ msgstr "出货"
#. Label of the delivery_date (Date) field in DocType 'Sales Order'
#. Label of the delivery_date (Date) field in DocType 'Sales Order Item'
#: erpnext/public/js/utils.js:813
-#: erpnext/selling/doctype/sales_order/sales_order.js:1076
+#: erpnext/selling/doctype/sales_order/sales_order.js:1079
#: erpnext/selling/doctype/sales_order/sales_order.json
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:321
@@ -16417,7 +16423,7 @@ msgstr "交付经理"
#. Label of a Link in the Stock Workspace
#. Label of a shortcut in the Stock Workspace
#: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:306
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:312
#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:36
#: 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
@@ -16524,7 +16530,7 @@ msgstr "目的地"
#. Label of the delivery_trip (Link) field in DocType 'Delivery Note'
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:277
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:283
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_trip/delivery_trip.json
#: erpnext/stock/workspace/stock/stock.json
@@ -16714,7 +16720,7 @@ msgstr "折旧分录"
msgid "Depreciation Entry Posting Status"
msgstr "折旧凭证记账状态"
-#: erpnext/assets/doctype/asset/asset.py:1109
+#: erpnext/assets/doctype/asset/asset.py:1125
msgid "Depreciation Entry against asset {0}"
msgstr ""
@@ -16761,11 +16767,11 @@ msgstr "折旧过账日期"
msgid "Depreciation Posting Date cannot be before Available-for-use Date"
msgstr "折旧过账日期不可早于可用日期"
-#: erpnext/assets/doctype/asset/asset.py:318
+#: erpnext/assets/doctype/asset/asset.py:319
msgid "Depreciation Row {0}: Depreciation Posting Date cannot be before Available-for-use Date"
msgstr "折旧行{0}:折旧过账日期不可早于可用日期"
-#: erpnext/assets/doctype/asset/asset.py:569
+#: erpnext/assets/doctype/asset/asset.py:585
msgid "Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1}"
msgstr "折旧行{0}:资产使用年限结束残值必须大于或等于{1}"
@@ -16792,7 +16798,7 @@ msgstr "折旧计划"
msgid "Depreciation Schedule View"
msgstr "折旧计划表视图"
-#: erpnext/assets/doctype/asset/asset.py:412
+#: erpnext/assets/doctype/asset/asset.py:413
msgid "Depreciation cannot be calculated for fully depreciated assets"
msgstr "不能为已勾选已完全折旧的固定资产勾选计算折旧"
@@ -16970,7 +16976,7 @@ msgstr "通过冲销消除折旧"
#: erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
#: erpnext/accounts/doctype/share_type/share_type.json
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:72
-#: erpnext/accounts/report/gross_profit/gross_profit.py:302
+#: erpnext/accounts/report/gross_profit/gross_profit.py:308
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:175
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:196
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:72
@@ -17263,7 +17269,7 @@ msgstr "差额数量"
msgid "Difference Value"
msgstr "差异金额"
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:491
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:497
msgid "Different 'Source Warehouse' and 'Target Warehouse' can be set for each row."
msgstr "每行可设置不同的'来源仓库'与'目标仓库'"
@@ -18033,7 +18039,7 @@ msgstr "你想通过电子邮件通知所有的客户?"
msgid "Do you want to submit the material request"
msgstr "创建的物料需求直接提交? 选否只保存(草稿状态)"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:76
+#: erpnext/manufacturing/doctype/job_card/job_card.js:84
msgid "Do you want to submit the stock entry?"
msgstr ""
@@ -18540,7 +18546,7 @@ msgstr "重复客户组"
msgid "Duplicate Entry. Please check Authorization Rule {0}"
msgstr "有重复记录,请检查授权规则{0}"
-#: erpnext/assets/doctype/asset/asset.py:342
+#: erpnext/assets/doctype/asset/asset.py:343
msgid "Duplicate Finance Book"
msgstr "重复财务账簿"
@@ -18733,7 +18739,7 @@ msgstr "编辑备注"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:495
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:501
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -19171,7 +19177,7 @@ msgstr "空"
msgid "Ems(Pica)"
msgstr "Ems(派卡)"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1640
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1642
msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
msgstr "请在库存设置中启用允许部分预留"
@@ -19408,8 +19414,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:311
-#: erpnext/manufacturing/doctype/job_card/job_card.js:380
+#: erpnext/manufacturing/doctype/job_card/job_card.js:319
+#: erpnext/manufacturing/doctype/job_card/job_card.js:388
#: 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
@@ -19500,8 +19506,8 @@ msgstr "输入序列号"
msgid "Enter Supplier"
msgstr "输入供应商"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:337
-#: erpnext/manufacturing/doctype/job_card/job_card.js:406
+#: erpnext/manufacturing/doctype/job_card/job_card.js:345
+#: erpnext/manufacturing/doctype/job_card/job_card.js:414
#: erpnext/manufacturing/doctype/workstation/workstation.js:312
msgid "Enter Value"
msgstr "输入值"
@@ -19542,7 +19548,7 @@ msgstr "输入客户电话号码"
msgid "Enter date to scrap asset"
msgstr "输入资产报废日期"
-#: erpnext/assets/doctype/asset/asset.py:410
+#: erpnext/assets/doctype/asset/asset.py:411
msgid "Enter depreciation details"
msgstr "输入折旧信息"
@@ -19576,7 +19582,7 @@ msgstr "提交前输入银行或贷款机构名称"
msgid "Enter the opening stock units."
msgstr "输入期初库存数量"
-#: erpnext/manufacturing/doctype/bom/bom.js:865
+#: erpnext/manufacturing/doctype/bom/bom.js:886
msgid "Enter the quantity of the Item that will be manufactured from this Bill of Materials."
msgstr "输入基于此物料清单生产的物料数量"
@@ -19934,7 +19940,7 @@ msgstr "汇率必须一致{0} {1}({2})"
msgid "Excise Entry"
msgstr "消费税分录"
-#: erpnext/stock/doctype/stock_entry/stock_entry.js:1276
+#: erpnext/stock/doctype/stock_entry/stock_entry.js:1282
msgid "Excise Invoice"
msgstr "消费税发票"
@@ -20106,7 +20112,7 @@ msgstr "残值"
#: erpnext/accounts/doctype/cashier_closing/cashier_closing.json
#: erpnext/accounts/doctype/ledger_merge/ledger_merge.json
#: erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:596
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:598
#: erpnext/accounts/report/account_balance/account_balance.js:28
#: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:89
#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:178
@@ -20174,13 +20180,13 @@ msgstr "费用报销"
msgid "Expense Head"
msgstr "费用科目"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:490
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:514
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:534
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:492
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:516
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:536
msgid "Expense Head Changed"
msgstr "费用科目已被修改"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:592
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:594
msgid "Expense account is mandatory for item {0}"
msgstr "必须为物料{0}指定费用科目"
@@ -20321,6 +20327,11 @@ msgstr "特大号"
msgid "Extra Small"
msgstr "超小"
+#. Label of the finished_good (Link) field in DocType 'BOM Operation'
+#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
+msgid "FG / Semi FG Item"
+msgstr ""
+
#. Option for the 'Valuation Method' (Select) field in DocType 'Item'
#. Option for the 'Default Valuation Method' (Select) field in DocType 'Stock
#. Settings'
@@ -20529,7 +20540,7 @@ msgstr "获取方式"
msgid "Fetch Customers"
msgstr "获取客户"
-#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js:76
+#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js:77
msgid "Fetch Items from Warehouse"
msgstr "从仓库选物料"
@@ -20545,7 +20556,7 @@ msgstr "逾期待付款"
msgid "Fetch Subscription Updates"
msgstr "获取订阅更新"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1017
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1026
msgid "Fetch Timesheet"
msgstr "选工时单"
@@ -20937,11 +20948,6 @@ msgstr "产成品{0}必须为外协物料"
msgid "Finished Goods"
msgstr "成品"
-#. Label of the finished_good (Link) field in DocType 'BOM Operation'
-#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
-msgid "Finished Goods / Semi Finished Goods Item"
-msgstr "产成品/半成品物料"
-
#. Label of the fg_based_section_section (Section Break) field in DocType 'BOM'
#: erpnext/manufacturing/doctype/bom/bom.json
msgid "Finished Goods Based Operating Cost"
@@ -20952,11 +20958,6 @@ msgstr "基于产成品的运营成本"
msgid "Finished Goods Item"
msgstr "产成品物料"
-#. Label of the finished_good_qty (Float) field in DocType 'BOM Operation'
-#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
-msgid "Finished Goods Qty"
-msgstr "产成品数量"
-
#. Label of the fg_reference_id (Data) field in DocType 'BOM Creator Item'
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
msgid "Finished Goods Reference"
@@ -21120,7 +21121,7 @@ msgstr "固定资产"
#. Capitalization Asset Item'
#. Label of the fixed_asset_account (Link) field in DocType 'Asset Category
#. Account'
-#: erpnext/assets/doctype/asset/asset.py:751
+#: erpnext/assets/doctype/asset/asset.py:767
#: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
#: erpnext/assets/doctype/asset_category_account/asset_category_account.json
msgid "Fixed Asset Account"
@@ -21286,7 +21287,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:450
+#: erpnext/manufacturing/doctype/job_card/job_card.js:458
#: erpnext/manufacturing/doctype/job_card/job_card.json
msgid "For Operation"
msgstr "工序"
@@ -21335,7 +21336,7 @@ msgstr "供应商"
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:466
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:997
+#: erpnext/selling/doctype/sales_order/sales_order.js:1000
#: erpnext/stock/doctype/material_request/material_request.js:344
#: erpnext/templates/form_grid/material_request_grid.html:36
msgid "For Warehouse"
@@ -21405,7 +21406,7 @@ msgstr "供参考"
msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included"
msgstr "对于{1}的第{0}行。要在物料单价中包括{2},也必须包括第{3}行"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1635
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1652
msgid "For row {0}: Enter Planned Qty"
msgstr "请在第{0}行输入计划数量"
@@ -21580,7 +21581,7 @@ msgstr "星期五"
#. Label of the from_uom (Link) field in DocType 'UOM Conversion Factor'
#. Label of the from (Data) field in DocType 'Call Log'
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1020
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1029
#: erpnext/setup/doctype/uom_conversion_factor/uom_conversion_factor.json
#: erpnext/telephony/doctype/call_log/call_log.json
#: erpnext/templates/pages/projects.html:67
@@ -22184,7 +22185,7 @@ msgstr "总账余额"
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:644
+#: erpnext/accounts/report/general_ledger/general_ledger.py:664
msgid "GL Entry"
msgstr "总账分录"
@@ -22450,12 +22451,12 @@ msgid "Get Items"
msgstr "选物料"
#. Label of the get_items_from (Select) field in DocType 'Production Plan'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:170
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:192
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:270
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:299
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:330
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1073
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:173
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:198
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:273
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:305
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:339
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1082
#: erpnext/buying/doctype/purchase_order/purchase_order.js:612
#: erpnext/buying/doctype/purchase_order/purchase_order.js:632
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:366
@@ -22471,13 +22472,13 @@ msgstr "选物料"
#: erpnext/public/js/controllers/buying.js:296
#: erpnext/selling/doctype/quotation/quotation.js:167
#: erpnext/selling/doctype/sales_order/sales_order.js:174
-#: erpnext/selling/doctype/sales_order/sales_order.js:798
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:187
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:236
+#: erpnext/selling/doctype/sales_order/sales_order.js:801
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:190
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:242
#: erpnext/stock/doctype/material_request/material_request.js:126
#: erpnext/stock/doctype/material_request/material_request.js:221
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:156
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:270
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:160
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:277
#: erpnext/stock/doctype/stock_entry/stock_entry.js:319
#: erpnext/stock/doctype/stock_entry/stock_entry.js:366
#: erpnext/stock/doctype/stock_entry/stock_entry.js:395
@@ -22605,7 +22606,7 @@ msgstr "选供应商"
msgid "Get Suppliers By"
msgstr "获得供应商"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1069
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1078
msgid "Get Timesheets"
msgstr "选工时单"
@@ -22923,7 +22924,7 @@ msgstr "毛利率%"
#. Label of the gross_profit (Currency) field in DocType 'Quotation Item'
#. Label of the gross_profit (Currency) field in DocType 'Sales Order Item'
#: erpnext/accounts/report/gross_profit/gross_profit.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:344
+#: erpnext/accounts/report/gross_profit/gross_profit.py:350
#: erpnext/accounts/workspace/financial_reports/financial_reports.json
#: erpnext/selling/doctype/quotation_item/quotation_item.json
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -22934,7 +22935,7 @@ msgstr "毛利"
msgid "Gross Profit / Loss"
msgstr "总利润/亏损"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:351
+#: erpnext/accounts/report/gross_profit/gross_profit.py:357
msgid "Gross Profit Percent"
msgstr "毛利率"
@@ -22946,11 +22947,11 @@ msgstr "毛利率"
msgid "Gross Purchase Amount"
msgstr "总采购金额"
-#: erpnext/assets/doctype/asset/asset.py:380
+#: erpnext/assets/doctype/asset/asset.py:381
msgid "Gross Purchase Amount is mandatory"
msgstr "总消费金额字段必填"
-#: erpnext/assets/doctype/asset/asset.py:425
+#: erpnext/assets/doctype/asset/asset.py:441
msgid "Gross Purchase Amount should be equal to purchase amount of one single Asset."
msgstr "购置总金额应等于单个资产的购置金额"
@@ -23996,11 +23997,11 @@ msgstr "若在库存中维护此物料,ERPNext将为每笔交易创建库存
msgid "If you need to reconcile particular transactions against each other, then please select accordingly. If not, all the transactions will be allocated in FIFO order."
msgstr "可以手工勾选匹配,否则按时间先后自动匹配"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1036
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1051
msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox."
msgstr "若仍要继续,请取消勾选'跳过可用子装配件'复选框"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1748
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1765
msgid "If you still want to proceed, please enable {0}."
msgstr "请勾选{0}后继续"
@@ -24074,11 +24075,11 @@ msgstr "不包括无库存物料"
msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:980
+#: erpnext/selling/doctype/sales_order/sales_order.js:983
msgid "Ignore Existing Ordered Qty"
msgstr "忽略已采购数量"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1740
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1757
msgid "Ignore Existing Projected Quantity"
msgstr "忽略可用数量"
@@ -24723,7 +24724,7 @@ msgstr "包括已失效批号"
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:976
+#: erpnext/selling/doctype/sales_order/sales_order.js:979
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -24922,7 +24923,7 @@ msgstr "再订购(组)仓库检查错误"
msgid "Incorrect Component Quantity"
msgstr "组件数量错误"
-#: erpnext/assets/doctype/asset/asset.py:321
+#: erpnext/assets/doctype/asset/asset.py:322
#: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py:56
msgid "Incorrect Date"
msgstr "日期错误"
@@ -25168,7 +25169,7 @@ msgstr "安装日期"
#. 'Installation Note'
#. Label of a Link in the Stock Workspace
#: erpnext/selling/doctype/installation_note/installation_note.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:257
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:263
#: erpnext/stock/workspace/stock/stock.json
msgid "Installation Note"
msgstr "安装通知单"
@@ -25178,7 +25179,7 @@ msgstr "安装通知单"
msgid "Installation Note Item"
msgstr "安装通知单项"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:623
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:625
msgid "Installation Note {0} has already been submitted"
msgstr "安装单{0}已经提交了"
@@ -25236,7 +25237,7 @@ msgstr "权限不足"
#: erpnext/stock/doctype/pick_list/pick_list.py:132
#: erpnext/stock/doctype/pick_list/pick_list.py:1003
#: erpnext/stock/doctype/stock_entry/stock_entry.py:788
-#: erpnext/stock/serial_batch_bundle.py:1087 erpnext/stock/stock_ledger.py:1582
+#: erpnext/stock/serial_batch_bundle.py:1103 erpnext/stock/stock_ledger.py:1582
#: erpnext/stock/stock_ledger.py:2068
msgid "Insufficient Stock"
msgstr "库存不足"
@@ -25330,6 +25331,10 @@ msgstr "关联公司业务日记账凭证参考"
msgid "Inter Company Order Reference"
msgstr "关联公司订单参考号"
+#: erpnext/selling/doctype/sales_order/sales_order.js:742
+msgid "Inter Company Purchase Order"
+msgstr ""
+
#. Label of the inter_company_reference (Link) field in DocType 'Delivery Note'
#. Label of the inter_company_reference (Link) field in DocType 'Purchase
#. Receipt'
@@ -25338,6 +25343,10 @@ msgstr "关联公司订单参考号"
msgid "Inter Company Reference"
msgstr "关联公司参考订单号"
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:485
+msgid "Inter Company Sales Order"
+msgstr ""
+
#. Label of the inter_transfer_reference_section (Section Break) field in
#. DocType 'Sales Order Item'
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -25379,10 +25388,18 @@ msgstr "内部客户"
msgid "Internal Customer for company {0} already exists"
msgstr "公司{0}的内部客户已存在"
+#: erpnext/selling/doctype/sales_order/sales_order.js:741
+msgid "Internal Purchase Order"
+msgstr ""
+
#: erpnext/controllers/accounts_controller.py:731
msgid "Internal Sale or Delivery Reference missing."
msgstr "须填写关联公司销售或出货参考单据编号"
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:484
+msgid "Internal Sales Order"
+msgstr ""
+
#: erpnext/controllers/accounts_controller.py:733
msgid "Internal Sales Reference Missing"
msgstr "关联方内部销售订单号必填"
@@ -25451,8 +25468,8 @@ msgstr "介绍"
msgid "Invalid"
msgstr "无效"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:370
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:378
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:372
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:380
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:961
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:971
#: erpnext/assets/doctype/asset_category/asset_category.py:69
@@ -25495,8 +25512,8 @@ msgstr "无效子流程"
msgid "Invalid Company for Inter Company Transaction."
msgstr "公司间交易的公司无效。"
-#: erpnext/assets/doctype/asset/asset.py:292
-#: erpnext/assets/doctype/asset/asset.py:299
+#: erpnext/assets/doctype/asset/asset.py:293
+#: erpnext/assets/doctype/asset/asset.py:300
#: erpnext/controllers/accounts_controller.py:3037
msgid "Invalid Cost Center"
msgstr "无效成本中心"
@@ -25526,7 +25543,7 @@ msgstr "无效单据类型"
msgid "Invalid Formula"
msgstr "公式不正确"
-#: erpnext/assets/doctype/asset/asset.py:430
+#: erpnext/assets/doctype/asset/asset.py:446
msgid "Invalid Gross Purchase Amount"
msgstr "无效购置总金额"
@@ -25534,7 +25551,7 @@ msgstr "无效购置总金额"
msgid "Invalid Group By"
msgstr "无效分组依据"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:453
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:454
#: erpnext/manufacturing/doctype/production_plan/production_plan.py:914
msgid "Invalid Item"
msgstr "无效物料"
@@ -25577,7 +25594,7 @@ msgstr "无效的主要角色"
msgid "Invalid Priority"
msgstr "无效的优先级"
-#: erpnext/manufacturing/doctype/bom/bom.py:1093
+#: erpnext/manufacturing/doctype/bom/bom.py:1130
msgid "Invalid Process Loss Configuration"
msgstr "无效的工艺损耗配置"
@@ -25605,8 +25622,8 @@ msgstr "无效的退货"
msgid "Invalid Sales Invoices"
msgstr "无效销售发票"
-#: erpnext/assets/doctype/asset/asset.py:515
-#: erpnext/assets/doctype/asset/asset.py:534
+#: erpnext/assets/doctype/asset/asset.py:531
+#: erpnext/assets/doctype/asset/asset.py:550
msgid "Invalid Schedule"
msgstr "无效的排程计划"
@@ -25639,7 +25656,7 @@ msgstr "科目{}的{} {}会计凭证中存在无效金额: {}"
msgid "Invalid condition expression"
msgstr "无效的条件表达式"
-#: erpnext/selling/doctype/quotation/quotation.py:270
+#: erpnext/selling/doctype/quotation/quotation.py:272
msgid "Invalid lost reason {0}, please create a new lost reason"
msgstr "无效的流失原因{0},请创建新的流失原因"
@@ -25785,7 +25802,7 @@ msgstr "发票限额"
msgid "Invoice Number"
msgstr "发票号码"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:812
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:813
msgid "Invoice Paid"
msgstr ""
@@ -26379,6 +26396,14 @@ msgstr "系统自带"
msgid "Is Stock Item"
msgstr "是库存物料"
+#. Label of the is_sub_assembly_item (Check) field in DocType 'BOM Explosion
+#. Item'
+#. Label of the is_sub_assembly_item (Check) field in DocType 'BOM Item'
+#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
+#: erpnext/manufacturing/doctype/bom_item/bom_item.json
+msgid "Is Sub Assembly Item"
+msgstr ""
+
#. Label of the is_subcontracted (Check) field in DocType 'Purchase Invoice'
#. Label of the is_subcontracted (Check) field in DocType 'Purchase Order'
#. Label of the is_subcontracted (Check) field in DocType 'Supplier Quotation'
@@ -26605,7 +26630,7 @@ msgstr "总金额为零时无法按金额分摊费用,请将'费用分摊基
#: erpnext/buying/workspace/buying/buying.json
#: erpnext/controllers/taxes_and_totals.py:1123
#: erpnext/manufacturing/doctype/blanket_order/blanket_order.json
-#: erpnext/manufacturing/doctype/bom/bom.js:944
+#: erpnext/manufacturing/doctype/bom/bom.js:979
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109
#: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:25
@@ -26626,7 +26651,7 @@ msgstr "总金额为零时无法按金额分摊费用,请将'费用分摊基
#: erpnext/public/js/stock_analytics.js:92
#: erpnext/selling/doctype/party_specific_item/party_specific_item.json
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1203
+#: erpnext/selling/doctype/sales_order/sales_order.js:1206
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:46
#: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.js:14
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.js:36
@@ -26829,10 +26854,10 @@ msgstr "购物车"
#: erpnext/accounts/doctype/pricing_rule_item_code/pricing_rule_item_code.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1026
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1035
#: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:68
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:37
-#: erpnext/accounts/report/gross_profit/gross_profit.py:281
+#: erpnext/accounts/report/gross_profit/gross_profit.py:287
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:150
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:171
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:37
@@ -26889,8 +26914,8 @@ msgstr "购物车"
#: erpnext/selling/doctype/quotation_item/quotation_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:345
#: erpnext/selling/doctype/sales_order/sales_order.js:453
-#: erpnext/selling/doctype/sales_order/sales_order.js:839
-#: erpnext/selling/doctype/sales_order/sales_order.js:990
+#: erpnext/selling/doctype/sales_order/sales_order.js:842
+#: erpnext/selling/doctype/sales_order/sales_order.js:993
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py:29
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:27
@@ -26933,7 +26958,7 @@ msgstr "购物车"
#: erpnext/stock/report/item_price_stock/item_price_stock.py:18
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:125
#: 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:396
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:419
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:7
#: erpnext/stock/report/stock_ageing/stock_ageing.py:130
#: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:104
@@ -26960,7 +26985,7 @@ msgstr ""
msgid "Item Code cannot be changed for Serial No."
msgstr "物料号不能因序列号改变"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:445
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:447
msgid "Item Code required at Row No {0}"
msgstr "请在第{0}行输入物料号"
@@ -27065,7 +27090,7 @@ msgstr "物料详细信息"
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/doctype/tax_rule/tax_rule.json
#: erpnext/accounts/report/gross_profit/gross_profit.js:44
-#: erpnext/accounts/report/gross_profit/gross_profit.py:294
+#: erpnext/accounts/report/gross_profit/gross_profit.py:300
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js:21
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:28
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:28
@@ -27277,7 +27302,7 @@ msgstr "物料制造商"
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:74
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:71
-#: erpnext/accounts/report/gross_profit/gross_profit.py:288
+#: erpnext/accounts/report/gross_profit/gross_profit.py:294
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:33
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:156
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:177
@@ -27326,7 +27351,7 @@ msgstr "物料制造商"
#: erpnext/public/js/controllers/transaction.js:2414
#: erpnext/public/js/utils.js:756
#: erpnext/selling/doctype/quotation_item/quotation_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:845
+#: erpnext/selling/doctype/sales_order/sales_order.js:848
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py:35
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:33
@@ -27360,7 +27385,7 @@ msgstr "物料制造商"
#: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143
#: 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:131
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:403
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:426
#: erpnext/stock/report/stock_ageing/stock_ageing.py:136
#: erpnext/stock/report/stock_analytics/stock_analytics.py:31
#: erpnext/stock/report/stock_balance/stock_balance.py:404
@@ -27409,7 +27434,7 @@ msgstr "物料价格设置"
msgid "Item Price Stock"
msgstr "物料价格与库存"
-#: erpnext/stock/get_item_details.py:1063
+#: erpnext/stock/get_item_details.py:1058
msgid "Item Price added for {0} in Price List {1}"
msgstr "物料价格{0}自动添加到价格表{1}中了,以备以后订单使用"
@@ -27417,7 +27442,7 @@ msgstr "物料价格{0}自动添加到价格表{1}中了,以备以后订单使
msgid "Item Price appears multiple times based on Price List, Supplier/Customer, Currency, Item, Batch, UOM, Qty, and Dates."
msgstr "物料价格在价格表,供应商/客户,货币,物料,批号,单位及有效日期字段组合中重复了"
-#: erpnext/stock/get_item_details.py:1042
+#: erpnext/stock/get_item_details.py:1037
msgid "Item Price updated for {0} in Price List {1}"
msgstr "物料价格{0}更新到价格表{1}中了,之后的订单会使用新价格"
@@ -27565,8 +27590,8 @@ msgstr "成品"
msgid "Item UOM"
msgstr "物料单位"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:409
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:416
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:410
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:417
msgid "Item Unavailable"
msgstr "物料不可用"
@@ -27682,7 +27707,7 @@ msgid "Item must be added using 'Get Items from Purchase Receipts' button"
msgstr "物料必须要由“从采购入库选物料”添加"
#: erpnext/buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:42
-#: erpnext/selling/doctype/sales_order/sales_order.js:1210
+#: erpnext/selling/doctype/sales_order/sales_order.js:1213
msgid "Item name"
msgstr "物料名称"
@@ -27729,7 +27754,7 @@ msgstr "物料{0}不能作为自身的子装配件添加"
msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}."
msgstr "物料{0}在总括订单{2}下不可订购超过{1}"
-#: erpnext/assets/doctype/asset/asset.py:274
+#: erpnext/assets/doctype/asset/asset.py:275
#: erpnext/stock/doctype/item/item.py:634
msgid "Item {0} does not exist"
msgstr "物料{0}不存在"
@@ -27750,7 +27775,7 @@ msgstr "物料{0}重复输入"
msgid "Item {0} has already been returned"
msgstr "物料{0}已被退回"
-#: erpnext/assets/doctype/asset/asset.py:276
+#: erpnext/assets/doctype/asset/asset.py:277
msgid "Item {0} has been disabled"
msgstr "物料{0}已禁用"
@@ -27766,7 +27791,7 @@ msgstr "物料{0}已经到达寿命终止日期{1}"
msgid "Item {0} ignored since it is not a stock item"
msgstr "{0}不是库存产品,已被忽略"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:565
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:567
msgid "Item {0} is already reserved/delivered against Sales Order {1}."
msgstr "物料{0}已被销售订单{1}预留"
@@ -27794,7 +27819,7 @@ msgstr "物料{0}非外协物料"
msgid "Item {0} is not active or end of life has been reached"
msgstr "物料{0}处于失效或寿命终止状态"
-#: erpnext/assets/doctype/asset/asset.py:278
+#: erpnext/assets/doctype/asset/asset.py:279
msgid "Item {0} must be a Fixed Asset Item"
msgstr "物料{0}必须被定义为允许资产"
@@ -27806,7 +27831,7 @@ msgstr "物料{0}必须为非库存物料"
msgid "Item {0} must be a Sub-contracted Item"
msgstr "物料{0}必须是委外物料"
-#: erpnext/assets/doctype/asset/asset.py:280
+#: erpnext/assets/doctype/asset/asset.py:281
msgid "Item {0} must be a non-stock item"
msgstr "物料{0}必须是非允许库存物料"
@@ -27863,7 +27888,7 @@ msgstr "物料销售明细"
msgid "Item-wise Sales Register"
msgstr "物料销售台账"
-#: erpnext/stock/get_item_details.py:703
+#: erpnext/stock/get_item_details.py:698
msgid "Item/Item Code required to get Item Tax Template."
msgstr ""
@@ -27921,11 +27946,11 @@ msgstr "物料{0}不存在"
#: erpnext/selling/doctype/installation_note/installation_note.json
#: erpnext/selling/doctype/product_bundle/product_bundle.json
#: erpnext/selling/doctype/quotation/quotation.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:831
+#: erpnext/selling/doctype/sales_order/sales_order.js:834
#: erpnext/selling/doctype/sales_order/sales_order.json
#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:19
#: erpnext/setup/doctype/item_group/item_group.js:87
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:487
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:493
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/material_request/material_request.json
#: erpnext/stock/doctype/packing_slip/packing_slip.json
@@ -27955,8 +27980,8 @@ msgstr "物料"
msgid "Items Filter"
msgstr "物料过滤"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1601
-#: erpnext/selling/doctype/sales_order/sales_order.js:1246
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1618
+#: erpnext/selling/doctype/sales_order/sales_order.js:1250
msgid "Items Required"
msgstr "所需物料"
@@ -27976,7 +28001,7 @@ msgstr "物料和定价"
msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}."
msgstr "因已针对采购订单{0}创建外协订单,物料不可更新"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1026
+#: erpnext/selling/doctype/sales_order/sales_order.js:1029
msgid "Items for Raw Material Request"
msgstr "用于物料需求的物料号"
@@ -27990,7 +28015,7 @@ msgstr "因勾选了成本价为0,这些物料 {0} 的单价已设置为0"
msgid "Items to Be Repost"
msgstr "待重过账物料"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1600
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1617
msgid "Items to Manufacture are required to pull the Raw Materials associated with it."
msgstr "需有装配件或子装配件明细后才可计算采购原材料需求。"
@@ -28487,7 +28512,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:685
#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:104
#: erpnext/stock/workspace/stock/stock.json
@@ -28599,6 +28624,35 @@ msgstr "最后下单日期"
msgid "Last Purchase Rate"
msgstr "最新采购价"
+#. Label of the last_scanned_warehouse (Data) field in DocType 'POS Invoice'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Purchase
+#. Invoice'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Sales Invoice'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Purchase Order'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Quotation'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Sales Order'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Delivery Note'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Material
+#. Request'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Purchase
+#. Receipt'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Stock Entry'
+#. Label of the last_scanned_warehouse (Data) field in DocType 'Stock
+#. Reconciliation'
+#: 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/buying/doctype/purchase_order/purchase_order.json
+#: erpnext/selling/doctype/quotation/quotation.json
+#: erpnext/selling/doctype/sales_order/sales_order.json
+#: erpnext/stock/doctype/delivery_note/delivery_note.json
+#: erpnext/stock/doctype/material_request/material_request.json
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+#: erpnext/stock/doctype/stock_entry/stock_entry.json
+#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
+msgid "Last Scanned Warehouse"
+msgstr ""
+
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:328
msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}."
msgstr "物料{0}在仓库{1}的最后库存交易发生于{2}"
@@ -29402,7 +29456,7 @@ msgstr "积分:{0}"
#: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.json
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1121
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1130
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/selling/doctype/customer/customer.json
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:952
@@ -29725,7 +29779,7 @@ msgstr "主修/选修科目"
#. Label of the make (Data) field in DocType 'Vehicle'
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:109
-#: erpnext/manufacturing/doctype/job_card/job_card.js:471
+#: erpnext/manufacturing/doctype/job_card/job_card.js:479
#: erpnext/setup/doctype/vehicle/vehicle.json
msgid "Make"
msgstr "生成"
@@ -29759,7 +29813,7 @@ msgstr "创建采购发票"
msgid "Make Quotation"
msgstr "创建报价"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:356
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:363
msgid "Make Return Entry"
msgstr "创建退货分录"
@@ -29774,12 +29828,12 @@ msgstr "创建销售发票"
msgid "Make Serial No / Batch from Work Order"
msgstr "从工单生成序列号/批号"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:74
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:282
+#: erpnext/manufacturing/doctype/job_card/job_card.js:82
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:289
msgid "Make Stock Entry"
msgstr "创建物料移动"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:345
+#: erpnext/manufacturing/doctype/job_card/job_card.js:353
msgid "Make Subcontracting PO"
msgstr "创建外协采购订单"
@@ -29849,18 +29903,18 @@ msgstr "总经理"
#: erpnext/accounts/doctype/pos_field/pos_field.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:147
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:76
-#: erpnext/manufacturing/doctype/bom/bom.js:85
-#: erpnext/manufacturing/doctype/bom/bom.js:603
+#: erpnext/manufacturing/doctype/bom/bom.js:87
+#: erpnext/manufacturing/doctype/bom/bom.js:624
#: erpnext/manufacturing/doctype/bom/bom.py:261
#: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py:71
#: erpnext/public/js/controllers/accounts.js:249
#: erpnext/public/js/controllers/transaction.js:2812
#: erpnext/public/js/utils/party.js:321
#: erpnext/stock/doctype/delivery_note/delivery_note.js:164
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:203
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:206
#: erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:138
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:250
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:254
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:101
msgid "Mandatory"
msgstr "必填字段"
@@ -29891,15 +29945,15 @@ msgstr "针对资产负债科目必填"
msgid "Mandatory For Profit and Loss Account"
msgstr "针对损益科目必填"
-#: erpnext/selling/doctype/quotation/quotation.py:588
+#: erpnext/selling/doctype/quotation/quotation.py:610
msgid "Mandatory Missing"
msgstr "缺少必填项"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:628
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:630
msgid "Mandatory Purchase Order"
msgstr "必填采购订单"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:649
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:651
msgid "Mandatory Purchase Receipt"
msgstr "必填采购收货单"
@@ -30164,7 +30218,7 @@ msgstr "生产类型"
msgid "Manufacturing User"
msgstr "生产用户"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:179
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:183
msgid "Mapping Purchase Receipt ..."
msgstr "正在映射采购收货单..."
@@ -30400,7 +30454,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:133
+#: erpnext/manufacturing/doctype/job_card/job_card.js:141
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:155
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
#: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
@@ -30496,7 +30550,7 @@ msgstr "物料需求中的计划物料"
msgid "Material Request Type"
msgstr "物料需求类型"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1704
+#: erpnext/selling/doctype/sales_order/sales_order.py:1720
msgid "Material Request not created, as quantity for Raw Materials already available."
msgstr "因原材料可用数量足够,物料需求未创建,。"
@@ -30514,7 +30568,7 @@ msgstr "创建此物料移动的物料需求"
msgid "Material Request {0} is cancelled or stopped"
msgstr "物料需求{0}已取消或已停止"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1042
+#: erpnext/selling/doctype/sales_order/sales_order.js:1045
msgid "Material Request {0} submitted."
msgstr "物料需求{0}已提交。"
@@ -30551,7 +30605,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:147
+#: erpnext/manufacturing/doctype/job_card/job_card.js:155
#: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:90
#: erpnext/stock/doctype/item/item.json
@@ -30722,7 +30776,7 @@ msgstr "最大值"
msgid "Maximum discount for Item {0} is {1}%"
msgstr "第{0}项的最大折扣为{1}%"
-#: erpnext/public/js/utils/barcode_scanner.js:99
+#: erpnext/public/js/utils/barcode_scanner.js:125
msgid "Maximum quantity scanned for item {0}."
msgstr "已扫描物料{0}的最大数量"
@@ -31193,7 +31247,7 @@ msgstr "缺失"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:87
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:184
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:588
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:590
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2249
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2849
#: erpnext/assets/doctype/asset_category/asset_category.py:116
@@ -31205,7 +31259,7 @@ msgid "Missing Asset"
msgstr "缺少资产"
#: erpnext/accounts/doctype/gl_entry/gl_entry.py:178
-#: erpnext/assets/doctype/asset/asset.py:308
+#: erpnext/assets/doctype/asset/asset.py:309
msgid "Missing Cost Center"
msgstr "缺少成本中心"
@@ -31213,11 +31267,11 @@ msgstr "缺少成本中心"
msgid "Missing Default in Company"
msgstr "公司缺少默认值"
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:27
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:44
msgid "Missing Filters"
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:350
+#: erpnext/assets/doctype/asset/asset.py:351
msgid "Missing Finance Book"
msgstr "缺少财务账簿"
@@ -31249,7 +31303,7 @@ msgstr "必填字段信息缺失"
msgid "Missing email template for dispatch. Please set one in Delivery Settings."
msgstr "未配置外发电子邮件模板。请在“出货设置”中设置。"
-#: erpnext/manufacturing/doctype/bom/bom.py:1052
+#: erpnext/manufacturing/doctype/bom/bom.py:1089
#: erpnext/manufacturing/doctype/work_order/work_order.py:1198
msgid "Missing value"
msgstr "缺失值"
@@ -31487,7 +31541,7 @@ msgstr "发票月底 + 授信月数"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:62
#: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:75
-#: erpnext/accounts/report/gross_profit/gross_profit.py:406
+#: erpnext/accounts/report/gross_profit/gross_profit.py:418
#: erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json
#: erpnext/buying/report/purchase_analytics/purchase_analytics.js:61
#: erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
@@ -31915,7 +31969,7 @@ msgstr "天然气"
msgid "Needs Analysis"
msgstr "需求分析"
-#: erpnext/stock/serial_batch_bundle.py:1381
+#: erpnext/stock/serial_batch_bundle.py:1397
msgid "Negative Batch Quantity"
msgstr "负批次数量"
@@ -32356,7 +32410,7 @@ msgstr "新序列号不能有仓库,仓库只能通过物料移动和采购入
msgid "New Task"
msgstr "新任务"
-#: erpnext/manufacturing/doctype/bom/bom.js:156
+#: erpnext/manufacturing/doctype/bom/bom.js:177
msgid "New Version"
msgstr "新版本"
@@ -32383,7 +32437,7 @@ msgstr "新建会计年度:- "
msgid "New invoices will be generated as per schedule even if current invoices are unpaid or past due date"
msgstr "即使当前发票未付或过期,仍将按计划生成新发票"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:252
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:258
msgid "New release date should be in the future"
msgstr "新的解除临时冻结日期必须晚于今天"
@@ -32465,8 +32519,8 @@ msgstr "下次邮件发送时间:"
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:625
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:646
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:627
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:648
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/buying/doctype/buying_settings/buying_settings.json
#: erpnext/projects/doctype/project/project.json
@@ -32525,11 +32579,11 @@ msgstr "没启用序列号管理为{0}的物料"
msgid "No Items selected for transfer."
msgstr "未选择待转移物料"
-#: erpnext/selling/doctype/sales_order/sales_order.js:824
+#: erpnext/selling/doctype/sales_order/sales_order.js:827
msgid "No Items with Bill of Materials to Manufacture"
msgstr "无定义了物料清单的待生产成品"
-#: erpnext/selling/doctype/sales_order/sales_order.js:962
+#: erpnext/selling/doctype/sales_order/sales_order.js:965
msgid "No Items with Bill of Materials."
msgstr "无已维护物料清单的物料。"
@@ -32545,7 +32599,7 @@ msgstr "无备注"
msgid "No Outstanding Invoices found for this party"
msgstr "未找到待核销发票"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:623
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:624
msgid "No POS Profile found. Please create a New POS Profile first"
msgstr "未找到POS配置,请先创建新POS配置"
@@ -32565,7 +32619,7 @@ msgstr "未创建采购订单"
msgid "No Records for these settings."
msgstr "无满足筛选条件的数据"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:334
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:336
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1049
msgid "No Remarks"
msgstr "无备注"
@@ -32594,7 +32648,7 @@ msgstr "未找到代表公司{0}的关联公司交易供应商"
msgid "No Tax Withholding data found for the current posting date."
msgstr "当前过账日期未找到代扣税数据"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:857
+#: erpnext/accounts/report/gross_profit/gross_profit.py:874
msgid "No Terms"
msgstr "无条款"
@@ -32610,7 +32664,7 @@ msgstr "未找到待核销收付款凭证"
msgid "No Work Orders were created"
msgstr "无待创建的生产工单"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:803
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:805
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:742
msgid "No accounting entries for the following warehouses"
msgstr "没有以下仓库的日记账凭证"
@@ -32857,7 +32911,7 @@ msgstr "非折旧类目"
msgid "Non Profit"
msgstr "公益组织"
-#: erpnext/manufacturing/doctype/bom/bom.py:1420
+#: erpnext/manufacturing/doctype/bom/bom.py:1457
msgid "Non stock items"
msgstr "非库存物料"
@@ -32876,19 +32930,19 @@ msgid "None of the items have any change in quantity or value."
msgstr "物料数量或金额无任何变化。"
#. Name of a UOM
-#: erpnext/setup/setup_wizard/data/uom_data.json erpnext/stock/utils.py:681
-#: erpnext/stock/utils.py:683
+#: erpnext/setup/setup_wizard/data/uom_data.json erpnext/stock/utils.py:703
+#: erpnext/stock/utils.py:705
msgid "Nos"
msgstr "个"
#: erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py:66
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:270
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:271
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:556
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:568
#: erpnext/assets/doctype/asset/asset.js:618
#: erpnext/assets/doctype/asset/asset.js:633
#: erpnext/controllers/buying_controller.py:269
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:72
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:73
#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:80
msgid "Not Allowed"
msgstr "不允许"
@@ -32923,7 +32977,7 @@ msgstr "未出货"
msgid "Not Initiated"
msgstr "未启动"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:812
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:823
#: erpnext/templates/pages/material_request_info.py:21
#: erpnext/templates/pages/order.py:37 erpnext/templates/pages/rfq.py:46
msgid "Not Permitted"
@@ -32997,7 +33051,7 @@ msgstr "缺货"
#: erpnext/manufacturing/doctype/work_order/work_order.py:2041
#: erpnext/manufacturing/doctype/work_order/work_order.py:2110
#: erpnext/selling/doctype/sales_order/sales_order.py:826
-#: erpnext/selling/doctype/sales_order/sales_order.py:1685
+#: erpnext/selling/doctype/sales_order/sales_order.py:1701
msgid "Not permitted"
msgstr "没有权限"
@@ -33007,12 +33061,12 @@ msgstr "没有权限"
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:288
#: erpnext/crm/doctype/crm_note/crm_note.json
#: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py:100
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1040
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1750
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1055
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1767
#: erpnext/projects/doctype/timesheet/timesheet.json
#: erpnext/public/js/controllers/buying.js:477
#: erpnext/selling/doctype/customer/customer.py:129
-#: erpnext/selling/doctype/sales_order/sales_order.js:1180
+#: erpnext/selling/doctype/sales_order/sales_order.js:1183
#: erpnext/stock/doctype/item/item.js:526
#: erpnext/stock/doctype/item/item.py:571
#: erpnext/stock/doctype/item_price/item_price.json
@@ -33689,7 +33743,7 @@ msgstr "未开始生产工单"
msgid "Open a new ticket"
msgstr "创建新客服工单"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:377
+#: erpnext/accounts/report/general_ledger/general_ledger.py:397
#: erpnext/public/js/stock_analytics.js:97
msgid "Opening"
msgstr "期初"
@@ -33786,7 +33840,7 @@ msgstr "发票创建工具明细"
msgid "Opening Invoice Item"
msgstr "待处理发票明细"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1628
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1836
msgid "Opening Invoice has rounding adjustment of {0}.
'{1}' account is required to post these values. Please set it in Company: {2}.
Or, '{3}' can be enabled to not post any rounding adjustment."
msgstr "期初发票存在{0}的舍入调整。
需设置'{1}'科目以过账这些值,请在公司{2}中设置。
或启用'{3}'以不过账任何舍入调整"
@@ -33861,7 +33915,7 @@ msgstr "工费成本(本币)"
msgid "Operating Cost Per BOM Quantity"
msgstr "每个成品工费成本"
-#: erpnext/manufacturing/doctype/bom/bom.py:1436
+#: erpnext/manufacturing/doctype/bom/bom.py:1473
msgid "Operating Cost as per Work Order / BOM"
msgstr "按工单/物料清单计算的运营成本"
@@ -33891,7 +33945,7 @@ msgstr "工费成本"
#. Label of the operation (Link) field in DocType 'Work Order Item'
#. Label of the operation (Link) field in DocType 'Work Order Operation'
#. Label of a Link in the Manufacturing Workspace
-#: erpnext/manufacturing/doctype/bom/bom.js:409
+#: erpnext/manufacturing/doctype/bom/bom.js:430
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
@@ -33983,7 +34037,7 @@ msgstr "多少成品工序已完成?"
msgid "Operation time does not depend on quantity to produce"
msgstr "加工(操作)时间不随着生产数量变化"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:513
+#: erpnext/manufacturing/doctype/job_card/job_card.js:521
msgid "Operation {0} added multiple times in the work order {1}"
msgstr "工单{1}中工序{0}被多次添加"
@@ -34017,7 +34071,7 @@ msgstr "工序"
msgid "Operations Routing"
msgstr "工序路线"
-#: erpnext/manufacturing/doctype/bom/bom.py:1061
+#: erpnext/manufacturing/doctype/bom/bom.py:1098
msgid "Operations cannot be left blank"
msgstr "请填写工序信息"
@@ -34591,7 +34645,7 @@ msgstr "付款"
msgid "Over Billing Allowance (%)"
msgstr "超额开票比率(%)"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1260
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1262
msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%"
msgstr "采购收据物料{0}({1})超账单容差达{2}%。"
@@ -35085,7 +35139,7 @@ msgstr "包装清单"
#. Name of a DocType
#. Label of a Link in the Stock Workspace
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:293
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:299
#: erpnext/stock/doctype/packing_slip/packing_slip.json
#: erpnext/stock/workspace/stock/stock.json
msgid "Packing Slip"
@@ -35096,7 +35150,7 @@ msgstr "装箱单"
msgid "Packing Slip Item"
msgstr "装箱单项"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:639
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:641
msgid "Packing Slip(s) cancelled"
msgstr "装箱单( S)取消"
@@ -35227,7 +35281,7 @@ msgstr "付款方账户类型"
msgid "Paid To Account Type"
msgstr "收款方账户类型"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:324
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:326
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1095
msgid "Paid amount + Write Off Amount can not be greater than Grand Total"
msgstr "付款金额+销账金额不能大于总金额"
@@ -35382,11 +35436,11 @@ msgstr "上层物料"
msgid "Parent Item Group"
msgstr "父物料组"
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:80
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:81
msgid "Parent Item {0} must not be a Fixed Asset"
msgstr "上级物料{0}不能为固定资产"
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:78
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:79
msgid "Parent Item {0} must not be a Stock Item"
msgstr "父项{0}不能勾选了允许库存的物料"
@@ -35406,7 +35460,7 @@ msgstr "父程序"
msgid "Parent Row No"
msgstr "上级行号"
-#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:496
+#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:499
msgid "Parent Row No not found for {0}"
msgstr "未找到{0}的上级行号"
@@ -35457,7 +35511,7 @@ msgstr "部分发料"
msgid "Partial Payment in POS Transactions are not allowed."
msgstr "POS交易不支持部分付款。"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1643
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1645
msgid "Partial Stock Reservation"
msgstr "部分库存预留"
@@ -35651,7 +35705,7 @@ msgstr "百万分率"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:147
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:228
#: erpnext/accounts/report/general_ledger/general_ledger.js:74
-#: erpnext/accounts/report/general_ledger/general_ledger.py:723
+#: erpnext/accounts/report/general_ledger/general_ledger.py:743
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:161
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46
@@ -35756,6 +35810,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
#: erpnext/accounts/report/general_ledger/general_ledger.js:110
+#: erpnext/accounts/report/general_ledger/general_ledger.py:752
#: erpnext/crm/doctype/contract/contract.json
#: erpnext/selling/doctype/party_specific_item/party_specific_item.json
#: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22
@@ -35814,7 +35869,7 @@ msgstr "客户/供应商可交易物料"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:141
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:219
#: erpnext/accounts/report/general_ledger/general_ledger.js:65
-#: erpnext/accounts/report/general_ledger/general_ledger.py:722
+#: erpnext/accounts/report/general_ledger/general_ledger.py:742
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:157
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35
@@ -35909,7 +35964,7 @@ msgstr "网址路径"
msgid "Pause"
msgstr "暂停"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:216
+#: erpnext/manufacturing/doctype/job_card/job_card.js:224
msgid "Pause Job"
msgstr "暂停生产任务单"
@@ -36405,7 +36460,7 @@ msgstr "付款状态"
#: 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:1200
-#: erpnext/accounts/report/gross_profit/gross_profit.py:412
+#: erpnext/accounts/report/gross_profit/gross_profit.py:424
#: erpnext/accounts/workspace/accounting/accounting.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:30
msgid "Payment Term"
@@ -36518,7 +36573,7 @@ msgstr "付款解除关联错误"
msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
msgstr "对{0} {1}的付款不能大于总未付金额{2}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:748
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:749
msgid "Payment amount cannot be less than or equal to 0"
msgstr "付款金额不可小于等于0"
@@ -36535,7 +36590,7 @@ msgstr "成功接收{0}付款"
msgid "Payment of {0} received successfully. Waiting for other requests to complete..."
msgstr "成功接收{0}付款,等待其他请求完成..."
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:378
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:379
msgid "Payment related to {0} is not completed"
msgstr "与{0}相关的付款未完成"
@@ -36678,7 +36733,7 @@ msgstr "待付款金额"
#: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
#: erpnext/manufacturing/doctype/work_order/work_order.js:312
#: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:183
-#: erpnext/selling/doctype/sales_order/sales_order.js:1217
+#: erpnext/selling/doctype/sales_order/sales_order.js:1220
#: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:45
msgid "Pending Qty"
msgstr "待处理数量"
@@ -37057,7 +37112,7 @@ msgstr "电话"
#. Reservation Entry'
#. Label of a Link in the Stock Workspace
#: erpnext/selling/doctype/sales_order/sales_order.js:637
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:199
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:202
#: erpnext/stock/doctype/material_request/material_request.js:140
#: erpnext/stock/doctype/pick_list/pick_list.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -37376,12 +37431,12 @@ msgid "Please Select a Company."
msgstr "请先选择公司"
#: erpnext/stock/doctype/delivery_note/delivery_note.js:165
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:204
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:207
msgid "Please Select a Customer"
msgstr "请选择客户"
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:139
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:251
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:255
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:102
msgid "Please Select a Supplier"
msgstr "请选择供应商"
@@ -37467,7 +37522,7 @@ msgstr "请勾选允许同一往来单位发票多货币"
msgid "Please check Process Deferred Accounting {0} and submit manually after resolving errors."
msgstr "请检查处理递延会计{0},解决错误后手动提交"
-#: erpnext/manufacturing/doctype/bom/bom.js:84
+#: erpnext/manufacturing/doctype/bom/bom.js:86
msgid "Please check either with operations or FG Based Operating Cost."
msgstr "有工艺路线与启用计件成本两个勾选字段必须二选一"
@@ -37512,7 +37567,7 @@ msgstr "请联系管理员延长{0}的信用额度"
msgid "Please convert the parent account in corresponding child company to a group account."
msgstr "请将对应子公司的上级账户转换为组账户"
-#: erpnext/selling/doctype/quotation/quotation.py:586
+#: erpnext/selling/doctype/quotation/quotation.py:608
msgid "Please create Customer from Lead {0}."
msgstr "请从线索{0}创建客户"
@@ -37528,7 +37583,7 @@ msgstr "如需,请新建会计维度"
msgid "Please create purchase from internal sale or delivery document itself"
msgstr "请自关联方内部销售或出货单创建采购订单"
-#: erpnext/assets/doctype/asset/asset.py:390
+#: erpnext/assets/doctype/asset/asset.py:391
msgid "Please create purchase receipt or purchase invoice for the item {0}"
msgstr "请为物料{0}创建采购入库或采购发票"
@@ -37540,7 +37595,7 @@ msgstr "在合并{1}到{2}前,请先删除产品套装{0}"
msgid "Please disable workflow temporarily for Journal Entry {0}"
msgstr "请暂时停用日记账凭证{0}的工作流。"
-#: erpnext/assets/doctype/asset/asset.py:429
+#: erpnext/assets/doctype/asset/asset.py:445
msgid "Please do not book expense of multiple assets against one single Asset."
msgstr "请勿将多个资产的费用记入单一资产"
@@ -37570,7 +37625,7 @@ msgstr "请确保理解相关影响后勾选"
msgid "Please enable pop-ups"
msgstr "请启用弹出窗口"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:665
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:667
msgid "Please enable {0} in the {1}."
msgstr "请在 {0} 启用 {1}"
@@ -37578,11 +37633,11 @@ msgstr "请在 {0} 启用 {1}"
msgid "Please enable {} in {} to allow same item in multiple rows"
msgstr "请在{}中启用{}以允许同一物料多行显示"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:367
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:369
msgid "Please ensure that the {0} account is a Balance Sheet account. You can change the parent account to a Balance Sheet account or select a different account."
msgstr "请确保{0}账户为资产负债表账户。您可将上级账户改为资产负债表账户或选择其他账户"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:375
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:377
msgid "Please ensure that the {0} account {1} is a Payable account. You can change the account type to Payable or select a different account."
msgstr "请确保{0}账户{1}为应付账户。您可更改账户类型为应付或选择其他账户"
@@ -37598,7 +37653,7 @@ msgstr "请确保{}账户{}为应收账户"
msgid "Please enter Difference Account or set default Stock Adjustment Account for company {0}"
msgstr "请输入差异账户或为公司{0}设置默认库存调整账户"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:508
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:509
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1188
msgid "Please enter Account for Change Amount"
msgstr "请输入零钱科目"
@@ -37680,7 +37735,7 @@ msgstr "请输入运输包裹信息"
msgid "Please enter Warehouse and Date"
msgstr "请输入仓库和日期"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:653
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:655
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1184
msgid "Please enter Write Off Account"
msgstr "请输入销账科目"
@@ -37709,7 +37764,7 @@ msgstr "请先输入手机号码"
msgid "Please enter parent cost center"
msgstr "请输入父成本中心"
-#: erpnext/public/js/utils/barcode_scanner.js:165
+#: erpnext/public/js/utils/barcode_scanner.js:191
msgid "Please enter quantity for item {0}"
msgstr "请输入物料{0}的数量"
@@ -37725,7 +37780,7 @@ msgstr "请输入序列号"
msgid "Please enter the company name to confirm"
msgstr "请输入公司名确认"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:751
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:752
msgid "Please enter the phone number first"
msgstr "请先输入电话号码"
@@ -37828,7 +37883,7 @@ msgstr "请选择模板类型以下载模板"
msgid "Please select Apply Discount On"
msgstr "请选择适用的折扣"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1650
+#: erpnext/selling/doctype/sales_order/sales_order.py:1666
msgid "Please select BOM against item {0}"
msgstr "请选择物料{0}的物料清单"
@@ -37914,11 +37969,11 @@ msgstr "在选择往来单位之前请先选择记账日期"
msgid "Please select Posting Date first"
msgstr "请先选择记账日期"
-#: erpnext/manufacturing/doctype/bom/bom.py:1106
+#: erpnext/manufacturing/doctype/bom/bom.py:1143
msgid "Please select Price List"
msgstr "请选择价格表"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1652
+#: erpnext/selling/doctype/sales_order/sales_order.py:1668
msgid "Please select Qty against item {0}"
msgstr "请选择为物料{0}指定数量"
@@ -37926,7 +37981,7 @@ msgstr "请选择为物料{0}指定数量"
msgid "Please select Sample Retention Warehouse in Stock Settings first"
msgstr "请先在库存设置中选择样品仓"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:415
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:417
msgid "Please select Serial/Batch Nos to reserve or change Reservation Based On to Qty."
msgstr "请选择序列号/批号或修改预留类型为数量"
@@ -37946,17 +38001,17 @@ msgstr "请选择委外订单而非采购订单{0}"
msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
msgstr "请在单据中维护公司内部交易未实现损益科目,或在公司 {0} 主数据中维护相应的默认科目"
-#: erpnext/manufacturing/doctype/bom/bom.py:1338
+#: erpnext/manufacturing/doctype/bom/bom.py:1375
msgid "Please select a BOM"
msgstr "请选择一个物料清单"
#: erpnext/accounts/party.py:430
-#: erpnext/stock/doctype/pick_list/pick_list.py:1551
+#: erpnext/stock/doctype/pick_list/pick_list.py:1563
msgid "Please select a Company"
msgstr "请选择一个公司"
#: erpnext/accounts/doctype/payment_entry/payment_entry.js:267
-#: erpnext/manufacturing/doctype/bom/bom.js:603
+#: erpnext/manufacturing/doctype/bom/bom.js:624
#: erpnext/manufacturing/doctype/bom/bom.py:261
#: erpnext/public/js/controllers/accounts.js:249
#: erpnext/public/js/controllers/transaction.js:2812
@@ -38036,11 +38091,11 @@ msgstr "请选择一个值{0} quotation_to {1}"
msgid "Please select an item code before setting the warehouse."
msgstr "请先设置物料编码再设置仓库"
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:26
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:43
msgid "Please select at least one filter: Item Code, Batch, or Serial No."
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.js:886
+#: erpnext/selling/doctype/sales_order/sales_order.js:889
msgid "Please select atleast one item to continue"
msgstr ""
@@ -38125,7 +38180,7 @@ msgstr "请选择{0}"
msgid "Please select {0} first"
msgstr "请先选择{0}"
-#: erpnext/public/js/controllers/transaction.js:99
+#: erpnext/public/js/controllers/transaction.js:100
msgid "Please set 'Apply Additional Discount On'"
msgstr "请设置“额外折扣基于”"
@@ -38167,10 +38222,14 @@ msgstr "请在{}设置会计维度{}"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:58
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:68
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:78
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:756
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:765
msgid "Please set Company"
msgstr "请设公司"
+#: erpnext/regional/united_arab_emirates/utils.py:26
+msgid "Please set Customer Address to determine if the transaction is an export."
+msgstr ""
+
#: erpnext/assets/doctype/asset/depreciation.py:741
msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
msgstr "请设置在资产类别{0}或公司折旧相关科目{1}"
@@ -38193,7 +38252,7 @@ msgstr "请为公共管理'%s'设置财政代码"
msgid "Please set Fixed Asset Account in Asset Category {0}"
msgstr "请在资产类别{0}中设置固定资产科目。"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:585
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:587
msgid "Please set Fixed Asset Account in {} against {}."
msgstr "请在{}主数据中为公司{}设置固定资产科目"
@@ -38219,7 +38278,7 @@ msgstr "请在公司{0}中设置未实现汇兑损益科目"
msgid "Please set VAT Accounts in {0}"
msgstr "请在{0}设置增值税账户"
-#: erpnext/regional/united_arab_emirates/utils.py:61
+#: erpnext/regional/united_arab_emirates/utils.py:83
msgid "Please set Vat Accounts for Company: \"{0}\" in UAE VAT Settings"
msgstr "请在 UAE 增值税设置中设置公司的增值税账户: \"{0}\""
@@ -38227,11 +38286,11 @@ msgstr "请在 UAE 增值税设置中设置公司的增值税账户: \"{0}\""
msgid "Please set a Company"
msgstr "请设置公司"
-#: erpnext/assets/doctype/asset/asset.py:305
+#: erpnext/assets/doctype/asset/asset.py:306
msgid "Please set a Cost Center for the Asset or set an Asset Depreciation Cost Center for the Company {}"
msgstr "请为资产设置成本中心或为公司{}设置资产折旧成本中心"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1406
+#: erpnext/selling/doctype/sales_order/sales_order.py:1422
msgid "Please set a Supplier against the Items to be considered in the Purchase Order."
msgstr "请为要创建采购订单的物料设置供应商"
@@ -38243,7 +38302,7 @@ msgstr "请为公司{0}设置默认假期列表"
msgid "Please set a default Holiday List for Employee {0} or Company {1}"
msgstr "请为员工{0}或公司{1}设置默认假期表"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1095
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1097
msgid "Please set account in Warehouse {0}"
msgstr "请在仓库{0}中设置科目"
@@ -38284,7 +38343,7 @@ msgstr "请在付款方式{}设置默认现金或银行账户"
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr "请在付款方式{}设置默认现金或银行账户"
-#: erpnext/accounts/utils.py:2314
+#: erpnext/accounts/utils.py:2318
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr "请在公司{}设置默认汇兑损益账户"
@@ -38317,7 +38376,7 @@ msgstr "请设置过滤条件"
msgid "Please set one of the following:"
msgstr "请设置以下其中一项:"
-#: erpnext/assets/doctype/asset/asset.py:506
+#: erpnext/assets/doctype/asset/asset.py:522
msgid "Please set opening number of booked depreciations"
msgstr "请设置已登记折旧的期初数量。"
@@ -38401,8 +38460,8 @@ msgid "Please specify Company"
msgstr "请选择公司"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:441
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:447
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:503
msgid "Please specify Company to proceed"
msgstr "请输入公司后继续"
@@ -38609,8 +38668,8 @@ msgstr "邮政费用"
#: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:61
#: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:66
#: erpnext/accounts/report/cheques_and_deposits_incorrectly_cleared/cheques_and_deposits_incorrectly_cleared.py:151
-#: erpnext/accounts/report/general_ledger/general_ledger.py:650
-#: erpnext/accounts/report/gross_profit/gross_profit.py:269
+#: erpnext/accounts/report/general_ledger/general_ledger.py:670
+#: erpnext/accounts/report/gross_profit/gross_profit.py:275
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:183
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:204
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:143
@@ -38642,7 +38701,7 @@ msgstr "邮政费用"
#: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:127
#: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:104
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:86
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:449
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:492
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:24
#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:112
#: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:144
@@ -38657,7 +38716,7 @@ msgstr "记账日期"
msgid "Posting Date Inheritance for Exchange Gain / Loss"
msgstr "汇兑损益记账日期"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:254
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:256
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:130
msgid "Posting Date cannot be future date"
msgstr "记账日期不能是未来的日期"
@@ -38697,7 +38756,7 @@ msgstr "记账日期时间"
#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:275
+#: erpnext/accounts/report/gross_profit/gross_profit.py:281
#: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -38996,7 +39055,7 @@ msgstr "价格表国家"
msgid "Price List Currency"
msgstr "价格表货币"
-#: erpnext/stock/get_item_details.py:1236
+#: erpnext/stock/get_item_details.py:1231
msgid "Price List Currency not selected"
msgstr "价格表货币没有选择"
@@ -39665,7 +39724,7 @@ msgstr "流程描述"
msgid "Process Loss"
msgstr "制程损耗"
-#: erpnext/manufacturing/doctype/bom/bom.py:1089
+#: erpnext/manufacturing/doctype/bom/bom.py:1126
msgid "Process Loss Percentage cannot be greater than 100"
msgstr "加工损耗百分比不能超过100"
@@ -39684,7 +39743,7 @@ msgstr "加工损耗百分比不能超过100"
msgid "Process Loss Qty"
msgstr "制程损耗数量"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:293
+#: erpnext/manufacturing/doctype/job_card/job_card.js:301
msgid "Process Loss Quantity"
msgstr "加工损耗量"
@@ -40149,15 +40208,15 @@ msgstr "进展(%)"
#: erpnext/accounts/doctype/psoa_project/psoa_project.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1052
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1061
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:109
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:74
#: erpnext/accounts/report/general_ledger/general_ledger.js:164
-#: erpnext/accounts/report/general_ledger/general_ledger.py:727
+#: erpnext/accounts/report/general_ledger/general_ledger.py:760
#: erpnext/accounts/report/gross_profit/gross_profit.js:79
-#: erpnext/accounts/report/gross_profit/gross_profit.py:357
+#: erpnext/accounts/report/gross_profit/gross_profit.py:363
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:274
#: erpnext/accounts/report/purchase_register/purchase_register.py:207
@@ -40690,7 +40749,7 @@ msgstr "采购信息"
#: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
#: erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:134
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:289
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:296
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js:30
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
@@ -40724,16 +40783,16 @@ msgstr "采购发票明细"
msgid "Purchase Invoice Trends"
msgstr "采购发票趋势"
-#: erpnext/assets/doctype/asset/asset.py:267
+#: erpnext/assets/doctype/asset/asset.py:268
msgid "Purchase Invoice cannot be made against an existing asset {0}"
msgstr "采购发票不能基于现存固定资产 {0}"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:431
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:445
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:433
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:447
msgid "Purchase Invoice {0} is already submitted"
msgstr "采购发票{0}已经提交了"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:2011
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:2013
msgid "Purchase Invoices"
msgstr "采购发票"
@@ -40810,7 +40869,7 @@ msgstr "采购主数据管理员"
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#: erpnext/stock/doctype/material_request/material_request.js:179
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:246
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:250
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -40886,11 +40945,11 @@ msgstr "未按时收货采购订单物料"
msgid "Purchase Order Pricing Rule"
msgstr "采购订单动态定价规则"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:624
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:626
msgid "Purchase Order Required"
msgstr "需要采购订单"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:619
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:621
msgid "Purchase Order Required for item {}"
msgstr "物料{}需要采购订单"
@@ -40902,19 +40961,19 @@ msgstr "物料{}需要采购订单"
msgid "Purchase Order Trends"
msgstr "采购订单趋势"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1179
+#: erpnext/selling/doctype/sales_order/sales_order.js:1182
msgid "Purchase Order already created for all Sales Order items"
msgstr "已为所有销售订单项创建采购订单"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:320
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:322
msgid "Purchase Order number required for Item {0}"
msgstr "请为物料{0}指定采购订单号"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:662
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:664
msgid "Purchase Order {0} is not submitted"
msgstr "采购订单{0}未提交"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:907
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:929
msgid "Purchase Orders"
msgstr "采购订单"
@@ -40962,9 +41021,9 @@ msgstr "采购价格表"
#. Reservation Entry'
#. Label of a Link in the Stock Workspace
#. Label of a shortcut in the Stock Workspace
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:174
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:655
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:665
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:177
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:661
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:671
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:49
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:246
@@ -41027,11 +41086,11 @@ msgstr "采购入库物料"
msgid "Purchase Receipt No"
msgstr "采购入库号码"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:645
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:647
msgid "Purchase Receipt Required"
msgstr "需要采购入库"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:640
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:642
msgid "Purchase Receipt Required for item {}"
msgstr "物料{}需要采购收货单"
@@ -41044,7 +41103,7 @@ msgstr "物料{}需要采购收货单"
msgid "Purchase Receipt Trends"
msgstr "采购入库趋势"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:384
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:391
msgid "Purchase Receipt doesn't have any Item for which Retain Sample is enabled."
msgstr "采购入库未包括启用了保留样品的物料"
@@ -41052,7 +41111,7 @@ msgstr "采购入库未包括启用了保留样品的物料"
msgid "Purchase Receipt {0} created."
msgstr "采购收货单{0}已创建"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:669
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:671
msgid "Purchase Receipt {0} is not submitted"
msgstr "采购入库{0}未提交"
@@ -41063,7 +41122,7 @@ msgstr "采购入库{0}未提交"
msgid "Purchase Register"
msgstr "采购台账"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:279
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:286
msgid "Purchase Return"
msgstr "采购退货"
@@ -41259,14 +41318,14 @@ msgstr "仓库{1}中物料{0}的上架规则已存在"
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91
-#: erpnext/accounts/report/gross_profit/gross_profit.py:314
+#: erpnext/accounts/report/gross_profit/gross_profit.py:320
#: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json
#: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240
#: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:224
#: erpnext/controllers/trends.py:242 erpnext/controllers/trends.py:254
#: erpnext/controllers/trends.py:259
#: erpnext/crm/doctype/opportunity_item/opportunity_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:964
+#: erpnext/manufacturing/doctype/bom/bom.js:999
#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
#: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
@@ -41286,8 +41345,8 @@ msgstr "仓库{1}中物料{0}的上架规则已存在"
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:367
#: erpnext/selling/doctype/sales_order/sales_order.js:471
-#: erpnext/selling/doctype/sales_order/sales_order.js:863
-#: erpnext/selling/doctype/sales_order/sales_order.js:1015
+#: erpnext/selling/doctype/sales_order/sales_order.js:866
+#: erpnext/selling/doctype/sales_order/sales_order.js:1018
#: 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_voucher/landed_cost_voucher.json
@@ -41371,7 +41430,7 @@ msgstr "每单位数量"
#. Label of the for_quantity (Float) field in DocType 'Job Card'
#. Label of the qty (Float) field in DocType 'Work Order'
-#: erpnext/manufacturing/doctype/bom/bom.js:309
+#: erpnext/manufacturing/doctype/bom/bom.js:330
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/manufacturing/report/process_loss_report/process_loss_report.py:82
@@ -41486,7 +41545,7 @@ msgstr "待出货数量"
msgid "Qty to Fetch"
msgstr "待获取数量"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:265
+#: erpnext/manufacturing/doctype/job_card/job_card.js:273
#: erpnext/manufacturing/doctype/job_card/job_card.py:765
msgid "Qty to Manufacture"
msgstr "生产数量"
@@ -41499,6 +41558,8 @@ msgstr "生产数量"
msgid "Qty to Order"
msgstr "待下单数量"
+#. Label of the finished_good_qty (Float) field in DocType 'BOM Operation'
+#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
#: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:129
msgid "Qty to Produce"
msgstr "待生产数量"
@@ -41625,7 +41686,7 @@ msgstr "质量目标"
#: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:186
+#: erpnext/manufacturing/doctype/bom/bom.js:207
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/quality_management/workspace/quality/quality.json
@@ -41700,7 +41761,7 @@ msgstr "质检模板"
msgid "Quality Inspection Template Name"
msgstr "质检模板名称"
-#: erpnext/public/js/controllers/transaction.js:359
+#: erpnext/public/js/controllers/transaction.js:360
#: erpnext/stock/doctype/stock_entry/stock_entry.js:165
msgid "Quality Inspection(s)"
msgstr "质检单"
@@ -41818,7 +41879,7 @@ msgstr "质量审核目标"
#: erpnext/buying/report/purchase_analytics/purchase_analytics.js:28
#: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:213
#: erpnext/manufacturing/doctype/blanket_order_item/blanket_order_item.json
-#: erpnext/manufacturing/doctype/bom/bom.js:396
+#: erpnext/manufacturing/doctype/bom/bom.js:417
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.js:68
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.json
@@ -41845,7 +41906,7 @@ msgstr "质量审核目标"
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py:36
#: erpnext/stock/report/delayed_item_report/delayed_item_report.py:154
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:423
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:466
#: erpnext/stock/report/stock_analytics/stock_analytics.js:27
#: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
#: erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json
@@ -41967,8 +42028,8 @@ msgid "Quantity required for Item {0} in row {1}"
msgstr "请为第{1}行的物料{0}输入需求数量"
#: erpnext/manufacturing/doctype/bom/bom.py:604
-#: erpnext/manufacturing/doctype/job_card/job_card.js:321
-#: erpnext/manufacturing/doctype/job_card/job_card.js:390
+#: erpnext/manufacturing/doctype/job_card/job_card.js:329
+#: erpnext/manufacturing/doctype/job_card/job_card.js:398
#: erpnext/manufacturing/doctype/workstation/workstation.js:303
msgid "Quantity should be greater than 0"
msgstr "量应大于0"
@@ -41997,7 +42058,7 @@ msgstr "待生产数量"
msgid "Quantity to Produce should be greater than zero."
msgstr "待生产数量应大于零"
-#: erpnext/public/js/utils/barcode_scanner.js:236
+#: erpnext/public/js/utils/barcode_scanner.js:262
msgid "Quantity to Scan"
msgstr "待扫描数量"
@@ -42128,7 +42189,7 @@ msgstr "报价/线索%"
#. Label of the prevdoc_docname (Link) field in DocType 'Sales Order Item'
#. Label of a Link in the Selling Workspace
#. Option for the 'Transaction' (Select) field in DocType 'Authorization Rule'
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:277
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:280
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:36
#: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html:20
#: erpnext/crm/doctype/contract/contract.json
@@ -42195,7 +42256,7 @@ msgstr "报价{0}已被取消"
msgid "Quotation {0} not of type {1}"
msgstr "报价{0} 不属于{1}类型"
-#: erpnext/selling/doctype/quotation/quotation.py:343
+#: erpnext/selling/doctype/quotation/quotation.py:345
#: erpnext/selling/page/sales_funnel/sales_funnel.py:57
msgid "Quotations"
msgstr "报价"
@@ -42647,8 +42708,8 @@ msgstr "原材料仓"
#. Label of the materials_section (Section Break) field in DocType 'BOM'
#. Label of the section_break_8 (Section Break) field in DocType 'Job Card'
#. Label of the mr_items (Table) field in DocType 'Production Plan'
-#: erpnext/manufacturing/doctype/bom/bom.js:349
-#: erpnext/manufacturing/doctype/bom/bom.js:938
+#: erpnext/manufacturing/doctype/bom/bom.js:370
+#: erpnext/manufacturing/doctype/bom/bom.js:972
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
@@ -42811,7 +42872,7 @@ msgid "Reason"
msgstr "原因"
#. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:276
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:282
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
msgid "Reason For Putting On Hold"
msgstr "临时冻结原因"
@@ -42822,7 +42883,7 @@ msgid "Reason for Failure"
msgstr "失败原因"
#: erpnext/buying/doctype/purchase_order/purchase_order.js:748
-#: erpnext/selling/doctype/sales_order/sales_order.js:1338
+#: erpnext/selling/doctype/sales_order/sales_order.js:1341
msgid "Reason for Hold"
msgstr "临时冻结原因"
@@ -42831,7 +42892,7 @@ msgstr "临时冻结原因"
msgid "Reason for Leaving"
msgstr "离职原因"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1353
+#: erpnext/selling/doctype/sales_order/sales_order.js:1356
msgid "Reason for hold:"
msgstr "临时冻结原因:"
@@ -43201,7 +43262,7 @@ msgstr "录制网址"
msgid "Records"
msgstr "记录"
-#: erpnext/regional/united_arab_emirates/utils.py:171
+#: erpnext/regional/united_arab_emirates/utils.py:193
msgid "Recoverable Standard Rated expenses should not be set when Reverse Charge Applicable is Y"
msgstr "当适用反向征税为'是'时,不可设置可回收标准税率费用"
@@ -43643,11 +43704,11 @@ msgstr "参考:{0},物料代号:{1}和客户:{2}"
msgid "References"
msgstr "参考"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:383
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:385
msgid "References to Sales Invoices are Incomplete"
msgstr "销售发票参考不完整"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:378
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:380
msgid "References to Sales Orders are Incomplete"
msgstr "销售订单参考不完整"
@@ -43792,14 +43853,14 @@ msgstr "关系"
#. Label of the release_date (Date) field in DocType 'Purchase Invoice'
#. Label of the release_date (Date) field in DocType 'Supplier'
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:268
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:312
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:274
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:318
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/buying/doctype/supplier/supplier.json
msgid "Release Date"
msgstr "解除冻结日期"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:315
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:317
msgid "Release date must be in the future"
msgstr "解除冻结日期必须晚于今天"
@@ -43874,7 +43935,7 @@ msgstr "备注"
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1254
#: erpnext/accounts/report/general_ledger/general_ledger.html:84
#: erpnext/accounts/report/general_ledger/general_ledger.html:110
-#: erpnext/accounts/report/general_ledger/general_ledger.py:752
+#: erpnext/accounts/report/general_ledger/general_ledger.py:785
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112
#: erpnext/accounts/report/purchase_register/purchase_register.py:296
#: erpnext/accounts/report/sales_register/sales_register.py:335
@@ -43971,8 +44032,8 @@ msgstr "租"
#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:58
#: erpnext/crm/doctype/opportunity/opportunity.js:130
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:354
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:305
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:360
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:312
#: erpnext/support/doctype/issue/issue.js:39
msgid "Reopen"
msgstr "重新打开"
@@ -44605,7 +44666,7 @@ msgstr "委外预留数量"
msgid "Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items."
msgstr "委外预留数量:为委外订单预留的原材料数量"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:606
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:608
msgid "Reserved Qty should be greater than Delivered Qty."
msgstr "预留数量须大于出库数量"
@@ -44906,7 +44967,7 @@ msgstr "结果标题字段"
msgid "Resume"
msgstr "恢复"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:200
+#: erpnext/manufacturing/doctype/job_card/job_card.js:208
msgid "Resume Job"
msgstr "恢复作业"
@@ -44936,7 +44997,7 @@ msgstr "保留样品"
msgid "Retained Earnings"
msgstr "留存收益"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:295
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:302
msgid "Retention Stock Entry"
msgstr "留存样品物料移动"
@@ -45030,13 +45091,13 @@ msgstr "原材料退回"
msgid "Return Issued"
msgstr "被退货"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:355
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:362
msgid "Return Qty"
msgstr "退货数量"
#. Label of the return_qty_from_rejected_warehouse (Check) field in DocType
#. 'Purchase Receipt Item'
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:331
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:338
#: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
msgid "Return Qty from Rejected Warehouse"
msgstr "拒收仓退货数量"
@@ -45502,12 +45563,12 @@ msgstr "第{0}行:退回物料{1}在{2} {3}中不存在"
msgid "Row #1: Sequence ID must be 1 for Operation {0}."
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:517
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:518
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1919
msgid "Row #{0} (Payment Table): Amount must be negative"
msgstr "行#{0}(付款表):金额必须为负数"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:515
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:516
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1914
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr "行#{0}(付款表):金额必须为正值"
@@ -45566,7 +45627,7 @@ msgstr "第{0}行:资产{1}已售出。"
msgid "Row #{0}: BOM is not specified for subcontracting item {0}"
msgstr "行号#{0}:外协物料{0}未指定物料清单(BOM)"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:405
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:407
msgid "Row #{0}: Batch No {1} is already selected."
msgstr "第 {0} 行:批号 {1} 已被选择"
@@ -45602,7 +45663,7 @@ msgstr "第{0}行:开票金额超过物料{1}金额时不可设置费率。"
msgid "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}"
msgstr "第 {0} 行:对生产任务单 {3} 发物料 {2} 不可超过需求量 {1}"
-#: erpnext/selling/doctype/product_bundle/product_bundle.py:86
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:87
msgid "Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save"
msgstr "行号#{0}:子项不能为产品套装,请移除物料{1}后保存"
@@ -45642,7 +45703,7 @@ msgstr "行号#{0}:日期与其他行重叠"
msgid "Row #{0}: Default BOM not found for FG Item {1}"
msgstr "行号#{0}:产成品{1}未找到默认物料清单(BOM)"
-#: erpnext/assets/doctype/asset/asset.py:533
+#: erpnext/assets/doctype/asset/asset.py:549
msgid "Row #{0}: Depreciation Start Date is required"
msgstr "行号#{0}:必须填写折旧起始日期"
@@ -45694,7 +45755,7 @@ msgstr "行号#{0}:起始日期不能早于截止日期"
msgid "Row #{0}: From Time and To Time fields are required"
msgstr "第{0}行:必须填写起止时间。"
-#: erpnext/public/js/utils/barcode_scanner.js:394
+#: erpnext/public/js/utils/barcode_scanner.js:428
msgid "Row #{0}: Item added"
msgstr "行#{0}:已添加"
@@ -45702,7 +45763,7 @@ msgstr "行#{0}:已添加"
msgid "Row #{0}: Item {1} does not exist"
msgstr "行号#{0}:物料{1}不存在"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1547
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1549
msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
msgstr "第 {0} 行:物料 {1} 已拣货,请从拣货单创建库存预留单"
@@ -45726,11 +45787,11 @@ msgstr "行号#{0}:物料{1}非库存物料"
msgid "Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher"
msgstr "行#{0}:日记账凭证{1}没有科目{2}或已被另一凭证核销"
-#: erpnext/assets/doctype/asset/asset.py:527
+#: erpnext/assets/doctype/asset/asset.py:543
msgid "Row #{0}: Next Depreciation Date cannot be before Available-for-use Date"
msgstr "第{0}行:下次折旧日期不得早于启用日期。"
-#: erpnext/assets/doctype/asset/asset.py:522
+#: erpnext/assets/doctype/asset/asset.py:538
msgid "Row #{0}: Next Depreciation Date cannot be before Purchase Date"
msgstr "第{0}行:下次折旧日期不得早于采购日期。"
@@ -45738,11 +45799,11 @@ msgstr "第{0}行:下次折旧日期不得早于采购日期。"
msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
msgstr "行#{0}:因采购订单已经存在不能再更改供应商"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1630
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1632
msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
msgstr "第 {0} 行:物料 {2} 可预留库存数量仅有 {1}"
-#: erpnext/assets/doctype/asset/asset.py:499
+#: erpnext/assets/doctype/asset/asset.py:515
msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}"
msgstr "第{0}行:期初累计折旧不得超过{1}。"
@@ -45750,15 +45811,15 @@ msgstr "第{0}行:期初累计折旧不得超过{1}。"
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 "第{0}行生产工单{3}成品数量{2}工序{1}未完成。请在生产任务单{4}上更新工序状态。"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1009
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1010
msgid "Row #{0}: Please select Item Code in Assembly Items"
msgstr "装配件明细第 {0} 行,请输入物料号(请先点获取待生产成品物料按钮)"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1012
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1013
msgid "Row #{0}: Please select the BOM No in Assembly Items"
msgstr "行号#{0}:请在组装物料中选择物料清单编号"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1006
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1007
msgid "Row #{0}: Please select the Sub Assembly Warehouse"
msgstr "行号#{0}:请选择子装配仓库"
@@ -45770,7 +45831,7 @@ msgstr "行#{0}:请设置重订货点数量"
msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master"
msgstr "行号#{0}:请更新物料行的递延收入/费用科目或公司主数据的默认科目"
-#: erpnext/public/js/utils/barcode_scanner.js:392
+#: erpnext/public/js/utils/barcode_scanner.js:426
msgid "Row #{0}: Qty increased by {1}"
msgstr "行号#{0}:数量增加了{1}"
@@ -45779,7 +45840,7 @@ msgstr "行号#{0}:数量增加了{1}"
msgid "Row #{0}: Qty must be a positive number"
msgstr "行号#{0}:数量必须为正数"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:393
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:395
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 "第 {0} 行:物料 {2} 批号 {3} 在仓库 {4} 中预留数量须 <= 可预留数量(实际数量 - 已预留数量) {1}"
@@ -45795,12 +45856,16 @@ msgstr "行号#{0}:物料{2}的质量检验{1}未提交"
msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
msgstr "行号#{0}:物料{2}的质量检验{1}被拒收"
+#: erpnext/selling/doctype/product_bundle/product_bundle.py:96
+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:1375
#: erpnext/controllers/accounts_controller.py:3663
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr "行号#{0}:物料{1}数量不能为零"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1617
msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
msgstr "第 {0} 行:物料 {1} 预留数量须大于 0"
@@ -45853,11 +45918,11 @@ msgstr ""
msgid "Row #{0}: Serial No {1} does not belong to Batch {2}"
msgstr "第{0}行: 序列号 {1} 不属于批号 {2}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:342
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:344
msgid "Row #{0}: Serial No {1} for Item {2} is not available in {3} {4} or might be reserved in another {5}."
msgstr "第 {0} 行:在 {3} {4} 无可预留的物料{2} 序列号 {1} 或者已被其它 {5} 预留占用了"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:358
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:360
msgid "Row #{0}: Serial No {1} is already selected."
msgstr "第 {0} 行:序列号 {1} 已被选择"
@@ -45877,6 +45942,10 @@ msgstr "第{0}行:递延会计处理,服务开始与结束日必填"
msgid "Row #{0}: Set Supplier for item {1}"
msgstr "行#{0}:请为物料{1}分派供应商"
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1017
+msgid "Row #{0}: Since 'Track Semi Finished Goods' is enabled, the BOM {1} cannot be used for Sub Assembly Items"
+msgstr ""
+
#: erpnext/manufacturing/doctype/workstation/workstation.py:92
msgid "Row #{0}: Start Time and End Time are required"
msgstr "行号#{0}:需填写开始时间和结束时间"
@@ -45893,32 +45962,32 @@ msgstr "行号#{0}:状态为必填项"
msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}"
msgstr "行#{0}:发票贴现的状态必须为{1} {2}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:367
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:369
msgid "Row #{0}: Stock cannot be reserved for Item {1} against a disabled Batch {2}."
msgstr "第 {0} 行: 物料 {1} 预留数量不可使用无效批号 {2}"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1560
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1562
msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
msgstr "不允许为未勾选允许库存的物料创建库存预留"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1573
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1575
msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
msgstr "行号#{0}:不可在组仓库{1}预留库存"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1589
msgid "Row #{0}: Stock is already reserved for the Item {1}."
msgstr "行号#{0}:物料{1}已预留库存"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:537
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:539
msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
msgstr "行号#{0}:仓库{2}中物料{1}的库存已预留"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:377
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:379
msgid "Row #{0}: Stock not available to reserve for Item {1} against Batch {2} in Warehouse {3}."
msgstr "第 {0} 行:物料 {1} 批号 {2} 在仓库 {3} 中无可预留数量"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1222
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1224
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1603
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr "第 {0} 行:仓库 {2} 中物料 {1}无可预留库存"
@@ -45934,7 +46003,7 @@ msgstr "行号#{0}:仓库{1}不是组仓库{2}的子仓库"
msgid "Row #{0}: Timings conflicts with row {1}"
msgstr "行#{0}:与排时序冲突{1}"
-#: erpnext/assets/doctype/asset/asset.py:512
+#: erpnext/assets/doctype/asset/asset.py:528
msgid "Row #{0}: Total Number of Depreciations cannot be less than or equal to Opening Number of Booked Depreciations"
msgstr "行号#{0}:总折旧次数不可小于等于已记账折旧的期初次数"
@@ -46006,11 +46075,11 @@ msgstr "行号#{idx}:{schedule_date}不能早于{transaction_date}"
msgid "Row #{}: Currency of {} - {} doesn't matches company currency."
msgstr "第{0}行: 货币 {} 与公司本币不匹配"
-#: erpnext/assets/doctype/asset/asset.py:349
+#: erpnext/assets/doctype/asset/asset.py:350
msgid "Row #{}: Finance Book should not be empty since you're using multiple."
msgstr "行号#{}:使用多财务账簿时不可为空"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:406
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:407
msgid "Row #{}: Item Code: {} is not available under warehouse {}."
msgstr "行号#{}:仓库{}中无物料编码{}"
@@ -46030,23 +46099,23 @@ msgstr "行号#{}:POS发票{}尚未提交"
msgid "Row #{}: Please assign task to a member."
msgstr "行号#{}:请将任务分配给成员"
-#: erpnext/assets/doctype/asset/asset.py:341
+#: erpnext/assets/doctype/asset/asset.py:342
msgid "Row #{}: Please use a different Finance Book."
msgstr "行号#{}:请使用其他财务账簿"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:477
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:478
msgid "Row #{}: Serial No {} cannot be returned since it was not transacted in original invoice {}"
msgstr "行号#{}:原始发票{}未交易序列号{},不可退回"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:413
-msgid "Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}. Available quantity {}."
-msgstr "行号#{}:仓库{}中物料编码{}库存不足,可用数量{}"
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:414
+msgid "Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}."
+msgstr ""
#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:104
msgid "Row #{}: The original Invoice {} of return invoice {} is not consolidated."
msgstr "行号#{}:退货发票{}的原始发票{}未合并"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:450
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:451
msgid "Row #{}: You cannot add positive quantities in a return invoice. Please remove item {} to complete the return."
msgstr "行号#{}:退货发票中不可添加正数数量,请移除物料{}以完成退货"
@@ -46067,7 +46136,7 @@ msgstr "行号#{}:{} {}不存在"
msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}."
msgstr "行号#{}:{} {}不属于公司{},请选择有效的{}"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:434
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:436
msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}"
msgstr "行号{0}:必须指定仓库,请为物料{1}和公司{2}设置默认仓库"
@@ -46176,19 +46245,19 @@ msgstr "行号{0}:必须关联交货单物料或包装物料"
msgid "Row {0}: Exchange Rate is mandatory"
msgstr "请为第{0}行输入汇率"
-#: erpnext/assets/doctype/asset/asset.py:474
+#: erpnext/assets/doctype/asset/asset.py:490
msgid "Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount"
msgstr "行{0}:资产使用年限结束后残值必须小于总采购额"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:525
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:527
msgid "Row {0}: Expense Head changed to {1} as no Purchase Receipt is created against Item {2}."
msgstr "第{0}行:因物料 {2} 未关联采购入库单,费用科目变更为了 {1}"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:482
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:484
msgid "Row {0}: Expense Head changed to {1} because account {2} is not linked to warehouse {3} or it is not the default inventory account"
msgstr "系统提示:因勾选了更新库存,系统自动将物料明细第 {0} 行的费用科目 {2} 修改为库存科目 {1}"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:507
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:509
msgid "Row {0}: Expense Head changed to {1} because expense is booked against this account in Purchase Receipt {2}"
msgstr "系统提示:系统自动将物料明细第 {0} 行的费用科目修改为采购入库 {2} 会计凭证中的费用科目 {1}"
@@ -46241,7 +46310,7 @@ msgstr "行号{0}:物料{1}必须为外协物料"
msgid "Row {0}: Item {1}'s quantity cannot be higher than the available quantity."
msgstr "行号{0}:物料{1}数量不可超过可用数量"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:594
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:596
msgid "Row {0}: Packed Qty must be equal to {1} Qty."
msgstr "第 {0} 行:装箱数量必须与 {1} 数量相等"
@@ -46357,7 +46426,7 @@ msgstr "行号{0}:设置{1}周期时,起止日期差值必须大于等于{2}
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr "行{0}:单位转换系数是必需的"
-#: erpnext/manufacturing/doctype/bom/bom.py:1072
+#: erpnext/manufacturing/doctype/bom/bom.py:1109
#: erpnext/manufacturing/doctype/work_order/work_order.py:277
msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
msgstr "行号{0}:工序{1}必须指定工作站或工作站类型"
@@ -46584,6 +46653,8 @@ msgstr "工资发放方式"
#: erpnext/accounts/doctype/shipping_rule/shipping_rule_dashboard.py:10
#: erpnext/accounts/doctype/tax_category/tax_category_dashboard.py:9
#: erpnext/accounts/doctype/tax_rule/tax_rule.json
+#: erpnext/crm/doctype/opportunity/opportunity.js:288
+#: erpnext/crm/doctype/opportunity/opportunity.py:158
#: erpnext/projects/doctype/project/project_dashboard.py:15
#: erpnext/regional/report/vat_audit_report/vat_audit_report.py:185
#: erpnext/selling/doctype/quotation/quotation.json
@@ -46676,8 +46747,8 @@ msgstr "销售收入率"
#: erpnext/accounts/doctype/sales_invoice_reference/sales_invoice_reference.json
#: erpnext/accounts/print_format/sales_auditing_voucher/sales_auditing_voucher.html:5
#: erpnext/accounts/report/gross_profit/gross_profit.js:30
-#: erpnext/accounts/report/gross_profit/gross_profit.py:256
-#: erpnext/accounts/report/gross_profit/gross_profit.py:263
+#: erpnext/accounts/report/gross_profit/gross_profit.py:262
+#: erpnext/accounts/report/gross_profit/gross_profit.py:269
#: erpnext/accounts/workspace/accounting/accounting.json
#: erpnext/accounts/workspace/receivables/receivables.json
#: erpnext/crm/doctype/contract/contract.json
@@ -46689,7 +46760,7 @@ msgstr "销售收入率"
#: erpnext/selling/workspace/selling/selling.json
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/setup/workspace/home/home.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:343
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:349
#: erpnext/stock/doctype/delivery_note/delivery_note_list.js:65
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
msgid "Sales Invoice"
@@ -46767,11 +46838,11 @@ msgstr "销售发票未提交"
msgid "Sales Invoice isn't created by user {}"
msgstr "销售发票非由用户{}创建"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:422
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:423
msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
msgstr "POS中已启用销售发票模式,请直接创建销售发票。"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:616
msgid "Sales Invoice {0} has already been submitted"
msgstr "销售发票{0}已提交过"
@@ -46915,7 +46986,7 @@ msgstr "按来源划分的销售机会"
#: erpnext/selling/workspace/selling/selling.json
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/delivery_note/delivery_note.js:160
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:223
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:226
#: erpnext/stock/doctype/material_request/material_request.js:219
#: erpnext/stock/doctype/material_request_item/material_request_item.json
#: erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -46967,7 +47038,7 @@ msgstr "销售订单日期"
#: erpnext/manufacturing/doctype/production_plan_item_reference/production_plan_item_reference.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/selling/doctype/sales_order/sales_order.js:313
-#: erpnext/selling/doctype/sales_order/sales_order.js:870
+#: erpnext/selling/doctype/sales_order/sales_order.js:873
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/stock/doctype/material_request_item/material_request_item.json
#: erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -47000,7 +47071,7 @@ msgstr "销售订单状态"
msgid "Sales Order Trends"
msgstr "销售订单趋势"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:266
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:268
msgid "Sales Order required for Item {0}"
msgstr "销售订单为物料{0}的必须项"
@@ -47170,7 +47241,7 @@ msgstr "销售收款汇总"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:191
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:80
#: erpnext/accounts/report/gross_profit/gross_profit.js:50
-#: erpnext/accounts/report/gross_profit/gross_profit.py:371
+#: erpnext/accounts/report/gross_profit/gross_profit.py:377
#: erpnext/crm/workspace/crm/crm.json
#: erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
#: erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
@@ -47251,8 +47322,8 @@ msgstr "销售台账"
msgid "Sales Representative"
msgstr "销售代表"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:857
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:267
+#: erpnext/accounts/report/gross_profit/gross_profit.py:874
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:273
msgid "Sales Return"
msgstr "销售退货"
@@ -47510,8 +47581,8 @@ msgstr "星期六"
#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js:119
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:628
#: erpnext/accounts/doctype/ledger_merge/ledger_merge.js:75
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:286
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:322
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:292
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:328
#: erpnext/public/js/call_popup/call_popup.js:169
#: erpnext/selling/page/point_of_sale/pos_payment.js:62
msgid "Save"
@@ -47549,7 +47620,7 @@ msgstr "Sazhen"
#: 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/public/js/utils/barcode_scanner.js:215
+#: erpnext/public/js/utils/barcode_scanner.js:241
#: erpnext/selling/doctype/quotation/quotation.json
#: erpnext/selling/doctype/sales_order/sales_order.json
#: erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -47581,7 +47652,7 @@ msgstr "扫码模式"
msgid "Scan Serial No"
msgstr "扫序列号"
-#: erpnext/public/js/utils/barcode_scanner.js:179
+#: erpnext/public/js/utils/barcode_scanner.js:205
msgid "Scan barcode for item {0}"
msgstr "扫描条形码用于项目 {0}"
@@ -47595,7 +47666,7 @@ msgstr "已启用扫码模式,不再自动获取现有库存数量"
msgid "Scanned Cheque"
msgstr "支票扫描"
-#: erpnext/public/js/utils/barcode_scanner.js:247
+#: erpnext/public/js/utils/barcode_scanner.js:273
msgid "Scanned Quantity"
msgstr "已扫描数量"
@@ -47889,7 +47960,7 @@ msgid "Segregate Serial / Batch Bundle"
msgstr "显示序列号与批号明细"
#: erpnext/buying/doctype/purchase_order/purchase_order.js:250
-#: erpnext/selling/doctype/sales_order/sales_order.js:1107
+#: erpnext/selling/doctype/sales_order/sales_order.js:1110
#: erpnext/selling/doctype/sales_order/sales_order_list.js:96
#: erpnext/selling/report/sales_analytics/sales_analytics.js:93
msgid "Select"
@@ -47911,15 +47982,15 @@ msgstr "选择供销售订单使用的替代项目"
msgid "Select Attribute Values"
msgstr "选择属性值"
-#: erpnext/selling/doctype/sales_order/sales_order.js:853
+#: erpnext/selling/doctype/sales_order/sales_order.js:856
msgid "Select BOM"
msgstr "选择物料清单"
-#: erpnext/selling/doctype/sales_order/sales_order.js:834
+#: erpnext/selling/doctype/sales_order/sales_order.js:837
msgid "Select BOM and Qty for Production"
msgstr "选择物料清单和生产数量"
-#: erpnext/selling/doctype/sales_order/sales_order.js:985
+#: erpnext/selling/doctype/sales_order/sales_order.js:988
msgid "Select BOM, Qty and For Warehouse"
msgstr "选择物料清单,数量以及仓库"
@@ -47949,7 +48020,7 @@ msgstr "选择列与筛选条件"
msgid "Select Company"
msgstr "选择公司"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:468
+#: erpnext/manufacturing/doctype/job_card/job_card.js:476
msgid "Select Corrective Operation"
msgstr "选择纠正性工序"
@@ -47990,7 +48061,7 @@ msgstr "选择发货地址"
msgid "Select DocType"
msgstr "选择单据类型"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:186
+#: erpnext/manufacturing/doctype/job_card/job_card.js:194
msgid "Select Employees"
msgstr "选择员工"
@@ -47998,12 +48069,12 @@ msgstr "选择员工"
msgid "Select Finished Good"
msgstr "选择产成品"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1186
-#: erpnext/selling/doctype/sales_order/sales_order.js:1198
+#: erpnext/selling/doctype/sales_order/sales_order.js:1189
+#: erpnext/selling/doctype/sales_order/sales_order.js:1201
msgid "Select Items"
msgstr "选择物料"
-#: erpnext/selling/doctype/sales_order/sales_order.js:1072
+#: erpnext/selling/doctype/sales_order/sales_order.js:1075
msgid "Select Items based on Delivery Date"
msgstr "根据出货日期选择物料"
@@ -48014,7 +48085,7 @@ msgstr "选择待检验物料"
#. Label of the select_items_to_manufacture_section (Section Break) field in
#. DocType 'Production Plan'
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:881
+#: erpnext/selling/doctype/sales_order/sales_order.js:884
msgid "Select Items to Manufacture"
msgstr "选择待生产成品"
@@ -48028,7 +48099,7 @@ msgstr "筛选截至交货日期的物料"
msgid "Select Job Worker Address"
msgstr "选择委外地址"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1118
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1127
#: erpnext/selling/page/point_of_sale/pos_item_cart.js:955
msgid "Select Loyalty Program"
msgstr "选择积分方案"
@@ -48162,7 +48233,7 @@ msgstr "请为第{1}行的物料{0}选择账簿"
msgid "Select item group"
msgstr "选择物料组"
-#: erpnext/manufacturing/doctype/bom/bom.js:376
+#: erpnext/manufacturing/doctype/bom/bom.js:397
msgid "Select template item"
msgstr "选择模板物料"
@@ -48179,7 +48250,7 @@ msgstr "选择执行工序的默认工作站。此信息将用于物料清单和
msgid "Select the Item to be manufactured."
msgstr "选择待生产的物料。"
-#: erpnext/manufacturing/doctype/bom/bom.js:858
+#: erpnext/manufacturing/doctype/bom/bom.js:879
msgid "Select the Item to be manufactured. The Item name, UoM, Company, and Currency will be fetched automatically."
msgstr "选择待生产的物料。物料名称、计量单位、公司和币种将自动获取。"
@@ -48200,11 +48271,11 @@ msgstr "选择日期"
msgid "Select the date and your timezone"
msgstr "选择日期和时区"
-#: erpnext/manufacturing/doctype/bom/bom.js:877
+#: erpnext/manufacturing/doctype/bom/bom.js:898
msgid "Select the raw materials (Items) required to manufacture the Item"
msgstr "选择生产该物料所需的原材料"
-#: erpnext/manufacturing/doctype/bom/bom.js:431
+#: erpnext/manufacturing/doctype/bom/bom.js:452
msgid "Select variant item code for the template item {0}"
msgstr "为模板物料{0}选择变体物料编码"
@@ -48289,7 +48360,7 @@ msgstr "出售资产"
msgid "Selling"
msgstr "销售"
-#: erpnext/accounts/report/gross_profit/gross_profit.py:330
+#: erpnext/accounts/report/gross_profit/gross_profit.py:336
msgid "Selling Amount"
msgstr "销售金额"
@@ -48461,7 +48532,7 @@ msgstr "序列号与批号设置"
msgid "Serial / Batch Bundle"
msgstr "序列号/批号"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:441
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:442
msgid "Serial / Batch Bundle Missing"
msgstr "缺少序列号/批次组合"
@@ -48538,7 +48609,7 @@ msgstr "序列号/批号"
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:65
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:149
#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:37
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:409
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:436
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:38
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:60
#: erpnext/stock/report/stock_ledger/stock_ledger.py:336
@@ -48638,7 +48709,7 @@ msgstr "序列号是物料{0}的必须项"
msgid "Serial No {0} already exists"
msgstr "序列号{0}已存在"
-#: erpnext/public/js/utils/barcode_scanner.js:321
+#: erpnext/public/js/utils/barcode_scanner.js:347
msgid "Serial No {0} already scanned"
msgstr "序列号{0}已扫描"
@@ -48659,7 +48730,7 @@ msgstr "序列号{0}不存在"
msgid "Serial No {0} does not exists"
msgstr "序列号{0}不存在"
-#: erpnext/public/js/utils/barcode_scanner.js:402
+#: erpnext/public/js/utils/barcode_scanner.js:436
msgid "Serial No {0} is already added"
msgstr "序列号{0}已添加"
@@ -48687,7 +48758,7 @@ msgstr "序列号{0}未找到"
msgid "Serial No: {0} has already been transacted into another POS Invoice."
msgstr "序列号:{0}已存在于其他POS发票中。"
-#: erpnext/public/js/utils/barcode_scanner.js:271
+#: erpnext/public/js/utils/barcode_scanner.js:297
#: erpnext/public/js/utils/serial_no_batch_selector.js:16
#: erpnext/public/js/utils/serial_no_batch_selector.js:190
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:50
@@ -49184,8 +49255,8 @@ msgstr "手动设置成本"
msgid "Set Default Supplier"
msgstr "设置默认供应商"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:339
-#: erpnext/manufacturing/doctype/job_card/job_card.js:408
+#: erpnext/manufacturing/doctype/job_card/job_card.js:347
+#: erpnext/manufacturing/doctype/job_card/job_card.js:416
msgid "Set Finished Good Quantity"
msgstr "设置产成品数量"
@@ -49216,11 +49287,11 @@ msgstr "为此区域设置物料组层级的预算。还可以设置“每月分
msgid "Set Landed Cost Based on Purchase Invoice Rate"
msgstr "到岸成本(采购入库)以采购发票价为准"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1130
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1139
msgid "Set Loyalty Program"
msgstr "设置忠诚度计划"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:306
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:312
msgid "Set New Release Date"
msgstr "设置解除冻结日期"
@@ -49249,7 +49320,7 @@ msgstr "设置密码"
msgid "Set Posting Date"
msgstr "设置过账日期"
-#: erpnext/manufacturing/doctype/bom/bom.js:904
+#: erpnext/manufacturing/doctype/bom/bom.js:925
msgid "Set Process Loss Item Quantity"
msgstr "设置加工损耗物料数量"
@@ -49263,7 +49334,7 @@ msgstr "设置项目状态"
msgid "Set Project and all Tasks to status {0}?"
msgstr "将项目和所有任务设置为状态{0}?"
-#: erpnext/manufacturing/doctype/bom/bom.js:905
+#: erpnext/manufacturing/doctype/bom/bom.js:926
msgid "Set Quantity"
msgstr "设置数量"
@@ -49370,7 +49441,7 @@ msgstr "设置非库存物料的默认{0}科目"
msgid "Set fieldname from which you want to fetch the data from the parent form."
msgstr "选择从主单据带出的关联字段"
-#: erpnext/manufacturing/doctype/bom/bom.js:894
+#: erpnext/manufacturing/doctype/bom/bom.js:915
msgid "Set quantity of process loss item:"
msgstr "设置加工损耗物料数量:"
@@ -49400,15 +49471,15 @@ msgstr "手工设置状态"
msgid "Set this if the customer is a Public Administration company."
msgstr "如果客户是公共管理公司,请设置此项。"
-#: erpnext/assets/doctype/asset/asset.py:750
+#: erpnext/assets/doctype/asset/asset.py:766
msgid "Set {0} in asset category {1} for company {2}"
msgstr "为{2}公司设置资产类别{1}的{0}"
-#: erpnext/assets/doctype/asset/asset.py:1083
+#: erpnext/assets/doctype/asset/asset.py:1099
msgid "Set {0} in asset category {1} or company {2}"
msgstr "在资产类别{1}或公司{2}中设置{0}"
-#: erpnext/assets/doctype/asset/asset.py:1080
+#: erpnext/assets/doctype/asset/asset.py:1096
msgid "Set {0} in company {1}"
msgstr "在{1}公司设置{0}"
@@ -49475,7 +49546,7 @@ msgstr "银行对账功能仅限本公司银行户头"
msgid "Setting up company"
msgstr "创建公司"
-#: erpnext/manufacturing/doctype/bom/bom.py:1051
+#: erpnext/manufacturing/doctype/bom/bom.py:1088
#: erpnext/manufacturing/doctype/work_order/work_order.py:1197
msgid "Setting {0} is required"
msgstr ""
@@ -49608,7 +49679,7 @@ msgid "Shift Name"
msgstr "班次名称"
#. Name of a DocType
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:243
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:249
#: erpnext/stock/doctype/shipment/shipment.json
msgid "Shipment"
msgstr "运单"
@@ -49659,7 +49730,7 @@ msgstr "运输类型"
msgid "Shipment details"
msgstr "运输详情"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:785
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:787
msgid "Shipments"
msgstr "发货"
@@ -50345,7 +50416,7 @@ msgstr ""
msgid "Source Document Name"
msgstr "源单据编号"
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:435
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:478
msgid "Source Document No"
msgstr ""
@@ -50395,7 +50466,7 @@ msgstr "来源类型"
#. Label of the s_warehouse (Link) field in DocType 'Stock Entry Detail'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/manufacturing/doctype/bom/bom.js:403
+#: erpnext/manufacturing/doctype/bom/bom.js:424
#: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
#: erpnext/manufacturing/doctype/bom_item/bom_item.json
#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
@@ -50423,7 +50494,7 @@ msgstr "发料仓地址"
msgid "Source Warehouse Address Link"
msgstr "发料仓地址(链接)"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1152
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1154
msgid "Source Warehouse is mandatory for the Item {0}."
msgstr "物料{0}必须指定来源仓库。"
@@ -50519,7 +50590,7 @@ msgstr "拆分问题"
msgid "Split Qty"
msgstr "分割数量"
-#: erpnext/assets/doctype/asset/asset.py:1222
+#: erpnext/assets/doctype/asset/asset.py:1238
msgid "Split Quantity must be less than Asset Quantity"
msgstr "拆分数量必须小于资产数量。"
@@ -50712,7 +50783,7 @@ msgstr "开始删除"
msgid "Start Import"
msgstr "开始导入"
-#: erpnext/manufacturing/doctype/job_card/job_card.js:180
+#: erpnext/manufacturing/doctype/job_card/job_card.js:188
#: erpnext/manufacturing/doctype/workstation/workstation.js:124
msgid "Start Job"
msgstr "开始计时"
@@ -51021,14 +51092,14 @@ msgstr "省/市/自治州"
#: erpnext/setup/doctype/driver/driver.json
#: erpnext/setup/doctype/employee/employee.json
#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:323
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:358
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:329
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:364
#: erpnext/stock/doctype/delivery_note/delivery_note.json
#: erpnext/stock/doctype/delivery_trip/delivery_trip.json
#: erpnext/stock/doctype/material_request/material_request.json
#: erpnext/stock/doctype/pick_list/pick_list.json
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:276
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:305
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:283
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:312
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
#: erpnext/stock/doctype/quality_inspection/quality_inspection.json
#: erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
@@ -51107,8 +51178,8 @@ msgstr "库存"
#: erpnext/accounts/doctype/account/account.json
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:50
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:73
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1337
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1363
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1339
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1365
#: erpnext/accounts/report/account_balance/account_balance.js:58
msgid "Stock Adjustment"
msgstr "库存调整"
@@ -51265,7 +51336,7 @@ msgstr ""
msgid "Stock Entry Type"
msgstr "移动类型"
-#: erpnext/stock/doctype/pick_list/pick_list.py:1384
+#: erpnext/stock/doctype/pick_list/pick_list.py:1396
msgid "Stock Entry has been already created against this Pick List"
msgstr "该拣货单的物料移动单已生成"
@@ -51499,14 +51570,14 @@ msgstr "物料成本价追溯调整设置"
#: erpnext/stock/doctype/pick_list/pick_list.js:166
#: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12
#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:714
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:666
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1225
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1563
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1576
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1590
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1604
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1618
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1635
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:668
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1227
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1565
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1578
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1592
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1606
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1620
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1637
#: erpnext/stock/doctype/stock_settings/stock_settings.json
#: erpnext/stock/doctype/stock_settings/stock_settings.py:176
#: erpnext/stock/doctype/stock_settings/stock_settings.py:188
@@ -51515,13 +51586,13 @@ msgstr "物料成本价追溯调整设置"
msgid "Stock Reservation"
msgstr "库存预留"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1744
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1746
msgid "Stock Reservation Entries Cancelled"
msgstr "库存预留单已取消"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2156
#: erpnext/manufacturing/doctype/work_order/work_order.py:1738
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1696
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1698
msgid "Stock Reservation Entries Created"
msgstr "库存预留单已创建"
@@ -51529,25 +51600,25 @@ msgstr "库存预留单已创建"
#: erpnext/public/js/stock_reservation.js:308
#: erpnext/selling/doctype/sales_order/sales_order.js:444
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:352
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:354
#: erpnext/stock/report/reserved_stock/reserved_stock.js:53
#: erpnext/stock/report/reserved_stock/reserved_stock.py:171
msgid "Stock Reservation Entry"
msgstr "库存预留单"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:528
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:530
msgid "Stock Reservation Entry cannot be updated as it has been delivered."
msgstr "出库后库存预留单不可修改"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:522
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:524
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:547
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:549
msgid "Stock Reservation Warehouse Mismatch"
msgstr "库存预留仓库不匹配"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:675
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:677
msgid "Stock Reservation can only be created against {0}."
msgstr "仅可基于 {0} 创建库存预留单"
@@ -51582,7 +51653,7 @@ msgstr "预留库存(库存单位)"
#. Label of a Link in the Stock Workspace
#: erpnext/setup/doctype/company/company.json
#: erpnext/setup/workspace/settings/settings.json
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:667
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:669
#: erpnext/stock/doctype/stock_settings/stock_settings.json
#: erpnext/stock/workspace/stock/stock.json
msgid "Stock Settings"
@@ -51788,11 +51859,11 @@ msgstr "库存与生产"
msgid "Stock cannot be reserved in group warehouse {0}."
msgstr "不允许为勾选是组的仓库 {0} 创建库存预留单"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1508
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1510
msgid "Stock cannot be reserved in the group warehouse {0}."
msgstr "不允许为勾选是组的仓库 {0} 创建库存预留单"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:727
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:729
msgid "Stock cannot be updated against Purchase Receipt {0}"
msgstr "库存不能对采购入库进行更新{0}"
@@ -51804,11 +51875,11 @@ msgstr "无法针对以下交货单更新库存:{0}"
msgid "Stock cannot be updated because the invoice contains a drop shipping item. Please disable 'Update Stock' or remove the drop shipping item."
msgstr "因发票包含直运物料,无法更新库存。请禁用'更新库存'或移除直运物料"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1119
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1121
msgid "Stock has been unreserved for work order {0}."
msgstr "已取消工单{0}的库存预留"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:323
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:325
msgid "Stock not available for Item {0} in Warehouse {1}."
msgstr "物料 {0} 在仓库 {2} 中无可预留数量"
@@ -52120,7 +52191,7 @@ msgstr "委外订单加工费明细"
msgid "Subcontracting Order Supplied Item"
msgstr "委外订单原材料明细"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:943
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:965
msgid "Subcontracting Order {0} created."
msgstr "外协订单{0}已创建"
@@ -52210,7 +52281,7 @@ msgstr "主题"
msgid "Submit"
msgstr "提交"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:939
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:961
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:910
msgid "Submit Action Failed"
msgstr "提交操作失败"
@@ -52661,7 +52732,7 @@ msgstr "已发料数量"
#: erpnext/selling/doctype/customer/customer.js:230
#: erpnext/selling/doctype/party_specific_item/party_specific_item.json
#: erpnext/selling/doctype/sales_order/sales_order.js:160
-#: erpnext/selling/doctype/sales_order/sales_order.js:1231
+#: erpnext/selling/doctype/sales_order/sales_order.js:1235
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/doctype/sms_center/sms_center.json
#: erpnext/setup/workspace/home/home.json
@@ -52672,7 +52743,7 @@ msgstr "已发料数量"
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
#: erpnext/stock/doctype/shipment/shipment.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:462
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:505
#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8
msgid "Supplier"
msgstr "供应商"
@@ -52797,7 +52868,7 @@ msgstr "供应商发票"
msgid "Supplier Invoice Date"
msgstr "供应商发票日期"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1730
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1732
msgid "Supplier Invoice Date cannot be greater than Posting Date"
msgstr "供应商发票日期不能晚于过账日期"
@@ -52807,12 +52878,12 @@ msgstr "供应商发票日期不能晚于过账日期"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:59
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/report/general_ledger/general_ledger.html:104
-#: erpnext/accounts/report/general_ledger/general_ledger.py:747
+#: erpnext/accounts/report/general_ledger/general_ledger.py:780
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218
msgid "Supplier Invoice No"
msgstr "供应商发票号"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1757
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1759
msgid "Supplier Invoice No exists in Purchase Invoice {0}"
msgstr "供应商发票号已被采购发票{0}引用"
@@ -53040,7 +53111,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:62
+#: erpnext/manufacturing/doctype/job_card/job_card.js:70
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
msgid "Supplier Warehouse"
msgstr "委外仓"
@@ -53373,7 +53444,7 @@ msgstr "TDS金额"
msgid "TDS Computation Summary"
msgstr "代扣所得税摘要"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1514
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1516
msgid "TDS Deducted"
msgstr "已扣除TDS"
@@ -54228,7 +54299,7 @@ msgstr "电视"
msgid "Template"
msgstr "模板"
-#: erpnext/manufacturing/doctype/bom/bom.js:355
+#: erpnext/manufacturing/doctype/bom/bom.js:376
msgid "Template Item"
msgstr "模板物料"
@@ -54464,7 +54535,7 @@ msgstr "条款和条件模板"
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:182
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:68
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:221
-#: erpnext/accounts/report/gross_profit/gross_profit.py:399
+#: erpnext/accounts/report/gross_profit/gross_profit.py:411
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js:8
#: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:21
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:263
@@ -54563,7 +54634,7 @@ msgstr "门户询价申请功能已禁用。如需启用,请在门户设置中
msgid "The BOM which will be replaced"
msgstr "此物料清单将被替换"
-#: erpnext/stock/serial_batch_bundle.py:1378
+#: erpnext/stock/serial_batch_bundle.py:1394
msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity."
msgstr "批次{0}在仓库{2}中存在负数量{1}。请更正数量"
@@ -54678,7 +54749,7 @@ msgstr "转出股东的字段不能为空"
msgid "The field To Shareholder cannot be blank"
msgstr "“转入股东”字段不能为空"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:397
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:399
msgid "The field {0} in row {1} is not set"
msgstr "第{1}行的字段{0}未设置"
@@ -54747,6 +54818,10 @@ msgstr "工序卡{0}处于{1}状态,无法完成"
msgid "The job card {0} is in {1} state and you cannot start it again."
msgstr "工序卡{0}处于{1}状态,无法重新启动"
+#: erpnext/public/js/utils/barcode_scanner.js:533
+msgid "The last scanned warehouse has been cleared and won't be set in the subsequently scanned items"
+msgstr ""
+
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.py:46
msgid "The lowest tier must have a minimum spent amount of 0. Customers need to be part of a tier as soon as they are enrolled in the program."
msgstr "最低层级必须设置0消费金额。客户加入计划后即属于某个层级"
@@ -54825,7 +54900,7 @@ msgstr "根级科目{0}必须是组类型"
msgid "The selected BOMs are not for the same item"
msgstr "所选物料清单不能用于同一个物料"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:493
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:494
msgid "The selected change account {} doesn't belongs to Company {}."
msgstr "所选找零账户{}不属于公司{}"
@@ -54959,7 +55034,7 @@ msgstr "{0} {1} 用于计算入库成品成本"
msgid "Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc."
msgstr ""
-#: erpnext/assets/doctype/asset/asset.py:579
+#: erpnext/assets/doctype/asset/asset.py:595
msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
msgstr "资产存在有效维护或维修记录。取消前需完成所有相关操作"
@@ -55062,7 +55137,7 @@ msgstr "此物料是基于模板物料{0}的多规格物料。"
msgid "This Month's Summary"
msgstr "本月摘要"
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:952
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:974
msgid "This PO has been fully subcontracted."
msgstr "该采购订单已全部委外"
@@ -55086,7 +55161,7 @@ msgstr "此操作将停止未来的结算。您确定要取消此订阅吗?"
msgid "This action will unlink this account from any external service integrating ERPNext with your bank accounts. It cannot be undone. Are you certain ?"
msgstr "此操作将取消此账户与将ERPNext与您的银行账户集成的任何外部服务的链接。它无法撤销。你确定吗 ?"
-#: erpnext/assets/doctype/asset/asset.py:359
+#: erpnext/assets/doctype/asset/asset.py:360
msgid "This asset category is marked as non-depreciable. Please disable depreciation calculation or choose a different category."
msgstr "本资产类别标记为不可折旧。请停用折旧计算或选择其他类别。"
@@ -55098,7 +55173,7 @@ msgstr "包含已设置的所有评分卡"
msgid "This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?"
msgstr "物料{4}{0} 超出订单允许量 {1}。你在对同一个{2}做另一个{3}?"
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:483
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:489
msgid "This field is used to set the 'Customer'."
msgstr "用于设置'客户'"
@@ -55108,11 +55183,11 @@ msgstr "用于设置'客户'"
msgid "This filter will be applied to Journal Entry."
msgstr "过滤条件仅限日记账凭证"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:812
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:813
msgid "This invoice has already been paid."
msgstr ""
-#: erpnext/manufacturing/doctype/bom/bom.js:219
+#: erpnext/manufacturing/doctype/bom/bom.js:240
msgid "This is a Template BOM and will be used to make the work order for {0} of the item {1}"
msgstr "本模板物料清单将用于为模板物料 {1} 的多规格物料生成生产工单"
@@ -55185,7 +55260,7 @@ msgstr "基于该业务员经手交易量,详情请参阅表单下方日志记
msgid "This is considered dangerous from accounting point of view."
msgstr "从会计角度看此操作存在风险"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:531
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:533
msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice"
msgstr "这样做是为了处理在采购发票后创建采购入库的情况"
@@ -55201,7 +55276,7 @@ msgstr "适用于用于生产成品的原材料。若物料是BOM中的附加服
msgid "This item filter has already been applied for the {0}"
msgstr "该物料筛选器已应用于{0}"
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:496
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:502
msgid "This option can be checked to edit the 'Posting Date' and 'Posting Time' fields."
msgstr "勾选此选项可编辑'过账日期'和'过账时间'字段"
@@ -55237,7 +55312,7 @@ msgstr "因经由销售发票 {1} 退回,已创建固定资产{0} 折旧计划
msgid "This schedule was created when Asset {0} was scrapped."
msgstr "针对固定资产 {0} 报废的折旧计划已创建"
-#: erpnext/assets/doctype/asset/asset.py:1356
+#: erpnext/assets/doctype/asset/asset.py:1372
msgid "This schedule was created when Asset {0} was {1} into new Asset {2}."
msgstr "本计划因资产{0}{1}至新资产{2}时创建。"
@@ -55259,7 +55334,7 @@ msgstr "因按班次分派{1},固定资产{0}折旧计划已更新"
msgid "This section allows the user to set the Body and Closing text of the Dunning Letter for the Dunning Type based on language, which can be used in Print."
msgstr "可设置催款函正文和结尾文本(按语言),用于打印"
-#: erpnext/stock/doctype/delivery_note/delivery_note.js:489
+#: erpnext/stock/doctype/delivery_note/delivery_note.js:495
msgid "This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc."
msgstr "用于设置'物料'、'数量'、'基本汇率'等详细信息"
@@ -55459,7 +55534,7 @@ msgstr "计时器超出了指定的小时数"
#. Name of a DocType
#. Label of a Link in the Projects Workspace
#. Label of a shortcut in the Projects Workspace
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1014
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1023
#: erpnext/projects/doctype/timesheet/timesheet.json
#: erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py:26
#: erpnext/projects/report/timesheet_billing_summary/timesheet_billing_summary.py:59
@@ -55574,7 +55649,7 @@ msgstr "标题"
#. Label of the to_uom (Link) field in DocType 'UOM Conversion Factor'
#. Label of the to (Data) field in DocType 'Call Log'
#: erpnext/accounts/doctype/payment_request/payment_request.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1046
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1055
#: erpnext/setup/doctype/uom_conversion_factor/uom_conversion_factor.json
#: erpnext/telephony/doctype/call_log/call_log.json
#: erpnext/templates/pages/projects.html:68
@@ -55945,7 +56020,7 @@ msgstr "收料仓"
msgid "To Warehouse (Optional)"
msgstr "收料仓(可选)"
-#: erpnext/manufacturing/doctype/bom/bom.js:872
+#: erpnext/manufacturing/doctype/bom/bom.js:893
msgid "To add Operations tick the 'With Operations' checkbox."
msgstr "要添加操作,请勾选“包含操作”复选框。"
@@ -56020,11 +56095,11 @@ msgstr "要否决此问题,请在公司{1}中启用“ {0}”"
msgid "To still proceed with editing this Attribute Value, enable {0} in Item Variant Settings."
msgstr "如需修改属性值,请在库存模块的“物料多规格设置”中勾选 允许重命名属性值。"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:621
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:623
msgid "To submit the invoice without purchase order please set {0} as {1} in {2}"
msgstr "若要提交没有采购订单的发票,请在 {2}中将 {0} 设置为 {1}"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:642
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:644
msgid "To submit the invoice without purchase receipt please set {0} as {1} in {2}"
msgstr "若要提交没有购买收据的发票,请在 {2}中将 {0} 设置为 {1}"
@@ -56034,7 +56109,7 @@ msgid "To use a different finance book, please uncheck 'Include Default FB Asset
msgstr "要使用不同的财务账簿,请取消选中“包括默认 FB 资产”"
#: erpnext/accounts/report/financial_statements.py:603
-#: erpnext/accounts/report/general_ledger/general_ledger.py:304
+#: erpnext/accounts/report/general_ledger/general_ledger.py:310
#: erpnext/accounts/report/trial_balance/trial_balance.py:292
msgid "To use a different finance book, please uncheck 'Include Default FB Entries'"
msgstr "要使用不同的财务账簿,请取消选中“包括默认 FB 条目”"
@@ -56128,7 +56203,7 @@ msgstr "拖拉"
#: erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py:229
#: erpnext/accounts/report/financial_statements.py:699
#: erpnext/accounts/report/general_ledger/general_ledger.html:132
-#: erpnext/accounts/report/general_ledger/general_ledger.py:378
+#: erpnext/accounts/report/general_ledger/general_ledger.py:398
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:699
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:93
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:98
@@ -56937,7 +57012,7 @@ msgstr "总贡献百分比应等于100"
msgid "Total hours: {0}"
msgstr "总时间:{0}"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:523
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:524
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:536
msgid "Total payments amount can't be greater than {}"
msgstr "付款总额不可超过{}"
@@ -57597,7 +57672,7 @@ msgstr "阿联酋增值税设置"
#: erpnext/quality_management/doctype/quality_review_objective/quality_review_objective.json
#: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
#: erpnext/selling/doctype/quotation_item/quotation_item.json
-#: erpnext/selling/doctype/sales_order/sales_order.js:1225
+#: erpnext/selling/doctype/sales_order/sales_order.js:1228
#: erpnext/selling/doctype/sales_order_item/sales_order_item.json
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:43
#: erpnext/selling/report/sales_analytics/sales_analytics.py:138
@@ -57671,7 +57746,7 @@ msgstr "单位换算信息"
msgid "UOM Conversion Factor"
msgstr "单位换算系数"
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1387
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1404
msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}"
msgstr "物料{2}的计量单位换算系数({0}→{1})未找到"
@@ -58055,11 +58130,11 @@ msgstr "即将到来的日历事件"
#: erpnext/accounts/doctype/account/account.js:204
#: erpnext/accounts/doctype/cost_center/cost_center.js:107
-#: erpnext/manufacturing/doctype/job_card/job_card.js:338
-#: erpnext/manufacturing/doctype/job_card/job_card.js:407
+#: erpnext/manufacturing/doctype/job_card/job_card.js:346
+#: erpnext/manufacturing/doctype/job_card/job_card.js:415
#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:500
#: erpnext/public/js/utils.js:608 erpnext/public/js/utils.js:912
-#: erpnext/public/js/utils/barcode_scanner.js:183
+#: erpnext/public/js/utils/barcode_scanner.js:209
#: erpnext/public/js/utils/serial_no_batch_selector.js:17
#: erpnext/public/js/utils/serial_no_batch_selector.js:191
#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js:179
@@ -58160,7 +58235,7 @@ msgstr "在项目中更新物料消耗成本"
#. Option for the 'Update Type' (Select) field in DocType 'BOM Update Log'
#. Label of the update_cost_section (Section Break) field in DocType 'BOM
#. Update Tool'
-#: erpnext/manufacturing/doctype/bom/bom.js:135
+#: erpnext/manufacturing/doctype/bom/bom.js:156
#: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.json
#: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json
msgid "Update Cost"
@@ -58254,7 +58329,7 @@ msgstr "项目统计数据更新频率"
msgid "Update latest price in all BOMs"
msgstr "更新所有BOM的最新价格"
-#: erpnext/assets/doctype/asset/asset.py:401
+#: erpnext/assets/doctype/asset/asset.py:402
msgid "Update stock must be enabled for the purchase invoice {0}"
msgstr "采购发票{0}必须启用库存更新"
@@ -58270,7 +58345,7 @@ msgstr "更新线索与商机中收到新沟通的修改时间戳"
msgid "Update timestamp on new communication"
msgstr "新沟通时更新时间戳"
-#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:534
+#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:539
msgid "Updated successfully"
msgstr "更新成功"
@@ -58378,7 +58453,7 @@ msgstr "按物料进行成本追溯调整"
#. Label of the use_multi_level_bom (Check) field in DocType 'Work Order'
#. Label of the use_multi_level_bom (Check) field in DocType 'Stock Entry'
-#: erpnext/manufacturing/doctype/bom/bom.js:337
+#: erpnext/manufacturing/doctype/bom/bom.js:358
#: erpnext/manufacturing/doctype/work_order/work_order.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Use Multi-Level BOM"
@@ -58708,7 +58783,7 @@ msgstr "请为累积类型维护生效和失效日期"
msgid "Valid till Date cannot be before Transaction Date"
msgstr "有效期至不可早于交易日期"
-#: erpnext/selling/doctype/quotation/quotation.py:154
+#: erpnext/selling/doctype/quotation/quotation.py:156
msgid "Valid till date cannot be before transaction date"
msgstr "失效日期不得早于交易日"
@@ -58770,7 +58845,7 @@ msgstr "有效期与可用性"
msgid "Validity in Days"
msgstr "有效天数"
-#: erpnext/selling/doctype/quotation/quotation.py:361
+#: erpnext/selling/doctype/quotation/quotation.py:363
msgid "Validity period of this quotation has ended."
msgstr "此报价的有效期已经结束。"
@@ -58819,7 +58894,7 @@ msgstr "成本价计算方法"
#. Label of the valuation_rate (Currency) field in DocType 'Stock
#. Reconciliation Item'
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
-#: erpnext/accounts/report/gross_profit/gross_profit.py:323
+#: erpnext/accounts/report/gross_profit/gross_profit.py:329
#: erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
#: erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json
#: erpnext/manufacturing/doctype/bom/bom.json
@@ -59048,7 +59123,7 @@ msgstr "变体属性错误"
msgid "Variant Attributes"
msgstr "规格属性"
-#: erpnext/manufacturing/doctype/bom/bom.js:176
+#: erpnext/manufacturing/doctype/bom/bom.js:197
msgid "Variant BOM"
msgstr "变体BOM"
@@ -59070,8 +59145,8 @@ msgstr "多规格物料清单报表"
msgid "Variant Field"
msgstr "多规格物料字段"
-#: erpnext/manufacturing/doctype/bom/bom.js:291
-#: erpnext/manufacturing/doctype/bom/bom.js:370
+#: erpnext/manufacturing/doctype/bom/bom.js:312
+#: erpnext/manufacturing/doctype/bom/bom.js:391
msgid "Variant Item"
msgstr "变体物料"
@@ -59205,7 +59280,7 @@ msgstr "视频设置"
#: erpnext/accounts/doctype/cost_center/cost_center_tree.js:56
#: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js:205
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:76
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:673
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:679
#: erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:14
#: erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:24
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:167
@@ -59229,8 +59304,8 @@ msgstr "视频设置"
#: erpnext/stock/doctype/item/item.js:142
#: erpnext/stock/doctype/item/item.js:150
#: erpnext/stock/doctype/item/item.js:158
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:228
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:239
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:232
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:243
#: erpnext/stock/doctype/stock_entry/stock_entry.js:297
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:46
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:62
@@ -59258,7 +59333,7 @@ msgstr "查看会计总账"
msgid "View Leads"
msgstr "查看(销售)线索"
-#: erpnext/accounts/doctype/account/account_tree.js:275
+#: erpnext/accounts/doctype/account/account_tree.js:270
#: erpnext/stock/doctype/batch/batch.js:18
msgid "View Ledger"
msgstr "查看总账"
@@ -59396,7 +59471,7 @@ msgstr "凭证号"
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:209
#: erpnext/accounts/report/general_ledger/general_ledger.js:49
-#: erpnext/accounts/report/general_ledger/general_ledger.py:715
+#: erpnext/accounts/report/general_ledger/general_ledger.py:735
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js:41
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:33
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:65
@@ -59435,7 +59510,7 @@ msgstr "单据数量"
#. Label of the voucher_subtype (Small Text) field in DocType 'GL Entry'
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:709
+#: erpnext/accounts/report/general_ledger/general_ledger.py:729
msgid "Voucher Subtype"
msgstr "源凭证业务类型"
@@ -59467,7 +59542,7 @@ msgstr "源凭证业务类型"
#: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1184
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:200
-#: erpnext/accounts/report/general_ledger/general_ledger.py:707
+#: erpnext/accounts/report/general_ledger/general_ledger.py:727
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:165
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
@@ -59488,7 +59563,7 @@ msgstr "源凭证业务类型"
#: erpnext/stock/report/reserved_stock/reserved_stock.py:145
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:40
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:107
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:429
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:472
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:27
#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:114
#: erpnext/stock/report/stock_ledger/stock_ledger.py:320
@@ -59622,7 +59697,7 @@ msgstr "主动上门"
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/gross_profit/gross_profit.js:56
-#: erpnext/accounts/report/gross_profit/gross_profit.py:308
+#: erpnext/accounts/report/gross_profit/gross_profit.py:314
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:41
#: erpnext/accounts/report/purchase_register/purchase_register.js:52
#: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py:28
@@ -59672,7 +59747,7 @@ msgstr "主动上门"
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
#: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:350
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:352
#: erpnext/stock/doctype/warehouse/warehouse.json
#: erpnext/stock/page/stock_balance/stock_balance.js:11
#: erpnext/stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:25
@@ -59698,7 +59773,7 @@ msgstr "主动上门"
#: erpnext/stock/report/reserved_stock/reserved_stock.py:96
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:34
#: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:138
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:442
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:485
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:21
#: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:47
#: erpnext/stock/report/stock_ageing/stock_ageing.js:30
@@ -59820,7 +59895,7 @@ msgid "Warehouse not found against the account {0}"
msgstr "账户{0}未关联仓库"
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1160
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:424
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:426
msgid "Warehouse required for stock Item {0}"
msgstr "物料{0}需要指定仓库"
@@ -60009,6 +60084,10 @@ msgstr "年度维保合同状态"
msgid "Warranty Claim"
msgstr "保修申请"
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:525
+msgid "Warranty Expiry (Serial)"
+msgstr ""
+
#. Label of the warranty_expiry_date (Date) field in DocType 'Serial No'
#. Label of the warranty_expiry_date (Date) field in DocType 'Warranty Claim'
#: erpnext/stock/doctype/serial_no/serial_no.json
@@ -60432,7 +60511,7 @@ msgstr "车间仓"
#. Entry'
#. Option for the 'From Voucher Type' (Select) field in DocType 'Stock
#. Reservation Entry'
-#: erpnext/manufacturing/doctype/bom/bom.js:167
+#: erpnext/manufacturing/doctype/bom/bom.js:188
#: erpnext/manufacturing/doctype/bom/bom.json
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/manufacturing/doctype/work_order/work_order.json
@@ -60454,7 +60533,7 @@ msgstr "车间仓"
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/stock_entry/stock_entry.json
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:455
+#: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:498
#: erpnext/templates/pages/material_request_info.html:45
msgid "Work Order"
msgstr "生产工单"
@@ -60518,7 +60597,7 @@ msgstr "不能为模板物料创建新生产工单"
msgid "Work Order has been {0}"
msgstr "生产工单已{0}"
-#: erpnext/selling/doctype/sales_order/sales_order.js:823
+#: erpnext/selling/doctype/sales_order/sales_order.js:826
msgid "Work Order not created"
msgstr "生产工单未创建"
@@ -60531,7 +60610,7 @@ msgstr "工单 {0}: Job Card not found 未找到针对工序 {1} 的生产任务
msgid "Work Orders"
msgstr "工单"
-#: erpnext/selling/doctype/sales_order/sales_order.js:908
+#: erpnext/selling/doctype/sales_order/sales_order.js:911
msgid "Work Orders Created: {0}"
msgstr "已创建生产工单:{0}"
@@ -60971,7 +61050,7 @@ msgid "You can only have Plans with the same billing cycle in a Subscription"
msgstr "您只能在订阅中拥有相同结算周期的计划"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:412
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:876
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:885
msgid "You can only redeem max {0} points in this order."
msgstr "您只能按此顺序兑换最多{0}个积分。"
@@ -60999,7 +61078,7 @@ msgstr "无法处理序列号{0},因其已在序列和批次凭证{1}中使用
msgid "You can't redeem Loyalty Points having more value than the Total Amount."
msgstr "不可兑换价值超过总金额的忠诚度积分。"
-#: erpnext/manufacturing/doctype/bom/bom.js:653
+#: erpnext/manufacturing/doctype/bom/bom.js:674
msgid "You cannot change the rate if BOM is mentioned against any Item."
msgstr "有物料清单的物料价格不可手工设置"
@@ -61099,7 +61178,7 @@ msgstr "暂无数据 {0}"
msgid "You must select a customer before adding an item."
msgstr "添加物料前需先选择客户"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:267
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:268
msgid "You need to cancel POS Closing Entry {} to be able to cancel this document."
msgstr "需先取消POS结算单{}才能取消此单据"
@@ -61196,7 +61275,7 @@ msgstr "作为描述"
msgid "as Title"
msgstr "作为标题"
-#: erpnext/manufacturing/doctype/bom/bom.js:896
+#: erpnext/manufacturing/doctype/bom/bom.js:917
msgid "as a percentage of finished item quantity"
msgstr "按完工数量百分比"
@@ -61216,7 +61295,7 @@ msgstr "由{}"
msgid "cannot be greater than 100"
msgstr "不能大于100"
-#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:331
+#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:333
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1046
msgid "dated {0}"
msgstr "日期为{0}"
@@ -61589,7 +61668,7 @@ msgstr ""
msgid "{0} account is not of type {1}"
msgstr "{0}科目类型不是{1}"
-#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:496
+#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:498
msgid "{0} account not found while submitting purchase receipt"
msgstr "提交采购收据时未找到{0}科目"
@@ -61613,7 +61692,7 @@ msgstr "{0}不允许销售订单{1}"
msgid "{0} already has a Parent Procedure {1}."
msgstr "{0}已有父程序{1}。"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:542
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:544
msgid "{0} and {1}"
msgstr "{0}和{1}"
@@ -61784,6 +61863,10 @@ msgstr ""
msgid "{0} is required"
msgstr "{0}是必填项"
+#: erpnext/assets/doctype/asset/asset.py:431
+msgid "{0} is still in Draft. Please submit it before saving the Asset."
+msgstr ""
+
#: erpnext/manufacturing/doctype/work_order/work_order.js:454
msgid "{0} items in progress"
msgstr "{0}物料生产中"
@@ -61869,6 +61952,10 @@ msgstr "新建了{0}个多规格物料。"
msgid "{0} will be given as discount."
msgstr "{0}将作为折扣发放"
+#: erpnext/public/js/utils/barcode_scanner.js:523
+msgid "{0} will be set as the {1} in subsequently scanned items"
+msgstr ""
+
#: erpnext/manufacturing/doctype/job_card/job_card.py:883
msgid "{0} {1}"
msgstr "{0}{1}"
@@ -61881,7 +61968,7 @@ msgstr "手动{0}{1}"
msgid "{0} {1} Partially Reconciled"
msgstr "{0}{1}部分对账"
-#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:516
+#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:518
msgid "{0} {1} cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
msgstr "{0} {1} 不允许被修改,建议取消当前单据再创建新单据"
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 732084192a1..7115d309ffc 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -1421,11 +1421,11 @@ def add_additional_cost(stock_entry, work_order):
as_dict=1,
)
- expecnse_account = (
+ expense_account = (
company_account.default_operating_cost_account or company_account.default_expense_account
)
- add_non_stock_items_cost(stock_entry, work_order, expecnse_account)
- add_operations_cost(stock_entry, work_order, expecnse_account)
+ add_non_stock_items_cost(stock_entry, work_order, expense_account)
+ add_operations_cost(stock_entry, work_order, expense_account)
def add_non_stock_items_cost(stock_entry, work_order, expense_account):
@@ -1460,21 +1460,74 @@ def add_non_stock_items_cost(stock_entry, work_order, expense_account):
)
+def add_operating_cost_component_wise(
+ stock_entry, work_order=None, operating_cost_per_unit=None, op_expense_account=None
+):
+ if not work_order:
+ return False
+
+ cost_added = False
+ for row in work_order.operations:
+ workstation_cost = frappe.get_all(
+ "Workstation Cost",
+ fields=["operating_component", "operating_cost"],
+ filters={
+ "parent": row.workstation,
+ "parenttype": "Workstation",
+ },
+ )
+
+ for wc in workstation_cost:
+ expense_account = get_component_account(wc.operating_component) or op_expense_account
+ actual_cp_operating_cost = flt(
+ flt(wc.operating_cost) * flt(flt(row.actual_operation_time) / 60.0),
+ row.precision("actual_operating_cost"),
+ )
+
+ per_unit_cost = flt(actual_cp_operating_cost) / flt(row.completed_qty)
+
+ if per_unit_cost and expense_account:
+ stock_entry.append(
+ "additional_costs",
+ {
+ "expense_account": expense_account,
+ "description": _("{0} Operating Cost for operation {1}").format(
+ wc.operating_component, row.operation
+ ),
+ "amount": per_unit_cost * flt(stock_entry.fg_completed_qty),
+ },
+ )
+
+ cost_added = True
+
+ return cost_added
+
+
+@frappe.request_cache
+def get_component_account(parent):
+ return frappe.db.get_value("Workstation Operating Component Account", parent, "expense_account")
+
+
def add_operations_cost(stock_entry, work_order=None, expense_account=None):
from erpnext.stock.doctype.stock_entry.stock_entry import get_operating_cost_per_unit
operating_cost_per_unit = get_operating_cost_per_unit(work_order, stock_entry.bom_no)
if operating_cost_per_unit:
- stock_entry.append(
- "additional_costs",
- {
- "expense_account": expense_account,
- "description": _("Operating Cost as per Work Order / BOM"),
- "amount": operating_cost_per_unit * flt(stock_entry.fg_completed_qty),
- },
+ cost_added = add_operating_cost_component_wise(
+ stock_entry, work_order, operating_cost_per_unit, expense_account
)
+ if not cost_added:
+ stock_entry.append(
+ "additional_costs",
+ {
+ "expense_account": expense_account,
+ "description": _("Operating Cost as per Work Order / BOM"),
+ "amount": operating_cost_per_unit * flt(stock_entry.fg_completed_qty),
+ },
+ )
+
if work_order and work_order.additional_operating_cost and work_order.qty:
additional_operating_cost_per_unit = flt(work_order.additional_operating_cost) / flt(work_order.qty)
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.js b/erpnext/manufacturing/doctype/job_card/job_card.js
index 21fec7c8afb..6469fada2ba 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.js
+++ b/erpnext/manufacturing/doctype/job_card/job_card.js
@@ -31,6 +31,16 @@ frappe.ui.form.on("Job Card", {
};
});
+ frm.set_query("operation", "time_logs", () => {
+ let operations = (frm.doc.sub_operations || []).map((d) => d.sub_operation);
+ return {
+ filters: {
+ name: ["in", operations],
+ },
+ };
+ });
+
+ frm.events.set_company_filters(frm, "target_warehouse");
frm.events.set_company_filters(frm, "source_warehouse");
frm.events.set_company_filters(frm, "wip_warehouse");
frm.set_query("source_warehouse", "items", () => {
@@ -184,7 +194,12 @@ frappe.ui.form.on("Job Card", {
!frm.doc.finished_good ||
!has_items?.length)
) {
- if (!frm.doc.time_logs?.length) {
+ let last_row = {};
+ if (frm.doc.sub_operations?.length && frm.doc.time_logs?.length) {
+ last_row = get_last_row(frm.doc.time_logs);
+ }
+
+ if (!frm.doc.time_logs?.length || (frm.doc.sub_operations?.length && last_row?.to_time)) {
frm.add_custom_button(__("Start Job"), () => {
let from_time = frappe.datetime.now_datetime();
if ((frm.doc.employee && !frm.doc.employee.length) || !frm.doc.employee) {
@@ -313,7 +328,12 @@ frappe.ui.form.on("Job Card", {
];
let last_completed_row = get_last_completed_row(frm.doc.time_logs);
- if (!last_completed_row || !last_completed_row.to_time) {
+ let last_row = {};
+ if (frm.doc.sub_operations?.length && frm.doc.time_logs?.length) {
+ last_row = get_last_row(frm.doc.time_logs);
+ }
+
+ if (!last_completed_row || !last_completed_row.to_time || !last_row.to_time) {
fields.push({
fieldtype: "Datetime",
label: __("End Time"),
@@ -758,3 +778,7 @@ function get_last_completed_row(time_logs) {
return last_completed_row;
}
}
+
+function get_last_row(time_logs) {
+ return time_logs[time_logs.length - 1] || {};
+}
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py
index 868e09f3a06..a20c2e12043 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.py
+++ b/erpnext/manufacturing/doctype/job_card/job_card.py
@@ -157,6 +157,9 @@ class JobCard(Document):
self.validate_sequence_id()
self.set_sub_operations()
self.update_sub_operation_status()
+ if self.sub_operations:
+ self.set_total_completed_qty_from_sub_operations()
+
self.validate_work_order()
def on_update(self):
@@ -280,8 +283,13 @@ class JobCard(Document):
}
)
+ def set_total_completed_qty_from_sub_operations(self):
+ sub_op_total_qty = []
for row in self.sub_operations:
- self.total_completed_qty += row.completed_qty
+ sub_op_total_qty.append(flt(row.completed_qty))
+
+ if sub_op_total_qty:
+ self.total_completed_qty = min(sub_op_total_qty)
def get_overlap_for(self, args, open_job_cards=None):
time_logs = []
@@ -613,7 +621,7 @@ class JobCard(Document):
self.save()
def update_sub_operation_status(self):
- if not (self.sub_operations and self.time_logs):
+ if not self.sub_operations:
return
operation_wise_completed_time = {}
diff --git a/erpnext/manufacturing/doctype/job_card_operation/job_card_operation.json b/erpnext/manufacturing/doctype/job_card_operation/job_card_operation.json
index 8b3e90872de..a2df1425989 100644
--- a/erpnext/manufacturing/doctype/job_card_operation/job_card_operation.json
+++ b/erpnext/manufacturing/doctype/job_card_operation/job_card_operation.json
@@ -6,9 +6,9 @@
"engine": "InnoDB",
"field_order": [
"sub_operation",
+ "completed_qty",
"completed_time",
- "status",
- "completed_qty"
+ "status"
],
"fields": [
{
@@ -39,6 +39,7 @@
{
"fieldname": "completed_qty",
"fieldtype": "Float",
+ "in_list_view": 1,
"label": "Completed Qty",
"read_only": 1
}
@@ -46,15 +47,16 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2024-03-27 13:09:57.090298",
+ "modified": "2025-08-20 21:44:43.941434",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Job Card Operation",
"owner": "Administrator",
"permissions": [],
"quick_entry": 1,
+ "row_format": "Dynamic",
"sort_field": "creation",
"sort_order": "DESC",
"states": [],
"track_changes": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json b/erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json
index d524b2996d2..32c544e037c 100644
--- a/erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json
+++ b/erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json
@@ -16,6 +16,7 @@
"fields": [
{
"allow_on_submit": 1,
+ "columns": 3,
"fieldname": "from_time",
"fieldtype": "Datetime",
"in_list_view": 1,
@@ -58,17 +59,17 @@
{
"fieldname": "operation",
"fieldtype": "Link",
- "label": "Operation",
+ "in_list_view": 1,
+ "label": "Sub Operation",
"no_copy": 1,
- "options": "Operation",
- "read_only": 1
+ "options": "Operation"
}
],
"grid_page_length": 50,
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2025-08-04 15:47:11.748937",
+ "modified": "2025-08-20 21:49:59.084876",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Job Card Time Log",
diff --git a/erpnext/manufacturing/doctype/workstation/test_workstation.py b/erpnext/manufacturing/doctype/workstation/test_workstation.py
index 51c31f029b3..6a407c22b8c 100644
--- a/erpnext/manufacturing/doctype/workstation/test_workstation.py
+++ b/erpnext/manufacturing/doctype/workstation/test_workstation.py
@@ -1,6 +1,7 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and Contributors
# See license.txt
import frappe
+from frappe import _
from frappe.tests import IntegrationTestCase
from erpnext.manufacturing.doctype.operation.test_operation import make_operation
@@ -75,14 +76,22 @@ class TestWorkstation(IntegrationTestCase):
bom_doc = setup_bom(item_code="_Testing Item", routing=routing_doc.name, currency="INR")
w1 = frappe.get_doc("Workstation", "_Test Workstation A")
# resets values
- w1.hour_rate_rent = 300
- w1.hour_rate_labour = 0
+ for row in w1.workstation_costs:
+ if row.operating_component == _("Rent"):
+ row.operating_cost = 300
+ break
+
w1.save()
bom_doc.update_cost()
bom_doc.reload()
self.assertEqual(w1.hour_rate, 300)
self.assertEqual(bom_doc.operations[0].hour_rate, 300)
- w1.hour_rate_rent = 250
+
+ for row in w1.workstation_costs:
+ if row.operating_component == _("Rent"):
+ row.operating_cost = 250
+ break
+
w1.save()
# updating after setting new rates in workstations
bom_doc.update_cost()
@@ -102,8 +111,24 @@ def make_workstation(*args, **kwargs):
workstation_name = args.workstation_name or args.workstation
if not frappe.db.exists("Workstation", workstation_name):
doc = frappe.get_doc({"doctype": "Workstation", "workstation_name": workstation_name})
- doc.hour_rate_rent = args.get("hour_rate_rent")
- doc.hour_rate_labour = args.get("hour_rate_labour")
+ if args.get("hour_rate_rent"):
+ doc.append(
+ "workstation_costs",
+ {
+ "operating_component": _("Rent"),
+ "operating_cost": args.get("hour_rate_rent"),
+ },
+ )
+
+ if args.get("hour_rate_labour"):
+ doc.append(
+ "workstation_costs",
+ {
+ "operating_component": _("Wages"),
+ "operating_cost": args.get("hour_rate_labour"),
+ },
+ )
+
doc.workstation_type = args.get("workstation_type")
doc.insert()
diff --git a/erpnext/manufacturing/doctype/workstation/workstation.json b/erpnext/manufacturing/doctype/workstation/workstation.json
index bf31d7ddc39..81b83d9066b 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation.json
+++ b/erpnext/manufacturing/doctype/workstation/workstation.json
@@ -27,11 +27,8 @@
"column_break_etmc",
"off_status_image",
"over_heads",
- "hour_rate_electricity",
- "hour_rate_consumable",
- "column_break_11",
- "hour_rate_rent",
- "hour_rate_labour",
+ "section_break_auzm",
+ "workstation_costs",
"section_break_11",
"hour_rate",
"workstaion_description",
@@ -68,50 +65,6 @@
"label": "Operating Costs",
"oldfieldtype": "Section Break"
},
- {
- "bold": 1,
- "description": "per hour",
- "fieldname": "hour_rate_electricity",
- "fieldtype": "Currency",
- "label": "Electricity Cost",
- "non_negative": 1,
- "oldfieldname": "hour_rate_electricity",
- "oldfieldtype": "Currency"
- },
- {
- "bold": 1,
- "description": "per hour",
- "fieldname": "hour_rate_consumable",
- "fieldtype": "Currency",
- "label": "Consumable Cost",
- "non_negative": 1,
- "oldfieldname": "hour_rate_consumable",
- "oldfieldtype": "Currency"
- },
- {
- "fieldname": "column_break_11",
- "fieldtype": "Column Break"
- },
- {
- "bold": 1,
- "description": "per hour",
- "fieldname": "hour_rate_rent",
- "fieldtype": "Currency",
- "label": "Rent Cost",
- "non_negative": 1,
- "oldfieldname": "hour_rate_rent",
- "oldfieldtype": "Currency"
- },
- {
- "bold": 1,
- "description": "Wages per hour",
- "fieldname": "hour_rate_labour",
- "fieldtype": "Currency",
- "label": "Wages",
- "non_negative": 1,
- "oldfieldname": "hour_rate_labour",
- "oldfieldtype": "Currency"
- },
{
"description": "per hour",
"fieldname": "hour_rate",
@@ -252,6 +205,17 @@
"fieldname": "disabled",
"fieldtype": "Check",
"label": "Disabled"
+ },
+ {
+ "fieldname": "section_break_auzm",
+ "fieldtype": "Section Break",
+ "label": "Operating Costs (Per Hour)"
+ },
+ {
+ "fieldname": "workstation_costs",
+ "fieldtype": "Table",
+ "label": "Operating Components Cost",
+ "options": "Workstation Cost"
}
],
"hide_toolbar": 1,
@@ -259,7 +223,7 @@
"idx": 1,
"image_field": "on_status_image",
"links": [],
- "modified": "2025-07-13 16:02:13.615001",
+ "modified": "2025-08-19 12:07:05.374386",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Workstation",
diff --git a/erpnext/manufacturing/doctype/workstation/workstation.py b/erpnext/manufacturing/doctype/workstation/workstation.py
index 0eb0a4f72d4..a740c13a461 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation.py
+++ b/erpnext/manufacturing/doctype/workstation/workstation.py
@@ -3,7 +3,7 @@
import frappe
-from frappe import _
+from frappe import _, bold
from frappe.model.document import Document
from frappe.utils import (
add_days,
@@ -44,6 +44,7 @@ class Workstation(Document):
if TYPE_CHECKING:
from frappe.types import DF
+ from erpnext.manufacturing.doctype.workstation_cost.workstation_cost import WorkstationCost
from erpnext.manufacturing.doctype.workstation_working_hour.workstation_working_hour import (
WorkstationWorkingHour,
)
@@ -52,10 +53,6 @@ class Workstation(Document):
disabled: DF.Check
holiday_list: DF.Link | None
hour_rate: DF.Currency
- hour_rate_consumable: DF.Currency
- hour_rate_electricity: DF.Currency
- hour_rate_labour: DF.Currency
- hour_rate_rent: DF.Currency
off_status_image: DF.AttachImage | None
on_status_image: DF.AttachImage | None
plant_floor: DF.Link | None
@@ -64,10 +61,26 @@ class Workstation(Document):
total_working_hours: DF.Float
warehouse: DF.Link | None
working_hours: DF.Table[WorkstationWorkingHour]
+ workstation_costs: DF.Table[WorkstationCost]
workstation_name: DF.Data
workstation_type: DF.Link | None
# end: auto-generated types
+ def validate(self):
+ self.validate_duplicate_operating_component()
+
+ def validate_duplicate_operating_component(self):
+ components = []
+ for row in self.workstation_costs:
+ if row.operating_component not in components:
+ components.append(row.operating_component)
+ else:
+ frappe.throw(
+ _("Duplicate Operating Component {0} found in Operating Components").format(
+ bold(row.operating_component)
+ )
+ )
+
def before_save(self):
self.set_data_based_on_workstation_type()
self.set_hour_rate()
@@ -95,36 +108,33 @@ class Workstation(Document):
frappe.throw(_("Row #{0}: Start Time must be before End Time").format(row.idx))
def set_hour_rate(self):
- self.hour_rate = (
- flt(self.hour_rate_labour)
- + flt(self.hour_rate_electricity)
- + flt(self.hour_rate_consumable)
- + flt(self.hour_rate_rent)
- )
+ self.hour_rate = 0.0
+ for row in self.workstation_costs:
+ if row.operating_cost:
+ self.hour_rate += flt(row.operating_cost)
@frappe.whitelist()
def set_data_based_on_workstation_type(self):
+ if self.workstation_costs:
+ return
+
if self.workstation_type:
- fields = [
- "hour_rate_labour",
- "hour_rate_electricity",
- "hour_rate_consumable",
- "hour_rate_rent",
- "hour_rate",
- "description",
- ]
+ data = frappe.get_all(
+ "Workstation Cost",
+ fields=["operating_component", "operating_cost", "idx"],
+ filters={"parent": self.workstation_type, "parenttype": "Workstation Type"},
+ order_by="idx",
+ )
- data = frappe.get_cached_value("Workstation Type", self.workstation_type, fields, as_dict=True)
-
- if not data:
- return
-
- for field in fields:
- if self.get(field):
- continue
-
- if value := data.get(field):
- self.set(field, value)
+ for row in data:
+ self.append(
+ "workstation_costs",
+ {
+ "operating_component": row.operating_component,
+ "operating_cost": row.operating_cost,
+ "idx": row.idx,
+ },
+ )
def on_update(self):
self.validate_overlap_for_operation_timings()
diff --git a/erpnext/manufacturing/doctype/workstation_cost/__init__.py b/erpnext/manufacturing/doctype/workstation_cost/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/manufacturing/doctype/workstation_cost/test_workstation_cost.py b/erpnext/manufacturing/doctype/workstation_cost/test_workstation_cost.py
new file mode 100644
index 00000000000..ea948f62abc
--- /dev/null
+++ b/erpnext/manufacturing/doctype/workstation_cost/test_workstation_cost.py
@@ -0,0 +1,20 @@
+# Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests import IntegrationTestCase
+
+# On IntegrationTestCase, the doctype test records and all
+# link-field test record dependencies are recursively loaded
+# Use these module variables to add/remove to/from that list
+EXTRA_TEST_RECORD_DEPENDENCIES = [] # eg. ["User"]
+IGNORE_TEST_RECORD_DEPENDENCIES = [] # eg. ["User"]
+
+
+class IntegrationTestWorkstationCost(IntegrationTestCase):
+ """
+ Integration tests for WorkstationCost.
+ Use this class for testing interactions between multiple components.
+ """
+
+ pass
diff --git a/erpnext/manufacturing/doctype/workstation_cost/workstation_cost.js b/erpnext/manufacturing/doctype/workstation_cost/workstation_cost.js
new file mode 100644
index 00000000000..ea6577fa905
--- /dev/null
+++ b/erpnext/manufacturing/doctype/workstation_cost/workstation_cost.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+// frappe.ui.form.on("Workstation Cost", {
+// refresh(frm) {
+
+// },
+// });
diff --git a/erpnext/manufacturing/doctype/workstation_cost/workstation_cost.json b/erpnext/manufacturing/doctype/workstation_cost/workstation_cost.json
new file mode 100644
index 00000000000..fa5fe337a1c
--- /dev/null
+++ b/erpnext/manufacturing/doctype/workstation_cost/workstation_cost.json
@@ -0,0 +1,43 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2025-08-17 16:43:13.542333",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "operating_component",
+ "operating_cost"
+ ],
+ "fields": [
+ {
+ "fieldname": "operating_cost",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Operating Cost",
+ "reqd": 1
+ },
+ {
+ "fieldname": "operating_component",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Operating Component",
+ "options": "Workstation Operating Component",
+ "reqd": 1
+ }
+ ],
+ "grid_page_length": 50,
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2025-08-17 19:21:02.725365",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Workstation Cost",
+ "owner": "Administrator",
+ "permissions": [],
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}
diff --git a/erpnext/manufacturing/doctype/workstation_cost/workstation_cost.py b/erpnext/manufacturing/doctype/workstation_cost/workstation_cost.py
new file mode 100644
index 00000000000..7ab2ff9ac77
--- /dev/null
+++ b/erpnext/manufacturing/doctype/workstation_cost/workstation_cost.py
@@ -0,0 +1,24 @@
+# Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class WorkstationCost(Document):
+ # begin: auto-generated types
+ # This code is auto-generated. Do not modify anything in this block.
+
+ from typing import TYPE_CHECKING
+
+ if TYPE_CHECKING:
+ from frappe.types import DF
+
+ operating_component: DF.Link
+ operating_cost: DF.Currency
+ parent: DF.Data
+ parentfield: DF.Data
+ parenttype: DF.Data
+ # end: auto-generated types
+
+ pass
diff --git a/erpnext/manufacturing/doctype/workstation_operating_component/__init__.py b/erpnext/manufacturing/doctype/workstation_operating_component/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/manufacturing/doctype/workstation_operating_component/test_workstation_operating_component.py b/erpnext/manufacturing/doctype/workstation_operating_component/test_workstation_operating_component.py
new file mode 100644
index 00000000000..0d327c6473d
--- /dev/null
+++ b/erpnext/manufacturing/doctype/workstation_operating_component/test_workstation_operating_component.py
@@ -0,0 +1,20 @@
+# Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests import IntegrationTestCase
+
+# On IntegrationTestCase, the doctype test records and all
+# link-field test record dependencies are recursively loaded
+# Use these module variables to add/remove to/from that list
+EXTRA_TEST_RECORD_DEPENDENCIES = [] # eg. ["User"]
+IGNORE_TEST_RECORD_DEPENDENCIES = [] # eg. ["User"]
+
+
+class IntegrationTestWorkstationOperatingComponent(IntegrationTestCase):
+ """
+ Integration tests for WorkstationOperatingComponent.
+ Use this class for testing interactions between multiple components.
+ """
+
+ pass
diff --git a/erpnext/manufacturing/doctype/workstation_operating_component/workstation_operating_component.js b/erpnext/manufacturing/doctype/workstation_operating_component/workstation_operating_component.js
new file mode 100644
index 00000000000..6182af1eece
--- /dev/null
+++ b/erpnext/manufacturing/doctype/workstation_operating_component/workstation_operating_component.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+// frappe.ui.form.on("Workstation Operating Component", {
+// refresh(frm) {
+
+// },
+// });
diff --git a/erpnext/manufacturing/doctype/workstation_operating_component/workstation_operating_component.json b/erpnext/manufacturing/doctype/workstation_operating_component/workstation_operating_component.json
new file mode 100644
index 00000000000..dd1fe88bf57
--- /dev/null
+++ b/erpnext/manufacturing/doctype/workstation_operating_component/workstation_operating_component.json
@@ -0,0 +1,84 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "autoname": "field:component_name",
+ "creation": "2025-08-17 16:49:30.711201",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+ "component_name",
+ "section_break_ewdg",
+ "accounts"
+ ],
+ "fields": [
+ {
+ "fieldname": "component_name",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "Component Name",
+ "reqd": 1,
+ "unique": 1
+ },
+ {
+ "fieldname": "section_break_ewdg",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "accounts",
+ "fieldtype": "Table",
+ "label": "Component Expense Account",
+ "options": "Workstation Operating Component Account"
+ }
+ ],
+ "grid_page_length": 50,
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2025-08-17 19:23:47.510540",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Workstation Operating Component",
+ "naming_rule": "By fieldname",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "share": 1,
+ "write": 1
+ },
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Manufacturing User",
+ "share": 1,
+ "write": 1
+ },
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Manufacturing Manager",
+ "share": 1,
+ "write": 1
+ }
+ ],
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}
diff --git a/erpnext/manufacturing/doctype/workstation_operating_component/workstation_operating_component.py b/erpnext/manufacturing/doctype/workstation_operating_component/workstation_operating_component.py
new file mode 100644
index 00000000000..d8572f908b1
--- /dev/null
+++ b/erpnext/manufacturing/doctype/workstation_operating_component/workstation_operating_component.py
@@ -0,0 +1,25 @@
+# Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class WorkstationOperatingComponent(Document):
+ # begin: auto-generated types
+ # This code is auto-generated. Do not modify anything in this block.
+
+ from typing import TYPE_CHECKING
+
+ if TYPE_CHECKING:
+ from frappe.types import DF
+
+ from erpnext.manufacturing.doctype.workstation_operating_component_account.workstation_operating_component_account import (
+ WorkstationOperatingComponentAccount,
+ )
+
+ accounts: DF.Table[WorkstationOperatingComponentAccount]
+ component_name: DF.Data
+ # end: auto-generated types
+
+ pass
diff --git a/erpnext/manufacturing/doctype/workstation_operating_component_account/__init__.py b/erpnext/manufacturing/doctype/workstation_operating_component_account/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/manufacturing/doctype/workstation_operating_component_account/test_workstation_operating_component_account.py b/erpnext/manufacturing/doctype/workstation_operating_component_account/test_workstation_operating_component_account.py
new file mode 100644
index 00000000000..3bf919b8df0
--- /dev/null
+++ b/erpnext/manufacturing/doctype/workstation_operating_component_account/test_workstation_operating_component_account.py
@@ -0,0 +1,20 @@
+# Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests import IntegrationTestCase
+
+# On IntegrationTestCase, the doctype test records and all
+# link-field test record dependencies are recursively loaded
+# Use these module variables to add/remove to/from that list
+EXTRA_TEST_RECORD_DEPENDENCIES = [] # eg. ["User"]
+IGNORE_TEST_RECORD_DEPENDENCIES = [] # eg. ["User"]
+
+
+class IntegrationTestWorkstationOperatingComponentAccount(IntegrationTestCase):
+ """
+ Integration tests for WorkstationOperatingComponentAccount.
+ Use this class for testing interactions between multiple components.
+ """
+
+ pass
diff --git a/erpnext/manufacturing/doctype/workstation_operating_component_account/workstation_operating_component_account.js b/erpnext/manufacturing/doctype/workstation_operating_component_account/workstation_operating_component_account.js
new file mode 100644
index 00000000000..10cba973862
--- /dev/null
+++ b/erpnext/manufacturing/doctype/workstation_operating_component_account/workstation_operating_component_account.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+// frappe.ui.form.on("Workstation Operating Component Account", {
+// refresh(frm) {
+
+// },
+// });
diff --git a/erpnext/manufacturing/doctype/workstation_operating_component_account/workstation_operating_component_account.json b/erpnext/manufacturing/doctype/workstation_operating_component_account/workstation_operating_component_account.json
new file mode 100644
index 00000000000..31f04fa3d5d
--- /dev/null
+++ b/erpnext/manufacturing/doctype/workstation_operating_component_account/workstation_operating_component_account.json
@@ -0,0 +1,43 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2025-08-17 19:21:36.356779",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "company",
+ "expense_account"
+ ],
+ "fields": [
+ {
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Company",
+ "options": "Company",
+ "reqd": 1
+ },
+ {
+ "fieldname": "expense_account",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Expense Account",
+ "options": "Account"
+ }
+ ],
+ "grid_page_length": 50,
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2025-08-17 19:24:01.487406",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Workstation Operating Component Account",
+ "owner": "Administrator",
+ "permissions": [],
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}
diff --git a/erpnext/manufacturing/doctype/workstation_operating_component_account/workstation_operating_component_account.py b/erpnext/manufacturing/doctype/workstation_operating_component_account/workstation_operating_component_account.py
new file mode 100644
index 00000000000..5de55bc1c2c
--- /dev/null
+++ b/erpnext/manufacturing/doctype/workstation_operating_component_account/workstation_operating_component_account.py
@@ -0,0 +1,24 @@
+# Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class WorkstationOperatingComponentAccount(Document):
+ # begin: auto-generated types
+ # This code is auto-generated. Do not modify anything in this block.
+
+ from typing import TYPE_CHECKING
+
+ if TYPE_CHECKING:
+ from frappe.types import DF
+
+ company: DF.Link
+ expense_account: DF.Link | None
+ parent: DF.Data
+ parentfield: DF.Data
+ parenttype: DF.Data
+ # end: auto-generated types
+
+ pass
diff --git a/erpnext/manufacturing/doctype/workstation_type/workstation_type.json b/erpnext/manufacturing/doctype/workstation_type/workstation_type.json
index 5d5776ab77d..75a0482e43f 100644
--- a/erpnext/manufacturing/doctype/workstation_type/workstation_type.json
+++ b/erpnext/manufacturing/doctype/workstation_type/workstation_type.json
@@ -10,12 +10,8 @@
"engine": "InnoDB",
"field_order": [
"workstation_type",
- "over_heads",
- "hour_rate_electricity",
- "hour_rate_consumable",
- "column_break_5",
- "hour_rate_rent",
- "hour_rate_labour",
+ "section_break_auzm",
+ "workstation_costs",
"section_break_8",
"hour_rate",
"description_tab",
@@ -32,44 +28,6 @@
"reqd": 1,
"unique": 1
},
- {
- "fieldname": "over_heads",
- "fieldtype": "Section Break",
- "label": "Operating Costs",
- "oldfieldtype": "Section Break"
- },
- {
- "description": "per hour",
- "fieldname": "hour_rate_electricity",
- "fieldtype": "Currency",
- "label": "Electricity Cost",
- "oldfieldname": "hour_rate_electricity",
- "oldfieldtype": "Currency"
- },
- {
- "description": "per hour",
- "fieldname": "hour_rate_consumable",
- "fieldtype": "Currency",
- "label": "Consumable Cost",
- "oldfieldname": "hour_rate_consumable",
- "oldfieldtype": "Currency"
- },
- {
- "description": "per hour",
- "fieldname": "hour_rate_rent",
- "fieldtype": "Currency",
- "label": "Rent Cost",
- "oldfieldname": "hour_rate_rent",
- "oldfieldtype": "Currency"
- },
- {
- "description": "Wages per hour",
- "fieldname": "hour_rate_labour",
- "fieldtype": "Currency",
- "label": "Wages",
- "oldfieldname": "hour_rate_labour",
- "oldfieldtype": "Currency"
- },
{
"description": "per hour",
"fieldname": "hour_rate",
@@ -88,10 +46,6 @@
"oldfieldtype": "Text",
"width": "300px"
},
- {
- "fieldname": "column_break_5",
- "fieldtype": "Column Break"
- },
{
"collapsible": 1,
"fieldname": "description_tab",
@@ -101,11 +55,22 @@
{
"fieldname": "section_break_8",
"fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "section_break_auzm",
+ "fieldtype": "Section Break",
+ "label": "Operating Costs (Per Hour)"
+ },
+ {
+ "fieldname": "workstation_costs",
+ "fieldtype": "Table",
+ "label": "Operating Components Cost",
+ "options": "Workstation Cost"
}
],
"icon": "icon-wrench",
"links": [],
- "modified": "2024-03-27 13:11:00.946367",
+ "modified": "2025-08-19 12:06:56.683558",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Workstation Type",
@@ -125,9 +90,10 @@
}
],
"quick_entry": 1,
+ "row_format": "Dynamic",
"show_name_in_global_search": 1,
"sort_field": "creation",
"sort_order": "ASC",
"states": [],
"track_changes": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/manufacturing/doctype/workstation_type/workstation_type.py b/erpnext/manufacturing/doctype/workstation_type/workstation_type.py
index 0f151a2fb2b..838eea46469 100644
--- a/erpnext/manufacturing/doctype/workstation_type/workstation_type.py
+++ b/erpnext/manufacturing/doctype/workstation_type/workstation_type.py
@@ -2,6 +2,7 @@
# For license information, please see license.txt
import frappe
+from frappe import _, bold
from frappe.model.document import Document
from frappe.utils import flt
@@ -15,25 +16,38 @@ class WorkstationType(Document):
if TYPE_CHECKING:
from frappe.types import DF
+ from erpnext.manufacturing.doctype.workstation_cost.workstation_cost import WorkstationCost
+
description: DF.SmallText | None
hour_rate: DF.Currency
- hour_rate_consumable: DF.Currency
- hour_rate_electricity: DF.Currency
- hour_rate_labour: DF.Currency
- hour_rate_rent: DF.Currency
+ workstation_costs: DF.Table[WorkstationCost]
workstation_type: DF.Data
# end: auto-generated types
+ def validate(self):
+ self.validate_duplicate_operating_component()
+
+ def validate_duplicate_operating_component(self):
+ components = []
+ for row in self.workstation_costs:
+ if row.operating_component not in components:
+ components.append(row.operating_component)
+ else:
+ frappe.throw(
+ _("Duplicate Operating Component {0} found in Operating Components").format(
+ bold(row.operating_component)
+ )
+ )
+
def before_save(self):
self.set_hour_rate()
def set_hour_rate(self):
- self.hour_rate = (
- flt(self.hour_rate_labour)
- + flt(self.hour_rate_electricity)
- + flt(self.hour_rate_consumable)
- + flt(self.hour_rate_rent)
- )
+ self.hour_rate = 0.0
+
+ for row in self.workstation_costs:
+ if row.operating_cost:
+ self.hour_rate += flt(row.operating_cost)
def get_workstations(workstation_type):
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 0c52a86ca39..37da137476a 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -434,3 +434,5 @@ erpnext.patches.v15_0.update_uae_zero_rated_fetch
erpnext.patches.v15_0.add_company_payment_gateway_account
erpnext.patches.v16_0.update_serial_no_reference_name
erpnext.patches.v16_0.set_invoice_type_in_pos_settings
+erpnext.patches.v15_0.update_fieldname_in_accounting_dimension_filter
+erpnext.patches.v16_0.make_workstation_operating_components #1
diff --git a/erpnext/patches/v14_0/single_to_multi_dunning.py b/erpnext/patches/v14_0/single_to_multi_dunning.py
index 98be0204518..3def5922c07 100644
--- a/erpnext/patches/v14_0/single_to_multi_dunning.py
+++ b/erpnext/patches/v14_0/single_to_multi_dunning.py
@@ -48,6 +48,7 @@ def execute():
dunning.validate()
dunning.flags.ignore_validate_update_after_submit = True
+ dunning.flags.ignore_links = True
dunning.save()
# Reverse entries only if dunning is submitted and not resolved
diff --git a/erpnext/patches/v15_0/update_fieldname_in_accounting_dimension_filter.py b/erpnext/patches/v15_0/update_fieldname_in_accounting_dimension_filter.py
new file mode 100644
index 00000000000..25a35bc87fc
--- /dev/null
+++ b/erpnext/patches/v15_0/update_fieldname_in_accounting_dimension_filter.py
@@ -0,0 +1,36 @@
+import frappe
+from frappe.query_builder import DocType
+
+
+def execute():
+ default_accounting_dimension()
+ ADF = DocType("Accounting Dimension Filter")
+ AD = DocType("Accounting Dimension")
+
+ accounting_dimension_filter = (
+ frappe.qb.from_(ADF)
+ .join(AD)
+ .on(AD.document_type == ADF.accounting_dimension)
+ .select(ADF.name, AD.fieldname, ADF.accounting_dimension)
+ ).run(as_dict=True)
+
+ for doc in accounting_dimension_filter:
+ value = doc.fieldname or frappe.scrub(doc.accounting_dimension)
+ frappe.db.set_value(
+ "Accounting Dimension Filter",
+ doc.name,
+ "fieldname",
+ value,
+ update_modified=False,
+ )
+
+
+def default_accounting_dimension():
+ ADF = DocType("Accounting Dimension Filter")
+ for dim in ("Cost Center", "Project"):
+ (
+ frappe.qb.update(ADF)
+ .set(ADF.fieldname, frappe.scrub(dim))
+ .where(ADF.accounting_dimension == dim)
+ .run()
+ )
diff --git a/erpnext/patches/v16_0/make_workstation_operating_components.py b/erpnext/patches/v16_0/make_workstation_operating_components.py
new file mode 100644
index 00000000000..0ee876fd1bc
--- /dev/null
+++ b/erpnext/patches/v16_0/make_workstation_operating_components.py
@@ -0,0 +1,79 @@
+import frappe
+from frappe import _
+
+
+def get_operating_cost_account(company):
+ company_details = frappe.db.get_value(
+ "Company", company, ["default_operating_cost_account", "default_expense_account"], as_dict=True
+ )
+
+ return company_details.get("default_operating_cost_account") or company_details.get(
+ "default_expense_account"
+ )
+
+
+def execute():
+ components = [
+ "Electricity",
+ "Consumables",
+ "Rent",
+ "Wages",
+ ]
+
+ companies = frappe.get_all("Company", filters={"is_group": 0}, pluck="name")
+
+ for component in components:
+ component = _(component)
+ if not frappe.db.exists("Workstation Operating Component", component):
+ doc = frappe.new_doc("Workstation Operating Component")
+ doc.component_name = component
+
+ for company in companies:
+ operating_cost_account = get_operating_cost_account(company)
+
+ doc.append("accounts", {"company": company, "expense_account": operating_cost_account})
+
+ doc.insert()
+
+ workstations = frappe.get_all("Workstation", filters={"hour_rate": (">", 0.0)}, pluck="name") or []
+ workstation_types = (
+ frappe.get_all("Workstation Type", filters={"hour_rate": (">", 0.0)}, pluck="name") or []
+ )
+
+ if not workstations and not workstation_types:
+ return
+
+ components_map = {
+ "hour_rate_electricity": _("Electricity"),
+ "hour_rate_consumable": _("Consumables"),
+ "hour_rate_rent": _("Rent"),
+ "hour_rate_labour": _("Wages"),
+ }
+
+ for workstation in workstations:
+ doc = frappe.get_doc("Workstation", workstation)
+ for field, component in components_map.items():
+ if doc.get(field):
+ doc.append(
+ "workstation_costs",
+ {
+ "operating_component": component,
+ "operating_cost": doc.get(field),
+ },
+ )
+
+ doc.save()
+
+ for workstation_type in workstation_types:
+ doc = frappe.get_doc("Workstation Type", workstation_type)
+ for field, component in components_map.items():
+ if doc.get(field):
+ doc.append(
+ "workstation_costs",
+ {
+ "operating_component": component,
+ "operating_cost": doc.get(field),
+ },
+ )
+
+ doc.save()
diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py
index a43763177db..2119d214a61 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -329,12 +329,16 @@ def get_projectwise_timesheet_data(project=None, parent=None, from_time=None, to
@frappe.whitelist()
def get_timesheet_detail_rate(timelog, currency):
- timelog_detail = frappe.db.sql(
- f"""SELECT tsd.billing_amount as billing_amount,
- ts.currency as currency FROM `tabTimesheet Detail` tsd
- INNER JOIN `tabTimesheet` ts ON ts.name=tsd.parent
- WHERE tsd.name = '{timelog}'""",
- as_dict=1,
+ ts = frappe.qb.DocType("Timesheet")
+ ts_detail = frappe.qb.DocType("Timesheet Detail")
+
+ timelog_detail = (
+ frappe.qb.from_(ts_detail)
+ .inner_join(ts)
+ .on(ts.name == ts_detail.parent)
+ .select(ts_detail.billing_amount.as_("billing_amount"), ts.currency.as_("currency"))
+ .where(ts_detail.name == timelog)
+ .run(as_dict=1)
)[0]
if timelog_detail.currency:
diff --git a/erpnext/public/js/controllers/accounts.js b/erpnext/public/js/controllers/accounts.js
index 964a175ac9f..9a67d8a6a54 100644
--- a/erpnext/public/js/controllers/accounts.js
+++ b/erpnext/public/js/controllers/accounts.js
@@ -5,61 +5,69 @@
frappe.provide("erpnext.taxes");
erpnext.accounts.taxes = {
- setup_tax_validations: function(doctype) {
+ setup_tax_validations: function (doctype) {
let me = this;
frappe.ui.form.on(doctype, {
- setup: function(frm) {
+ setup: function (frm) {
// set conditional display for rate column in taxes
- $(frm.wrapper).on('grid-row-render', function(e, grid_row) {
- if(['Sales Taxes and Charges', 'Purchase Taxes and Charges'].includes(grid_row.doc.doctype)) {
+ $(frm.wrapper).on("grid-row-render", function (e, grid_row) {
+ if (
+ ["Sales Taxes and Charges", "Purchase Taxes and Charges"].includes(
+ grid_row.doc.doctype
+ )
+ ) {
me.set_conditional_mandatory_rate_or_amount(grid_row);
}
});
},
- onload: function(frm) {
- if(frm.get_field("taxes")) {
- frm.set_query("account_head", "taxes", function(doc) {
- if(frm.cscript.tax_table == "Sales Taxes and Charges") {
+ onload: function (frm) {
+ if (frm.get_field("taxes")) {
+ frm.set_query("account_head", "taxes", function (doc) {
+ if (frm.cscript.tax_table == "Sales Taxes and Charges") {
var account_type = ["Tax", "Chargeable", "Expense Account"];
} else {
- var account_type = ["Tax", "Chargeable", "Income Account", "Expenses Included In Valuation"];
+ var account_type = [
+ "Tax",
+ "Chargeable",
+ "Income Account",
+ "Expenses Included In Valuation",
+ ];
}
return {
query: "erpnext.controllers.queries.tax_account_query",
filters: {
- "account_type": account_type,
- "company": doc.company,
- }
- }
+ account_type: account_type,
+ company: doc.company,
+ },
+ };
});
- frm.set_query("cost_center", "taxes", function(doc) {
+ frm.set_query("cost_center", "taxes", function (doc) {
return {
filters: {
- "company": doc.company,
- "is_group": 0
- }
+ company: doc.company,
+ is_group: 0,
+ },
};
});
}
},
- validate: function(frm) {
+ validate: function (frm) {
// neither is absolutely mandatory
- if(frm.get_docfield("taxes")) {
+ if (frm.get_docfield("taxes")) {
frm.get_docfield("taxes", "rate").reqd = 0;
frm.get_docfield("taxes", "tax_amount").reqd = 0;
}
-
},
- taxes_on_form_rendered: function(frm) {
+ taxes_on_form_rendered: function (frm) {
me.set_conditional_mandatory_rate_or_amount(frm.open_grid_row());
},
});
},
- set_conditional_mandatory_rate_or_amount: function(grid_row) {
- if(grid_row) {
- if(grid_row.doc.charge_type==="Actual") {
+ set_conditional_mandatory_rate_or_amount: function (grid_row) {
+ if (grid_row) {
+ if (grid_row.doc.charge_type === "Actual") {
grid_row.toggle_editable("tax_amount", true);
grid_row.toggle_reqd("tax_amount", true);
grid_row.toggle_editable("rate", false);
@@ -73,31 +81,45 @@ erpnext.accounts.taxes = {
}
},
- validate_taxes_and_charges: function(cdt, cdn) {
+ validate_taxes_and_charges: function (cdt, cdn) {
let d = locals[cdt][cdn];
let msg = "";
if (d.account_head && !d.description) {
// set description from account head
- d.description = d.account_head.split(' - ').slice(0, -1).join(' - ');
+ d.description = d.account_head.split(" - ").slice(0, -1).join(" - ");
}
if (!d.charge_type && (d.row_id || d.rate || d.tax_amount)) {
msg = __("Please select Charge Type first");
d.row_id = "";
d.rate = d.tax_amount = 0.0;
- } else if ((d.charge_type == 'Actual' || d.charge_type == 'On Net Total' || d.charge_type == 'On Paid Amount') && d.row_id) {
- msg = __("Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'");
+ } else if (
+ (d.charge_type == "Actual" ||
+ d.charge_type == "On Net Total" ||
+ d.charge_type == "On Paid Amount") &&
+ d.row_id
+ ) {
+ msg = __(
+ "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'"
+ );
d.row_id = "";
- } else if ((d.charge_type == 'On Previous Row Amount' || d.charge_type == 'On Previous Row Total') && d.row_id) {
+ } else if (
+ (d.charge_type == "On Previous Row Amount" || d.charge_type == "On Previous Row Total") &&
+ d.row_id
+ ) {
if (d.idx == 1) {
- msg = __("Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row");
- d.charge_type = '';
+ msg = __(
+ "Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row"
+ );
+ d.charge_type = "";
} else if (!d.row_id) {
msg = __("Please specify a valid Row ID for row {0} in table {1}", [d.idx, __(d.doctype)]);
d.row_id = "";
} else if (d.row_id && d.row_id >= d.idx) {
- msg = __("Cannot refer row number greater than or equal to current row number for this Charge type");
+ msg = __(
+ "Cannot refer row number greater than or equal to current row number for this Charge type"
+ );
d.row_id = "";
}
}
@@ -106,13 +128,12 @@ erpnext.accounts.taxes = {
refresh_field("taxes");
frappe.throw(msg);
}
-
},
- setup_tax_filters: function(doctype) {
+ setup_tax_filters: function (doctype) {
let me = this;
frappe.ui.form.on(doctype, {
- account_head: function(frm, cdt, cdn) {
+ account_head: function (frm, cdt, cdn) {
let d = locals[cdt][cdn];
if (d.docstatus == 1) {
@@ -120,150 +141,157 @@ erpnext.accounts.taxes = {
return;
}
- if(!d.charge_type && d.account_head){
+ if (!d.charge_type && d.account_head) {
frappe.msgprint(__("Please select Charge Type first"));
frappe.model.set_value(cdt, cdn, "account_head", "");
} else if (d.account_head) {
frappe.call({
- type:"GET",
+ type: "GET",
method: "erpnext.controllers.accounts_controller.get_tax_rate",
- args: {"account_head":d.account_head},
- callback: function(r) {
- if (d.charge_type!=="Actual") {
+ args: { account_head: d.account_head },
+ callback: function (r) {
+ if (d.charge_type !== "Actual") {
frappe.model.set_value(cdt, cdn, "rate", r.message.tax_rate || 0);
}
frappe.model.set_value(cdt, cdn, "description", r.message.account_name);
- }
- })
+ },
+ });
}
},
- row_id: function(frm, cdt, cdn) {
+ row_id: function (frm, cdt, cdn) {
me.validate_taxes_and_charges(cdt, cdn);
},
- rate: function(frm, cdt, cdn) {
+ rate: function (frm, cdt, cdn) {
me.validate_taxes_and_charges(cdt, cdn);
},
- tax_amount: function(frm, cdt, cdn) {
+ tax_amount: function (frm, cdt, cdn) {
me.validate_taxes_and_charges(cdt, cdn);
},
- charge_type: function(frm, cdt, cdn) {
+ charge_type: function (frm, cdt, cdn) {
me.validate_taxes_and_charges(cdt, cdn);
let open_form = frm.open_grid_row();
- if(open_form) {
+ if (open_form) {
me.set_conditional_mandatory_rate_or_amount(open_form);
} else {
// apply in current row
- me.set_conditional_mandatory_rate_or_amount(frm.get_field('taxes').grid.get_row(cdn));
+ me.set_conditional_mandatory_rate_or_amount(frm.get_field("taxes").grid.get_row(cdn));
}
},
- included_in_print_rate: function(frm, cdt, cdn) {
+ included_in_print_rate: function (frm, cdt, cdn) {
let tax = frappe.get_doc(cdt, cdn);
try {
me.validate_taxes_and_charges(cdt, cdn);
me.validate_inclusive_tax(tax, frm);
- } catch(e) {
+ } catch (e) {
tax.included_in_print_rate = 0;
refresh_field("included_in_print_rate", tax.name, tax.parentfield);
throw e;
}
- }
+ },
});
},
- validate_inclusive_tax: function(tax, frm) {
+ validate_inclusive_tax: function (tax, frm) {
this.frm = this.frm || frm;
- let actual_type_error = function() {
- var msg = __("Actual type tax cannot be included in Item rate in row {0}", [tax.idx])
+ let actual_type_error = function () {
+ var msg = __("Actual type tax cannot be included in Item rate in row {0}", [tax.idx]);
frappe.throw(msg);
};
- let on_previous_row_error = function(row_range) {
- var msg = __("For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",
- [tax.idx, __(tax.doctype), tax.charge_type, row_range])
+ let on_previous_row_error = function (row_range) {
+ var msg = __("For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included", [
+ tax.idx,
+ __(tax.doctype),
+ tax.charge_type,
+ row_range,
+ ]);
frappe.throw(msg);
};
- if(cint(tax.included_in_print_rate)) {
- if(tax.charge_type == "Actual") {
+ if (cint(tax.included_in_print_rate)) {
+ if (tax.charge_type == "Actual") {
// inclusive tax cannot be of type Actual
actual_type_error();
- } else if (tax.charge_type == "On Previous Row Amount" && this.frm &&
+ } else if (
+ tax.charge_type == "On Previous Row Amount" &&
+ this.frm &&
!cint(this.frm.doc["taxes"][tax.row_id - 1].included_in_print_rate)
) {
// referred row should also be an inclusive tax
on_previous_row_error(tax.row_id);
} else if (tax.charge_type == "On Previous Row Total" && this.frm) {
- var taxes_not_included = $.map(this.frm.doc["taxes"].slice(0, tax.row_id),
- function(t) { return cint(t.included_in_print_rate) ? null : t; });
- if(taxes_not_included.length > 0) {
+ var taxes_not_included = $.map(this.frm.doc["taxes"].slice(0, tax.row_id), function (t) {
+ return cint(t.included_in_print_rate) ? null : t;
+ });
+ if (taxes_not_included.length > 0) {
// all rows above this tax should be inclusive
on_previous_row_error(tax.row_id == 1 ? "1" : "1 - " + tax.row_id);
}
- } else if(tax.category == "Valuation") {
+ } else if (tax.category == "Valuation") {
frappe.throw(__("Valuation type charges can not marked as Inclusive"));
}
}
- }
-}
+ },
+};
erpnext.accounts.payment_triggers = {
- setup: function(doctype) {
+ setup: function (doctype) {
frappe.ui.form.on(doctype, {
allocate_advances_automatically(frm) {
- frm.trigger('fetch_advances');
+ frm.trigger("fetch_advances");
},
only_include_allocated_payments(frm) {
- frm.trigger('fetch_advances');
+ frm.trigger("fetch_advances");
},
fetch_advances(frm) {
- if(frm.doc.allocate_advances_automatically) {
+ if (frm.doc.allocate_advances_automatically) {
frappe.call({
doc: frm.doc,
method: "set_advances",
- callback: function(r, rt) {
+ callback: function (r, rt) {
refresh_field("advances");
- }
- })
+ },
+ });
}
- }
+ },
});
},
-}
+};
erpnext.accounts.pos = {
- setup: function(doctype) {
+ setup: function (doctype) {
frappe.ui.form.on(doctype, {
- mode_of_payment: function(frm, cdt, cdn) {
+ mode_of_payment: function (frm, cdt, cdn) {
var d = locals[cdt][cdn];
- get_payment_mode_account(frm, d.mode_of_payment, function(account){
- frappe.model.set_value(cdt, cdn, 'account', account)
- })
- }
+ get_payment_mode_account(frm, d.mode_of_payment, function (account) {
+ frappe.model.set_value(cdt, cdn, "account", account);
+ });
+ },
});
},
- get_payment_mode_account: function(frm, mode_of_payment, callback) {
- if(!frm.doc.company) {
- frappe.throw({message:__("Please select a Company first."), title: __("Mandatory")});
+ get_payment_mode_account: function (frm, mode_of_payment, callback) {
+ if (!frm.doc.company) {
+ frappe.throw({ message: __("Please select a Company first."), title: __("Mandatory") });
}
- if(!mode_of_payment) {
+ if (!mode_of_payment) {
return;
}
- return frappe.call({
+ return frappe.call({
method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.get_bank_cash_account",
args: {
- "mode_of_payment": mode_of_payment,
- "company": frm.doc.company
+ mode_of_payment: mode_of_payment,
+ company: frm.doc.company,
},
- callback: function(r, rt) {
- if(r.message) {
- callback(r.message.account)
+ callback: function (r, rt) {
+ if (r.message) {
+ callback(r.message.account);
}
- }
+ },
});
- }
-}
+ },
+};
diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index a1675be8954..be8c38cadbe 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -5,7 +5,7 @@ frappe.provide("erpnext.buying");
// cur_frm.add_fetch('project', 'cost_center', 'cost_center');
erpnext.buying = {
- setup_buying_controller: function() {
+ setup_buying_controller: function () {
erpnext.buying.BuyingController = class BuyingController extends erpnext.TransactionController {
setup() {
super.setup();
@@ -17,11 +17,11 @@ erpnext.buying = {
this.setup_queries(doc, cdt, cdn);
super.onload();
- this.frm.set_query('shipping_rule', function() {
+ this.frm.set_query("shipping_rule", function () {
return {
filters: {
- "shipping_rule_type": "Buying"
- }
+ shipping_rule_type: "Buying",
+ },
};
});
@@ -33,29 +33,28 @@ erpnext.buying = {
};
});
- if (this.frm.doc.__islocal
- && frappe.meta.has_field(this.frm.doc.doctype, "disable_rounded_total")) {
-
- var df = frappe.meta.get_docfield(this.frm.doc.doctype, "disable_rounded_total");
- var disable = cint(df.default) || cint(frappe.sys_defaults.disable_rounded_total);
- this.frm.set_value("disable_rounded_total", disable);
+ if (
+ this.frm.doc.__islocal &&
+ frappe.meta.has_field(this.frm.doc.doctype, "disable_rounded_total")
+ ) {
+ var df = frappe.meta.get_docfield(this.frm.doc.doctype, "disable_rounded_total");
+ var disable = cint(df.default) || cint(frappe.sys_defaults.disable_rounded_total);
+ this.frm.set_value("disable_rounded_total", disable);
}
-
// no idea where me is coming from
- if(this.frm.get_field('shipping_address')) {
+ if (this.frm.get_field("shipping_address")) {
this.frm.set_query("shipping_address", () => {
- if(this.frm.doc.customer) {
+ if (this.frm.doc.customer) {
return {
- query: 'frappe.contacts.doctype.address.address.address_query',
- filters: { link_doctype: 'Customer', link_name: this.frm.doc.customer }
+ query: "frappe.contacts.doctype.address.address.address_query",
+ filters: { link_doctype: "Customer", link_name: this.frm.doc.customer },
};
- } else
- return erpnext.queries.company_address_query(this.frm.doc)
+ } else return erpnext.queries.company_address_query(this.frm.doc);
});
}
- if(this.frm.get_field('dispatch_address')) {
+ if (this.frm.get_field("dispatch_address")) {
this.frm.set_query("dispatch_address", () => {
return erpnext.queries.address_query(this.frm.doc);
});
@@ -65,76 +64,77 @@ erpnext.buying = {
setup_queries(doc, cdt, cdn) {
var me = this;
- if(this.frm.fields_dict.buying_price_list) {
- this.frm.set_query("buying_price_list", function() {
- return{
- filters: { 'buying': 1 }
- }
+ if (this.frm.fields_dict.buying_price_list) {
+ this.frm.set_query("buying_price_list", function () {
+ return {
+ filters: { buying: 1 },
+ };
});
}
- if(this.frm.fields_dict.tc_name) {
- this.frm.set_query("tc_name", function() {
- return{
- filters: { 'buying': 1 }
- }
+ if (this.frm.fields_dict.tc_name) {
+ this.frm.set_query("tc_name", function () {
+ return {
+ filters: { buying: 1 },
+ };
});
}
- me.frm.set_query('supplier', erpnext.queries.supplier);
- me.frm.set_query('contact_person', erpnext.queries.contact_query);
- me.frm.set_query('supplier_address', erpnext.queries.address_query);
+ me.frm.set_query("supplier", erpnext.queries.supplier);
+ me.frm.set_query("contact_person", erpnext.queries.contact_query);
+ me.frm.set_query("supplier_address", erpnext.queries.address_query);
- me.frm.set_query('billing_address', erpnext.queries.company_address_query);
+ me.frm.set_query("billing_address", erpnext.queries.company_address_query);
erpnext.accounts.dimensions.setup_dimension_filters(me.frm, me.frm.doctype);
- this.frm.set_query("item_code", "items", function() {
+ this.frm.set_query("item_code", "items", function () {
if (me.frm.doc.is_subcontracted) {
- var filters = {'supplier': me.frm.doc.supplier};
+ var filters = { supplier: me.frm.doc.supplier };
if (me.frm.doc.is_old_subcontracting_flow) {
filters["is_sub_contracted_item"] = 1;
- }
- else {
+ } else {
filters["is_stock_item"] = 0;
}
- return{
+ return {
query: "erpnext.controllers.queries.item_query",
- filters: filters
- }
- }
- else {
- return{
+ filters: filters,
+ };
+ } else {
+ return {
query: "erpnext.controllers.queries.item_query",
- filters: { 'supplier': me.frm.doc.supplier, 'is_purchase_item': 1, 'has_variants': 0}
- }
+ filters: { supplier: me.frm.doc.supplier, is_purchase_item: 1, has_variants: 0 },
+ };
}
});
-
- this.frm.set_query("manufacturer", "items", function(doc, cdt, cdn) {
+ this.frm.set_query("manufacturer", "items", function (doc, cdt, cdn) {
const row = locals[cdt][cdn];
return {
query: "erpnext.controllers.queries.item_manufacturer_query",
- filters:{ 'item_code': row.item_code }
- }
+ filters: { item_code: row.item_code },
+ };
});
- if(this.frm.fields_dict["items"].grid.get_field('item_code')) {
- this.frm.set_query("item_tax_template", "items", function(doc, cdt, cdn) {
- return me.set_query_for_item_tax_template(doc, cdt, cdn)
+ if (this.frm.fields_dict["items"].grid.get_field("item_code")) {
+ this.frm.set_query("item_tax_template", "items", function (doc, cdt, cdn) {
+ return me.set_query_for_item_tax_template(doc, cdt, cdn);
});
}
}
refresh(doc) {
- frappe.dynamic_link = {doc: this.frm.doc, fieldname: 'supplier', doctype: 'Supplier'};
+ frappe.dynamic_link = { doc: this.frm.doc, fieldname: "supplier", doctype: "Supplier" };
- this.frm.toggle_display("supplier_name",
- (this.frm.doc.supplier_name && this.frm.doc.supplier_name!==this.frm.doc.supplier));
+ this.frm.toggle_display(
+ "supplier_name",
+ this.frm.doc.supplier_name && this.frm.doc.supplier_name !== this.frm.doc.supplier
+ );
- if(this.frm.doc.docstatus==0 &&
- (this.frm.doctype==="Purchase Order" || this.frm.doctype==="Material Request")) {
+ if (
+ this.frm.doc.docstatus == 0 &&
+ (this.frm.doctype === "Purchase Order" || this.frm.doctype === "Material Request")
+ ) {
this.set_from_product_bundle();
}
@@ -143,45 +143,53 @@ erpnext.buying = {
}
toggle_subcontracting_fields() {
- if (['Purchase Receipt', 'Purchase Invoice'].includes(this.frm.doc.doctype)) {
- this.frm.fields_dict.supplied_items.grid.update_docfield_property('consumed_qty',
- 'read_only', this.frm.doc.__onload && this.frm.doc.__onload.backflush_based_on === 'BOM');
+ if (["Purchase Receipt", "Purchase Invoice"].includes(this.frm.doc.doctype)) {
+ this.frm.fields_dict.supplied_items.grid.update_docfield_property(
+ "consumed_qty",
+ "read_only",
+ this.frm.doc.__onload && this.frm.doc.__onload.backflush_based_on === "BOM"
+ );
- this.frm.set_df_property('supplied_items', 'cannot_add_rows', 1);
- this.frm.set_df_property('supplied_items', 'cannot_delete_rows', 1);
+ this.frm.set_df_property("supplied_items", "cannot_add_rows", 1);
+ this.frm.set_df_property("supplied_items", "cannot_delete_rows", 1);
}
}
supplier() {
var me = this;
- erpnext.utils.get_party_details(this.frm, null, null, function(){
+ erpnext.utils.get_party_details(this.frm, null, null, function () {
me.apply_price_list();
});
}
- company(){
- if(!frappe.meta.has_field(this.frm.doc.doctype, "billing_address")) return;
+ company() {
+ if (!frappe.meta.has_field(this.frm.doc.doctype, "billing_address")) return;
frappe.call({
method: "erpnext.setup.doctype.company.company.get_billing_shipping_address",
args: {
name: this.frm.doc.company,
- billing_address:this.frm.doc.billing_address,
- shipping_address: this.frm.doc.shipping_address
+ billing_address: this.frm.doc.billing_address,
+ shipping_address: this.frm.doc.shipping_address,
},
callback: (r) => {
this.frm.set_value("billing_address", r.message.primary_address || "");
- if(!frappe.meta.has_field(this.frm.doc.doctype, "shipping_address")) return;
+ if (!frappe.meta.has_field(this.frm.doc.doctype, "shipping_address")) return;
this.frm.set_value("shipping_address", r.message.shipping_address || "");
},
});
- erpnext.utils.set_letter_head(this.frm)
+ erpnext.utils.set_letter_head(this.frm);
}
supplier_address() {
erpnext.utils.get_address_display(this.frm);
- erpnext.utils.set_taxes_from_address(this.frm, "supplier_address", "supplier_address", "supplier_address");
+ erpnext.utils.set_taxes_from_address(
+ this.frm,
+ "supplier_address",
+ "supplier_address",
+ "supplier_address"
+ );
}
buying_price_list() {
@@ -201,24 +209,33 @@ erpnext.buying = {
}
qty(doc, cdt, cdn) {
- if ((doc.doctype == "Purchase Receipt") || (doc.doctype == "Purchase Invoice" && doc.update_stock)) {
- this.calculate_received_qty(doc, cdt, cdn)
+ if (
+ doc.doctype == "Purchase Receipt" ||
+ (doc.doctype == "Purchase Invoice" && doc.update_stock)
+ ) {
+ this.calculate_received_qty(doc, cdt, cdn);
}
super.qty(doc, cdt, cdn);
}
rejected_qty(doc, cdt, cdn) {
- this.calculate_received_qty(doc, cdt, cdn)
+ this.calculate_received_qty(doc, cdt, cdn);
}
- calculate_received_qty(doc, cdt, cdn){
+ calculate_received_qty(doc, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn);
frappe.model.round_floats_in(item, ["qty", "rejected_qty"]);
- if(!doc.is_return && this.validate_negative_quantity(cdt, cdn, item, ["qty", "rejected_qty"])){ return }
+ if (
+ !doc.is_return &&
+ this.validate_negative_quantity(cdt, cdn, item, ["qty", "rejected_qty"])
+ ) {
+ return;
+ }
let received_qty = flt(item.qty + item.rejected_qty, precision("received_qty", item));
- let received_stock_qty = flt(item.conversion_factor, precision("conversion_factor", item)) * flt(received_qty);
+ let received_stock_qty =
+ flt(item.conversion_factor, precision("conversion_factor", item)) * flt(received_qty);
frappe.model.set_value(cdt, cdn, "received_qty", received_qty);
frappe.model.set_value(cdt, cdn, "received_stock_qty", received_stock_qty);
@@ -228,24 +245,32 @@ erpnext.buying = {
super.batch_no(doc, cdt, cdn);
}
- validate_negative_quantity(cdt, cdn, item, fieldnames){
- if(!item || !fieldnames) { return }
+ validate_negative_quantity(cdt, cdn, item, fieldnames) {
+ if (!item || !fieldnames) {
+ return;
+ }
var is_negative_qty = false;
- for(var i = 0; i{0} is invalid", [row.manufacturer_part_no]),
- title: __("Invalid Part Number")
- }
+ message: __("Manufacturer Part Number {0} is invalid", [
+ row.manufacturer_part_no,
+ ]),
+ title: __("Invalid Part Number"),
+ };
frappe.throw(msg);
}
}
@@ -384,40 +433,42 @@ erpnext.buying = {
let me = this;
let fields = ["has_batch_no", "has_serial_no"];
- frappe.db.get_value("Item", item.item_code, fields)
- .then((r) => {
- if (r.message && (r.message.has_batch_no || r.message.has_serial_no)) {
- fields.forEach((field) => {
- item[field] = r.message[field];
- });
+ frappe.db.get_value("Item", item.item_code, fields).then((r) => {
+ if (r.message && (r.message.has_batch_no || r.message.has_serial_no)) {
+ fields.forEach((field) => {
+ item[field] = r.message[field];
+ });
- item.type_of_transaction = item.qty > 0 ? "Inward" : "Outward";
- item.is_rejected = false;
+ item.type_of_transaction = item.qty > 0 ? "Inward" : "Outward";
+ item.is_rejected = false;
- new erpnext.SerialBatchPackageSelector(
- me.frm, item, (r) => {
- if (r) {
- let qty = Math.abs(r.total_qty);
- if (doc.is_return) {
- qty = qty * -1;
- }
-
- let update_values = {
- "serial_and_batch_bundle": r.name,
- "use_serial_batch_fields": 0,
- "qty": qty / flt(item.conversion_factor || 1, precision("conversion_factor", item))
- }
-
- if (r.warehouse) {
- update_values["warehouse"] = r.warehouse;
- }
-
- frappe.model.set_value(item.doctype, item.name, update_values);
- }
+ new erpnext.SerialBatchPackageSelector(me.frm, item, (r) => {
+ if (r) {
+ let qty = Math.abs(r.total_qty);
+ if (doc.is_return) {
+ qty = qty * -1;
}
- );
- }
- });
+
+ let update_values = {
+ serial_and_batch_bundle: r.name,
+ use_serial_batch_fields: 0,
+ qty:
+ qty /
+ flt(
+ item.conversion_factor || 1,
+ precision("conversion_factor", item)
+ ),
+ };
+
+ if (r.warehouse) {
+ update_values["warehouse"] = r.warehouse;
+ }
+
+ frappe.model.set_value(item.doctype, item.name, update_values);
+ }
+ });
+ }
+ });
}
add_serial_batch_for_rejected_qty(doc, cdt, cdn) {
@@ -425,142 +476,147 @@ erpnext.buying = {
let me = this;
let fields = ["has_batch_no", "has_serial_no"];
- frappe.db.get_value("Item", item.item_code, fields)
- .then((r) => {
- if (r.message && (r.message.has_batch_no || r.message.has_serial_no)) {
- fields.forEach((field) => {
- item[field] = r.message[field];
- });
+ frappe.db.get_value("Item", item.item_code, fields).then((r) => {
+ if (r.message && (r.message.has_batch_no || r.message.has_serial_no)) {
+ fields.forEach((field) => {
+ item[field] = r.message[field];
+ });
- item.type_of_transaction = !doc.is_return > 0 ? "Inward" : "Outward";
- item.is_rejected = true;
+ item.type_of_transaction = !doc.is_return > 0 ? "Inward" : "Outward";
+ item.is_rejected = true;
- new erpnext.SerialBatchPackageSelector(
- me.frm, item, (r) => {
- if (r) {
- let qty = Math.abs(r.total_qty);
- if (doc.is_return) {
- qty = qty * -1;
- }
-
- let update_values = {
- "rejected_serial_and_batch_bundle": r.name,
- "use_serial_batch_fields": 0,
- "rejected_qty": qty / flt(item.conversion_factor || 1, precision("conversion_factor", item))
- }
-
- if (r.warehouse) {
- update_values["rejected_warehouse"] = r.warehouse;
- }
-
- frappe.model.set_value(item.doctype, item.name, update_values);
- }
+ new erpnext.SerialBatchPackageSelector(me.frm, item, (r) => {
+ if (r) {
+ let qty = Math.abs(r.total_qty);
+ if (doc.is_return) {
+ qty = qty * -1;
}
- );
- }
- });
+
+ let update_values = {
+ rejected_serial_and_batch_bundle: r.name,
+ use_serial_batch_fields: 0,
+ rejected_qty:
+ qty /
+ flt(
+ item.conversion_factor || 1,
+ precision("conversion_factor", item)
+ ),
+ };
+
+ if (r.warehouse) {
+ update_values["rejected_warehouse"] = r.warehouse;
+ }
+
+ frappe.model.set_value(item.doctype, item.name, update_values);
+ }
+ });
+ }
+ });
}
};
- }
-}
+ },
+};
-erpnext.buying.link_to_mrs = function(frm) {
+erpnext.buying.link_to_mrs = function (frm) {
frappe.call({
method: "erpnext.buying.utils.get_linked_material_requests",
- args:{
- items: frm.doc.items.map((item) => item.item_code)
+ args: {
+ items: frm.doc.items.map((item) => item.item_code),
},
- callback: function(r) {
+ callback: function (r) {
if (!r.message || r.message.length == 0) {
frappe.throw({
message: __("No pending Material Requests found to link for the given items."),
- title: __("Note")
+ title: __("Note"),
});
}
var item_length = frm.doc.items.length;
for (let item of frm.doc.items) {
var qty = item.qty;
- (r.message[0] || []).forEach(function(d) {
- if (d.qty > 0 && qty > 0 && item.item_code == d.item_code && !item.material_request_item)
- {
+ (r.message[0] || []).forEach(function (d) {
+ if (
+ d.qty > 0 &&
+ qty > 0 &&
+ item.item_code == d.item_code &&
+ !item.material_request_item
+ ) {
item.material_request = d.mr_name;
item.material_request_item = d.mr_item;
var my_qty = Math.min(qty, d.qty);
qty = qty - my_qty;
d.qty = d.qty - my_qty;
- item.stock_qty = my_qty*item.conversion_factor;
+ item.stock_qty = my_qty * item.conversion_factor;
item.qty = my_qty;
- frappe.msgprint("Assigning " + d.mr_name + " to " + d.item_code + " (row " + item.idx + ")");
- if (qty > 0)
- {
+ frappe.msgprint(
+ "Assigning " + d.mr_name + " to " + d.item_code + " (row " + item.idx + ")"
+ );
+ if (qty > 0) {
frappe.msgprint("Splitting " + qty + " units of " + d.item_code);
var newrow = frappe.model.add_child(frm.doc, item.doctype, "items");
item_length++;
- for (var key in item)
- {
+ for (var key in item) {
newrow[key] = item[key];
}
newrow.idx = item_length;
- newrow["stock_qty"] = newrow.conversion_factor*qty;
+ newrow["stock_qty"] = newrow.conversion_factor * qty;
newrow["qty"] = qty;
newrow["material_request"] = "";
newrow["material_request_item"] = "";
-
}
}
});
}
refresh_field("items");
- }
+ },
});
-}
+};
-erpnext.buying.get_default_bom = function(frm) {
- $.each(frm.doc["items"] || [], function(i, d) {
+erpnext.buying.get_default_bom = function (frm) {
+ $.each(frm.doc["items"] || [], function (i, d) {
if (d.item_code && d.bom === "") {
return frappe.call({
type: "GET",
method: "erpnext.stock.get_item_details.get_default_bom",
args: {
- "item_code": d.item_code,
+ item_code: d.item_code,
},
- callback: function(r) {
- if(r) {
+ callback: function (r) {
+ if (r) {
frappe.model.set_value(d.doctype, d.name, "bom", r.message);
}
- }
- })
+ },
+ });
}
});
-}
+};
-erpnext.buying.get_items_from_product_bundle = function(frm) {
+erpnext.buying.get_items_from_product_bundle = function (frm) {
var dialog = new frappe.ui.Dialog({
title: __("Get Items from Product Bundle"),
fields: [
{
- "fieldtype": "Link",
- "label": __("Product Bundle"),
- "fieldname": "product_bundle",
- "options":"Product Bundle",
- "reqd": 1
+ fieldtype: "Link",
+ label: __("Product Bundle"),
+ fieldname: "product_bundle",
+ options: "Product Bundle",
+ reqd: 1,
},
{
- "fieldtype": "Currency",
- "label": __("Quantity"),
- "fieldname": "quantity",
- "reqd": 1,
- "default": 1
- }
+ fieldtype: "Currency",
+ label: __("Quantity"),
+ fieldname: "quantity",
+ reqd: 1,
+ default: 1,
+ },
],
- primary_action_label: 'Get Items',
- primary_action(args){
- if(!args) return;
+ primary_action_label: "Get Items",
+ primary_action(args) {
+ if (!args) return;
dialog.hide();
return frappe.call({
type: "GET",
@@ -581,44 +637,44 @@ erpnext.buying.get_items_from_product_bundle = function(frm) {
is_subcontracted: frm.doc.is_subcontracted,
transaction_date: frm.doc.transaction_date || frm.doc.posting_date,
ignore_pricing_rule: frm.doc.ignore_pricing_rule,
- doctype: frm.doc.doctype
+ doctype: frm.doc.doctype,
},
},
freeze: true,
- callback: function(r) {
- const first_row_is_empty = function(child_table){
- if($.isArray(child_table) && child_table.length > 0) {
+ callback: function (r) {
+ const first_row_is_empty = function (child_table) {
+ if ($.isArray(child_table) && child_table.length > 0) {
return !child_table[0].item_code;
}
return false;
};
- const remove_empty_first_row = function(frm){
- if (first_row_is_empty(frm.doc.items)){
- frm.doc.items = frm.doc.items.splice(1);
+ const remove_empty_first_row = function (frm) {
+ if (first_row_is_empty(frm.doc.items)) {
+ frm.doc.items = frm.doc.items.splice(1);
}
};
- if(!r.exc && r.message) {
+ if (!r.exc && r.message) {
remove_empty_first_row(frm);
- for (var i=0; i< r.message.length; i++) {
+ for (var i = 0; i < r.message.length; i++) {
var d = frm.add_child("items");
var item = r.message[i];
- for (var key in item) {
+ for (var key in item) {
if (!is_null(item[key]) && key !== "doctype") {
d[key] = item[key];
}
}
- if(frappe.meta.get_docfield(d.doctype, "price_list_rate", d.name)) {
+ if (frappe.meta.get_docfield(d.doctype, "price_list_rate", d.name)) {
frm.script_manager.trigger("price_list_rate", d.doctype, d.name);
}
}
frm.refresh_field("items");
}
- }
- })
- }
+ },
+ });
+ },
});
dialog.show();
-}
+};
diff --git a/erpnext/public/js/controllers/stock_controller.js b/erpnext/public/js/controllers/stock_controller.js
index bc2df9c388d..a205412e75d 100644
--- a/erpnext/public/js/controllers/stock_controller.js
+++ b/erpnext/public/js/controllers/stock_controller.js
@@ -11,13 +11,13 @@ erpnext.stock.StockController = class StockController extends frappe.ui.form.Con
}
}
- barcode(doc, cdt, cdn) {
+ barcode(doc, cdt, cdn) {
let row = locals[cdt][cdn];
if (row.barcode) {
erpnext.stock.utils.set_item_details_using_barcode(this.frm, row, (r) => {
frappe.model.set_value(cdt, cdn, {
- "item_code": r.message.item_code,
- "qty": 1,
+ item_code: r.message.item_code,
+ qty: 1,
});
});
}
@@ -25,74 +25,81 @@ erpnext.stock.StockController = class StockController extends frappe.ui.form.Con
setup_warehouse_query() {
var me = this;
- erpnext.queries.setup_queries(this.frm, "Warehouse", function() {
+ erpnext.queries.setup_queries(this.frm, "Warehouse", function () {
return erpnext.queries.warehouse(me.frm.doc);
});
}
setup_posting_date_time_check() {
// make posting date default and read only unless explictly checked
- frappe.ui.form.on(this.frm.doctype, 'set_posting_date_and_time_read_only', function(frm) {
- if(frm.doc.docstatus == 0 && frm.doc.set_posting_time) {
- frm.set_df_property('posting_date', 'read_only', 0);
- frm.set_df_property('posting_time', 'read_only', 0);
+ frappe.ui.form.on(this.frm.doctype, "set_posting_date_and_time_read_only", function (frm) {
+ if (frm.doc.docstatus == 0 && frm.doc.set_posting_time) {
+ frm.set_df_property("posting_date", "read_only", 0);
+ frm.set_df_property("posting_time", "read_only", 0);
} else {
- frm.set_df_property('posting_date', 'read_only', 1);
- frm.set_df_property('posting_time', 'read_only', 1);
+ frm.set_df_property("posting_date", "read_only", 1);
+ frm.set_df_property("posting_time", "read_only", 1);
}
- })
-
- frappe.ui.form.on(this.frm.doctype, 'set_posting_time', function(frm) {
- frm.trigger('set_posting_date_and_time_read_only');
});
- frappe.ui.form.on(this.frm.doctype, 'refresh', function(frm) {
+ frappe.ui.form.on(this.frm.doctype, "set_posting_time", function (frm) {
+ frm.trigger("set_posting_date_and_time_read_only");
+ });
+
+ frappe.ui.form.on(this.frm.doctype, "refresh", function (frm) {
// set default posting date / time
- if(frm.doc.docstatus==0) {
- if(!frm.doc.posting_date) {
- frm.set_value('posting_date', frappe.datetime.nowdate());
+ if (frm.doc.docstatus == 0) {
+ if (!frm.doc.posting_date) {
+ frm.set_value("posting_date", frappe.datetime.nowdate());
}
- if(!frm.doc.posting_time) {
- frm.set_value('posting_time', frappe.datetime.now_time());
+ if (!frm.doc.posting_time) {
+ frm.set_value("posting_time", frappe.datetime.now_time());
}
- frm.trigger('set_posting_date_and_time_read_only');
+ frm.trigger("set_posting_date_and_time_read_only");
}
});
}
show_stock_ledger() {
var me = this;
- if(this.frm.doc.docstatus > 0) {
- cur_frm.add_custom_button(__("Stock Ledger"), function() {
- frappe.route_options = {
- voucher_no: me.frm.doc.name,
- from_date: me.frm.doc.posting_date,
- to_date: moment(me.frm.doc.modified).format('YYYY-MM-DD'),
- company: me.frm.doc.company,
- show_cancelled_entries: me.frm.doc.docstatus === 2,
- ignore_prepared_report: true
- };
- frappe.set_route("query-report", "Stock Ledger");
- }, __("View"));
+ if (this.frm.doc.docstatus > 0) {
+ cur_frm.add_custom_button(
+ __("Stock Ledger"),
+ function () {
+ frappe.route_options = {
+ voucher_no: me.frm.doc.name,
+ from_date: me.frm.doc.posting_date,
+ to_date: moment(me.frm.doc.modified).format("YYYY-MM-DD"),
+ company: me.frm.doc.company,
+ show_cancelled_entries: me.frm.doc.docstatus === 2,
+ ignore_prepared_report: true,
+ };
+ frappe.set_route("query-report", "Stock Ledger");
+ },
+ __("View")
+ );
}
-
}
show_general_ledger() {
let me = this;
- if(this.frm.doc.docstatus > 0) {
- cur_frm.add_custom_button(__('Accounting Ledger'), function() {
- frappe.route_options = {
- voucher_no: me.frm.doc.name,
- from_date: me.frm.doc.posting_date,
- to_date: moment(me.frm.doc.modified).format('YYYY-MM-DD'),
- company: me.frm.doc.company,
- categorize_by: "Categorize by Voucher (Consolidated)",
- show_cancelled_entries: me.frm.doc.docstatus === 2,
- ignore_prepared_report: true
- };
- frappe.set_route("query-report", "General Ledger");
- }, __("View"));
+ if (this.frm.doc.docstatus > 0) {
+ cur_frm.add_custom_button(
+ __("Accounting Ledger"),
+ function () {
+ frappe.route_options = {
+ voucher_no: me.frm.doc.name,
+ from_date: me.frm.doc.posting_date,
+ to_date: moment(me.frm.doc.modified).format("YYYY-MM-DD"),
+ company: me.frm.doc.company,
+ categorize_by: "Categorize by Voucher (Consolidated)",
+ show_cancelled_entries: me.frm.doc.docstatus === 2,
+ ignore_prepared_report: true,
+ };
+ frappe.set_route("query-report", "General Ledger");
+ },
+ __("View")
+ );
}
}
};
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index 125f2ca8b65..e8903e8b9a8 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -13,22 +13,22 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
effective_item_rate = item.blanket_order_rate;
}
if (item.margin_type == "Percentage") {
- item.rate_with_margin = flt(effective_item_rate)
- + flt(effective_item_rate) * ( flt(item.margin_rate_or_amount) / 100);
+ item.rate_with_margin =
+ flt(effective_item_rate) + flt(effective_item_rate) * (flt(item.margin_rate_or_amount) / 100);
} else {
item.rate_with_margin = flt(effective_item_rate) + flt(item.margin_rate_or_amount);
}
item.base_rate_with_margin = flt(item.rate_with_margin) * flt(this.frm.doc.conversion_rate);
- item_rate = flt(item.rate_with_margin , precision("rate", item));
+ item_rate = flt(item.rate_with_margin, precision("rate", item));
if (item.discount_percentage && !item.discount_amount) {
- item.discount_amount = flt(item.rate_with_margin) * flt(item.discount_percentage) / 100;
+ item.discount_amount = (flt(item.rate_with_margin) * flt(item.discount_percentage)) / 100;
}
if (item.discount_amount > 0) {
- item_rate = flt((item.rate_with_margin) - (item.discount_amount), precision('rate', item));
- item.discount_percentage = 100 * flt(item.discount_amount) / flt(item.rate_with_margin);
+ item_rate = flt(item.rate_with_margin - item.discount_amount, precision("rate", item));
+ item.discount_percentage = (100 * flt(item.discount_amount)) / flt(item.rate_with_margin);
}
frappe.model.set_value(item.doctype, item.name, "rate", item_rate);
@@ -52,17 +52,17 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
// Advance calculation applicable to Sales/Purchase Invoice
if (
- ["Sales Invoice", "POS Invoice", "Purchase Invoice"].includes(this.frm.doc.doctype)
- && this.frm.doc.docstatus < 2
- && !this.frm.doc.is_return
+ ["Sales Invoice", "POS Invoice", "Purchase Invoice"].includes(this.frm.doc.doctype) &&
+ this.frm.doc.docstatus < 2 &&
+ !this.frm.doc.is_return
) {
this.calculate_total_advance(update_paid_amount);
}
if (
- ["Sales Invoice", "POS Invoice"].includes(this.frm.doc.doctype)
- && this.frm.doc.is_pos
- && this.frm.doc.is_return
+ ["Sales Invoice", "POS Invoice"].includes(this.frm.doc.doctype) &&
+ this.frm.doc.is_pos &&
+ this.frm.doc.is_return
) {
await this.set_total_amount_to_default_mop();
this.calculate_paid_amount();
@@ -76,9 +76,9 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
// Update paid amount on return/debit note creation
if (
- this.frm.doc.doctype === "Purchase Invoice"
- && this.frm.doc.is_return
- && (this.frm.doc.grand_total > this.frm.doc.paid_amount)
+ this.frm.doc.doctype === "Purchase Invoice" &&
+ this.frm.doc.is_return &&
+ this.frm.doc.grand_total > this.frm.doc.paid_amount
) {
this.frm.doc.paid_amount = flt(this.frm.doc.grand_total, precision("grand_total"));
}
@@ -109,17 +109,26 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
}
validate_conversion_rate() {
- this.frm.doc.conversion_rate = flt(this.frm.doc.conversion_rate, (cur_frm) ? precision("conversion_rate") : 9);
- var conversion_rate_label = frappe.meta.get_label(this.frm.doc.doctype, "conversion_rate",
- this.frm.doc.name);
+ this.frm.doc.conversion_rate = flt(
+ this.frm.doc.conversion_rate,
+ cur_frm ? precision("conversion_rate") : 9
+ );
+ var conversion_rate_label = frappe.meta.get_label(
+ this.frm.doc.doctype,
+ "conversion_rate",
+ this.frm.doc.name
+ );
var company_currency = this.get_company_currency();
- if(!this.frm.doc.conversion_rate) {
- if(this.frm.doc.currency == company_currency) {
+ if (!this.frm.doc.conversion_rate) {
+ if (this.frm.doc.currency == company_currency) {
this.frm.set_value("conversion_rate", 1);
} else {
- const subs = [conversion_rate_label, this.frm.doc.currency, company_currency];
- const err_message = __('{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}', subs);
+ const subs = [conversion_rate_label, this.frm.doc.currency, company_currency];
+ const err_message = __(
+ "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}",
+ subs
+ );
frappe.throw(err_message);
}
}
@@ -135,12 +144,11 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
if (!(me.frm.doc.is_return || me.frm.doc.is_debit_note)) {
item.net_amount = item.amount = flt(item.rate * item.qty, precision("amount", item));
- }
- else {
+ } else {
// allow for '0' qty on Credit/Debit notes
let qty = flt(item.qty);
if (!qty) {
- qty = (me.frm.doc.is_debit_note ? 1 : -1);
+ qty = me.frm.doc.is_debit_note ? 1 : -1;
if (me.frm.doc.doctype !== "Purchase Receipt" && me.frm.doc.is_return === 1) {
// In case of Purchase Receipt, qty can be 0 if all items are rejected
qty = flt(item.qty);
@@ -153,35 +161,53 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
item.item_tax_amount = 0.0;
item.total_weight = flt(item.weight_per_unit * item.stock_qty);
- me.set_in_company_currency(item, ["price_list_rate", "rate", "amount", "net_rate", "net_amount"]);
+ me.set_in_company_currency(item, [
+ "price_list_rate",
+ "rate",
+ "amount",
+ "net_rate",
+ "net_amount",
+ ]);
}
}
}
set_in_company_currency(doc, fields) {
var me = this;
- $.each(fields, function(i, f) {
- doc["base_"+f] = flt(flt(doc[f], precision(f, doc)) * me.frm.doc.conversion_rate, precision("base_" + f, doc));
+ $.each(fields, function (i, f) {
+ doc["base_" + f] = flt(
+ flt(doc[f], precision(f, doc)) * me.frm.doc.conversion_rate,
+ precision("base_" + f, doc)
+ );
});
}
initialize_taxes() {
var me = this;
- $.each(this.frm.doc["taxes"] || [], function(i, tax) {
+ $.each(this.frm.doc["taxes"] || [], function (i, tax) {
if (!tax.dont_recompute_tax) {
tax.item_wise_tax_detail = {};
}
- var tax_fields = ["total", "tax_amount_after_discount_amount",
- "tax_amount_for_current_item", "grand_total_for_current_item",
- "tax_fraction_for_current_item", "grand_total_fraction_for_current_item"];
+ var tax_fields = [
+ "total",
+ "tax_amount_after_discount_amount",
+ "tax_amount_for_current_item",
+ "grand_total_for_current_item",
+ "tax_fraction_for_current_item",
+ "grand_total_fraction_for_current_item",
+ ];
- if (cstr(tax.charge_type) != "Actual" &&
- !(me.discount_amount_applied && me.frm.doc.apply_discount_on=="Grand Total")) {
+ if (
+ cstr(tax.charge_type) != "Actual" &&
+ !(me.discount_amount_applied && me.frm.doc.apply_discount_on == "Grand Total")
+ ) {
tax_fields.push("tax_amount");
}
- $.each(tax_fields, function(i, fieldname) { tax[fieldname] = 0.0; });
+ $.each(tax_fields, function (i, fieldname) {
+ tax[fieldname] = 0.0;
+ });
if (!this.discount_amount_applied) {
erpnext.accounts.taxes.validate_taxes_and_charges(tax.doctype, tax.name);
@@ -197,24 +223,24 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
if (me.frm.doc.company) {
frappe.call({
- "method": "erpnext.controllers.taxes_and_totals.get_round_off_applicable_accounts",
- "args": {
- "company": me.frm.doc.company,
- "account_list": frappe.flags.round_off_applicable_accounts
+ method: "erpnext.controllers.taxes_and_totals.get_round_off_applicable_accounts",
+ args: {
+ company: me.frm.doc.company,
+ account_list: frappe.flags.round_off_applicable_accounts,
},
callback(r) {
if (r.message) {
frappe.flags.round_off_applicable_accounts.push(...r.message);
}
- }
+ },
});
}
frappe.call({
method: "erpnext.controllers.taxes_and_totals.get_rounding_tax_settings",
- callback: function(r) {
+ callback: function (r) {
frappe.flags.round_off_settings = r.message;
- }
+ },
});
}
@@ -222,25 +248,25 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
var me = this;
var has_inclusive_tax = false;
- $.each(me.frm.doc["taxes"] || [], function(i, row) {
- if(cint(row.included_in_print_rate)) has_inclusive_tax = true;
+ $.each(me.frm.doc["taxes"] || [], function (i, row) {
+ if (cint(row.included_in_print_rate)) has_inclusive_tax = true;
});
- if(has_inclusive_tax==false) return;
+ if (has_inclusive_tax == false) return;
- $.each(this.frm.doc.items || [], function(n, item) {
+ $.each(this.frm.doc.items || [], function (n, item) {
var item_tax_map = me._load_item_tax_rate(item.item_tax_rate);
var cumulated_tax_fraction = 0.0;
var total_inclusive_tax_amount_per_qty = 0;
- $.each(me.frm.doc["taxes"] || [], function(i, tax) {
+ $.each(me.frm.doc["taxes"] || [], function (i, tax) {
var current_tax_fraction = me.get_current_tax_fraction(tax, item_tax_map);
tax.tax_fraction_for_current_item = current_tax_fraction[0];
var inclusive_tax_amount_per_qty = current_tax_fraction[1];
- if(i==0) {
+ if (i == 0) {
tax.grand_total_fraction_for_current_item = 1 + tax.tax_fraction_for_current_item;
} else {
tax.grand_total_fraction_for_current_item =
- me.frm.doc["taxes"][i-1].grand_total_fraction_for_current_item +
+ me.frm.doc["taxes"][i - 1].grand_total_fraction_for_current_item +
tax.tax_fraction_for_current_item;
}
@@ -248,7 +274,11 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
total_inclusive_tax_amount_per_qty += inclusive_tax_amount_per_qty * flt(item.qty);
});
- if(!me.discount_amount_applied && item.qty && (total_inclusive_tax_amount_per_qty || cumulated_tax_fraction)) {
+ if (
+ !me.discount_amount_applied &&
+ item.qty &&
+ (total_inclusive_tax_amount_per_qty || cumulated_tax_fraction)
+ ) {
var amount = flt(item.amount) - total_inclusive_tax_amount_per_qty;
item.net_amount = flt(amount / (1 + cumulated_tax_fraction), precision("net_amount", item));
item.net_rate = item.qty ? flt(item.net_amount / item.qty, precision("net_rate", item)) : 0;
@@ -264,25 +294,25 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
var current_tax_fraction = 0.0;
var inclusive_tax_amount_per_qty = 0;
- if(cint(tax.included_in_print_rate)) {
+ if (cint(tax.included_in_print_rate)) {
var tax_rate = this._get_tax_rate(tax, item_tax_map);
- if(tax.charge_type == "On Net Total") {
- current_tax_fraction = (tax_rate / 100.0);
-
- } else if(tax.charge_type == "On Previous Row Amount") {
- current_tax_fraction = (tax_rate / 100.0) *
+ if (tax.charge_type == "On Net Total") {
+ current_tax_fraction = tax_rate / 100.0;
+ } else if (tax.charge_type == "On Previous Row Amount") {
+ current_tax_fraction =
+ (tax_rate / 100.0) *
this.frm.doc["taxes"][cint(tax.row_id) - 1].tax_fraction_for_current_item;
-
- } else if(tax.charge_type == "On Previous Row Total") {
- current_tax_fraction = (tax_rate / 100.0) *
+ } else if (tax.charge_type == "On Previous Row Total") {
+ current_tax_fraction =
+ (tax_rate / 100.0) *
this.frm.doc["taxes"][cint(tax.row_id) - 1].grand_total_fraction_for_current_item;
} else if (tax.charge_type == "On Item Quantity") {
inclusive_tax_amount_per_qty = flt(tax_rate);
}
}
- if(tax.add_deduct_tax && tax.add_deduct_tax == "Deduct") {
+ if (tax.add_deduct_tax && tax.add_deduct_tax == "Deduct") {
current_tax_fraction *= -1;
inclusive_tax_amount_per_qty *= -1;
}
@@ -290,15 +320,21 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
}
_get_tax_rate(tax, item_tax_map) {
- return (Object.keys(item_tax_map).indexOf(tax.account_head) != -1) ?
- flt(item_tax_map[tax.account_head], precision("rate", tax)) : tax.rate;
+ return Object.keys(item_tax_map).indexOf(tax.account_head) != -1
+ ? flt(item_tax_map[tax.account_head], precision("rate", tax))
+ : tax.rate;
}
calculate_net_total() {
var me = this;
- this.frm.doc.total_qty = this.frm.doc.total = this.frm.doc.base_total = this.frm.doc.net_total = this.frm.doc.base_net_total = 0.0;
+ this.frm.doc.total_qty =
+ this.frm.doc.total =
+ this.frm.doc.base_total =
+ this.frm.doc.net_total =
+ this.frm.doc.base_net_total =
+ 0.0;
- $.each(this.frm._items || [], function(i, item) {
+ $.each(this.frm._items || [], function (i, item) {
me.frm.doc.total += item.amount;
me.frm.doc.total_qty += item.qty;
me.frm.doc.base_total += item.base_amount;
@@ -325,12 +361,12 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
let me = this;
if (item_tax_map && cint(frappe.defaults.get_default("add_taxes_from_item_tax_template"))) {
- if (typeof (item_tax_map) == "string") {
+ if (typeof item_tax_map == "string") {
item_tax_map = JSON.parse(item_tax_map);
}
- $.each(item_tax_map, function(tax, rate) {
- let found = (me.frm.doc.taxes || []).find(d => d.account_head === tax);
+ $.each(item_tax_map, function (tax, rate) {
+ let found = (me.frm.doc.taxes || []).find((d) => d.account_head === tax);
if (!found) {
let child = frappe.model.add_child(me.frm.doc, "taxes");
child.charge_type = "On Net Total";
@@ -350,15 +386,15 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
var actual_tax_dict = {};
// maintain actual tax rate based on idx
- $.each(doc.taxes, function(i, tax) {
+ $.each(doc.taxes, function (i, tax) {
if (tax.charge_type == "Actual") {
actual_tax_dict[tax.idx] = flt(tax.tax_amount, precision("tax_amount", tax));
}
});
- $.each(this.frm._items || [], function(n, item) {
+ $.each(this.frm._items || [], function (n, item) {
var item_tax_map = me._load_item_tax_rate(item.item_tax_rate);
- $.each(doc.taxes, function(i, tax) {
+ $.each(doc.taxes, function (i, tax) {
// tax_amount represents the amount of tax for the current step
var current_tax_amount = me.get_current_tax_amount(item, tax, item_tax_map);
if (frappe.flags.round_row_wise_tax) {
@@ -374,8 +410,10 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
}
// accumulate tax amount into tax.tax_amount
- if (tax.charge_type != "Actual" &&
- !(me.discount_amount_applied && me.frm.doc.apply_discount_on=="Grand Total")) {
+ if (
+ tax.charge_type != "Actual" &&
+ !(me.discount_amount_applied && me.frm.doc.apply_discount_on == "Grand Total")
+ ) {
tax.tax_amount += current_tax_amount;
}
@@ -387,32 +425,39 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
tax.tax_amount_after_discount_amount += current_tax_amount;
// for buying
- if(tax.category) {
+ if (tax.category) {
// if just for valuation, do not add the tax amount in total
// hence, setting it as 0 for further steps
- current_tax_amount = (tax.category == "Valuation") ? 0.0 : current_tax_amount;
+ current_tax_amount = tax.category == "Valuation" ? 0.0 : current_tax_amount;
- current_tax_amount *= (tax.add_deduct_tax == "Deduct") ? -1.0 : 1.0;
+ current_tax_amount *= tax.add_deduct_tax == "Deduct" ? -1.0 : 1.0;
}
// note: grand_total_for_current_item contains the contribution of
// item's amount, previously applied tax and the current tax on that item
- if(i==0) {
+ if (i == 0) {
tax.grand_total_for_current_item = flt(item.net_amount + current_tax_amount);
} else {
- tax.grand_total_for_current_item =
- flt(me.frm.doc["taxes"][i-1].grand_total_for_current_item + current_tax_amount);
+ tax.grand_total_for_current_item = flt(
+ me.frm.doc["taxes"][i - 1].grand_total_for_current_item + current_tax_amount
+ );
}
});
});
const discount_amount_applied = this.discount_amount_applied;
- if (doc.apply_discount_on === "Grand Total" && (discount_amount_applied || doc.discount_amount || doc.additional_discount_percentage)) {
+ if (
+ doc.apply_discount_on === "Grand Total" &&
+ (discount_amount_applied || doc.discount_amount || doc.additional_discount_percentage)
+ ) {
const tax_amount_precision = precision("tax_amount", doc.taxes[0]);
for (const [i, tax] of doc.taxes.entries()) {
if (discount_amount_applied)
- tax.tax_amount_after_discount_amount = flt(tax.tax_amount_after_discount_amount, tax_amount_precision);
+ tax.tax_amount_after_discount_amount = flt(
+ tax.tax_amount_after_discount_amount,
+ tax_amount_precision
+ );
this.set_cumulative_total(i, tax);
}
@@ -421,14 +466,17 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
this.grand_total_for_distributing_discount = doc.taxes[doc.taxes.length - 1].total;
} else {
this.grand_total_diff = flt(
- this.grand_total_for_distributing_discount - doc.discount_amount - doc.taxes[doc.taxes.length - 1].total, precision("grand_total"));
+ this.grand_total_for_distributing_discount -
+ doc.discount_amount -
+ doc.taxes[doc.taxes.length - 1].total,
+ precision("grand_total")
+ );
}
}
for (const [i, tax] of doc.taxes.entries()) {
me.round_off_totals(tax);
- me.set_in_company_currency(tax,
- ["tax_amount", "tax_amount_after_discount_amount"]);
+ me.set_in_company_currency(tax, ["tax_amount", "tax_amount_after_discount_amount"]);
me.round_off_base_values(tax);
@@ -441,16 +489,18 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
set_cumulative_total(row_idx, tax) {
var tax_amount = tax.tax_amount_after_discount_amount;
- if (tax.category == 'Valuation') {
+ if (tax.category == "Valuation") {
tax_amount = 0;
}
- if (tax.add_deduct_tax == "Deduct") { tax_amount = -1*tax_amount; }
+ if (tax.add_deduct_tax == "Deduct") {
+ tax_amount = -1 * tax_amount;
+ }
- if(row_idx==0) {
+ if (row_idx == 0) {
tax.total = flt(this.frm.doc.net_total + tax_amount, precision("total", tax));
} else {
- tax.total = flt(this.frm.doc["taxes"][row_idx-1].total + tax_amount, precision("total", tax));
+ tax.total = flt(this.frm.doc["taxes"][row_idx - 1].total + tax_amount, precision("total", tax));
}
}
@@ -464,35 +514,38 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
var current_net_amount = 0.0;
// To set row_id by default as previous row.
- if(["On Previous Row Amount", "On Previous Row Total"].includes(tax.charge_type)) {
+ if (["On Previous Row Amount", "On Previous Row Total"].includes(tax.charge_type)) {
if (tax.idx === 1) {
frappe.throw(
- __("Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row"));
+ __(
+ "Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row"
+ )
+ );
}
if (!tax.row_id) {
tax.row_id = tax.idx - 1;
}
}
- if(tax.charge_type == "Actual") {
- current_net_amount = item.net_amount
+ if (tax.charge_type == "Actual") {
+ current_net_amount = item.net_amount;
// distribute the tax amount proportionally to each item row
var actual = flt(tax.tax_amount, precision("tax_amount", tax));
- current_tax_amount = this.frm.doc.net_total ?
- ((item.net_amount / this.frm.doc.net_total) * actual) : 0.0;
-
- } else if(tax.charge_type == "On Net Total") {
+ current_tax_amount = this.frm.doc.net_total
+ ? (item.net_amount / this.frm.doc.net_total) * actual
+ : 0.0;
+ } else if (tax.charge_type == "On Net Total") {
if (tax.account_head in item_tax_map) {
- current_net_amount = item.net_amount
- };
+ current_net_amount = item.net_amount;
+ }
current_tax_amount = (tax_rate / 100.0) * item.net_amount;
- } else if(tax.charge_type == "On Previous Row Amount") {
- current_net_amount = this.frm.doc["taxes"][cint(tax.row_id) - 1].tax_amount_for_current_item
- current_tax_amount = (tax_rate / 100.0) *
- this.frm.doc["taxes"][cint(tax.row_id) - 1].tax_amount_for_current_item;
- } else if(tax.charge_type == "On Previous Row Total") {
- current_net_amount = this.frm.doc["taxes"][cint(tax.row_id) - 1].grand_total_for_current_item
- current_tax_amount = (tax_rate / 100.0) *
- this.frm.doc["taxes"][cint(tax.row_id) - 1].grand_total_for_current_item;
+ } else if (tax.charge_type == "On Previous Row Amount") {
+ current_net_amount = this.frm.doc["taxes"][cint(tax.row_id) - 1].tax_amount_for_current_item;
+ current_tax_amount =
+ (tax_rate / 100.0) * this.frm.doc["taxes"][cint(tax.row_id) - 1].tax_amount_for_current_item;
+ } else if (tax.charge_type == "On Previous Row Total") {
+ current_net_amount = this.frm.doc["taxes"][cint(tax.row_id) - 1].grand_total_for_current_item;
+ current_tax_amount =
+ (tax_rate / 100.0) * this.frm.doc["taxes"][cint(tax.row_id) - 1].grand_total_for_current_item;
} else if (tax.charge_type == "On Item Quantity") {
// don't sum current net amount due to the field being a currency field
current_tax_amount = tax_rate * item.qty;
@@ -510,7 +563,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
let tax_detail = tax.item_wise_tax_detail;
let key = item.item_code || item.item_name;
- if(typeof (tax_detail) == "string") {
+ if (typeof tax_detail == "string") {
tax.item_wise_tax_detail = JSON.parse(tax.item_wise_tax_detail);
tax_detail = tax.item_wise_tax_detail;
}
@@ -538,27 +591,30 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
round_off_totals(tax) {
if (frappe.flags.round_off_applicable_accounts.includes(tax.account_head)) {
- tax.tax_amount= Math.round(tax.tax_amount);
+ tax.tax_amount = Math.round(tax.tax_amount);
tax.tax_amount_after_discount_amount = Math.round(tax.tax_amount_after_discount_amount);
}
tax.tax_amount = flt(tax.tax_amount, precision("tax_amount", tax));
- tax.tax_amount_after_discount_amount = flt(tax.tax_amount_after_discount_amount, precision("tax_amount", tax));
+ tax.tax_amount_after_discount_amount = flt(
+ tax.tax_amount_after_discount_amount,
+ precision("tax_amount", tax)
+ );
}
round_off_base_values(tax) {
if (frappe.flags.round_off_applicable_accounts.includes(tax.account_head)) {
- tax.base_tax_amount= Math.round(tax.base_tax_amount);
+ tax.base_tax_amount = Math.round(tax.base_tax_amount);
tax.base_tax_amount_after_discount_amount = Math.round(tax.base_tax_amount_after_discount_amount);
}
}
/**
- * @deprecated Use adjust_grand_total_for_inclusive_tax instead.
- */
+ * @deprecated Use adjust_grand_total_for_inclusive_tax instead.
+ */
manipulate_grand_total_for_inclusive_tax() {
// for backward compatablility - if in case used by an external application
- this.adjust_grand_total_for_inclusive_tax()
+ this.adjust_grand_total_for_inclusive_tax();
}
adjust_grand_total_for_inclusive_tax() {
@@ -567,30 +623,33 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
// if any inclusive taxes and diff
if (this.frm.doc["taxes"] && this.frm.doc["taxes"].length) {
var any_inclusive_tax = false;
- $.each(this.frm.doc.taxes || [], function(i, d) {
- if(cint(d.included_in_print_rate)) any_inclusive_tax = true;
+ $.each(this.frm.doc.taxes || [], function (i, d) {
+ if (cint(d.included_in_print_rate)) any_inclusive_tax = true;
});
if (any_inclusive_tax) {
var last_tax = me.frm.doc["taxes"].slice(-1)[0];
- var non_inclusive_tax_amount = frappe.utils.sum($.map(this.frm.doc.taxes || [],
- function(d) {
- if(!d.included_in_print_rate) {
- let tax_amount = d.category === "Valuation" ? 0 : d.tax_amount_after_discount_amount;
+ var non_inclusive_tax_amount = frappe.utils.sum(
+ $.map(this.frm.doc.taxes || [], function (d) {
+ if (!d.included_in_print_rate) {
+ let tax_amount =
+ d.category === "Valuation" ? 0 : d.tax_amount_after_discount_amount;
if (d.add_deduct_tax === "Deduct") tax_amount *= -1;
return tax_amount;
}
- }
- ));
- var diff = me.frm.doc.total + non_inclusive_tax_amount
- - flt(last_tax.total, precision("grand_total"));
+ })
+ );
+ var diff =
+ me.frm.doc.total +
+ non_inclusive_tax_amount -
+ flt(last_tax.total, precision("grand_total"));
- if(me.discount_amount_applied && me.frm.doc.discount_amount) {
+ if (me.discount_amount_applied && me.frm.doc.discount_amount) {
diff -= flt(me.frm.doc.discount_amount);
}
diff = flt(diff, precision("rounding_adjustment"));
- if ( diff && Math.abs(diff) <= (5.0 / Math.pow(10, precision("tax_amount", last_tax))) ) {
+ if (diff && Math.abs(diff) <= 5.0 / Math.pow(10, precision("tax_amount", last_tax))) {
me.grand_total_diff = diff;
}
}
@@ -603,40 +662,56 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
const tax_count = this.frm.doc.taxes?.length;
const grand_total_diff = this.grand_total_diff || 0;
- this.frm.doc.grand_total = flt(tax_count
- ? this.frm.doc["taxes"][tax_count - 1].total + grand_total_diff
- : this.frm.doc.net_total);
+ this.frm.doc.grand_total = flt(
+ tax_count ? this.frm.doc["taxes"][tax_count - 1].total + grand_total_diff : this.frm.doc.net_total
+ );
- if(["Quotation", "Sales Order", "Delivery Note", "Sales Invoice", "POS Invoice"].includes(this.frm.doc.doctype)) {
- this.frm.doc.base_grand_total = (this.frm.doc.total_taxes_and_charges) ?
- flt(this.frm.doc.grand_total * this.frm.doc.conversion_rate) : this.frm.doc.base_net_total;
+ if (
+ ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice", "POS Invoice"].includes(
+ this.frm.doc.doctype
+ )
+ ) {
+ this.frm.doc.base_grand_total = this.frm.doc.total_taxes_and_charges
+ ? flt(this.frm.doc.grand_total * this.frm.doc.conversion_rate)
+ : this.frm.doc.base_net_total;
} else {
// other charges added/deducted
this.frm.doc.taxes_and_charges_added = this.frm.doc.taxes_and_charges_deducted = 0.0;
- if(tax_count) {
- $.each(this.frm.doc["taxes"] || [], function(i, tax) {
+ if (tax_count) {
+ $.each(this.frm.doc["taxes"] || [], function (i, tax) {
if (["Valuation and Total", "Total"].includes(tax.category)) {
- if(tax.add_deduct_tax == "Add") {
+ if (tax.add_deduct_tax == "Add") {
me.frm.doc.taxes_and_charges_added += flt(tax.tax_amount_after_discount_amount);
} else {
- me.frm.doc.taxes_and_charges_deducted += flt(tax.tax_amount_after_discount_amount);
+ me.frm.doc.taxes_and_charges_deducted += flt(
+ tax.tax_amount_after_discount_amount
+ );
}
}
});
- frappe.model.round_floats_in(this.frm.doc,
- ["taxes_and_charges_added", "taxes_and_charges_deducted"]);
+ frappe.model.round_floats_in(this.frm.doc, [
+ "taxes_and_charges_added",
+ "taxes_and_charges_deducted",
+ ]);
}
- this.frm.doc.base_grand_total = flt((this.frm.doc.taxes_and_charges_added || this.frm.doc.taxes_and_charges_deducted) ?
- flt(this.frm.doc.grand_total * this.frm.doc.conversion_rate) : this.frm.doc.base_net_total);
+ this.frm.doc.base_grand_total = flt(
+ this.frm.doc.taxes_and_charges_added || this.frm.doc.taxes_and_charges_deducted
+ ? flt(this.frm.doc.grand_total * this.frm.doc.conversion_rate)
+ : this.frm.doc.base_net_total
+ );
- this.set_in_company_currency(this.frm.doc,
- ["taxes_and_charges_added", "taxes_and_charges_deducted"]);
+ this.set_in_company_currency(this.frm.doc, [
+ "taxes_and_charges_added",
+ "taxes_and_charges_deducted",
+ ]);
}
- this.frm.doc.total_taxes_and_charges = flt(this.frm.doc.grand_total - this.frm.doc.net_total
- - grand_total_diff, precision("total_taxes_and_charges"));
+ this.frm.doc.total_taxes_and_charges = flt(
+ this.frm.doc.grand_total - this.frm.doc.net_total - grand_total_diff,
+ precision("total_taxes_and_charges")
+ );
this.set_in_company_currency(this.frm.doc, ["total_taxes_and_charges"]);
@@ -649,7 +724,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
set_rounded_total() {
var disable_rounded_total = 0;
- if(frappe.meta.get_docfield(this.frm.doc.doctype, "disable_rounded_total", this.frm.doc.name)) {
+ if (frappe.meta.get_docfield(this.frm.doc.doctype, "disable_rounded_total", this.frm.doc.name)) {
disable_rounded_total = this.frm.doc.disable_rounded_total;
} else if (frappe.sys_defaults.disable_rounded_total) {
disable_rounded_total = frappe.sys_defaults.disable_rounded_total;
@@ -662,11 +737,16 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
return;
}
- if(frappe.meta.get_docfield(this.frm.doc.doctype, "rounded_total", this.frm.doc.name)) {
- this.frm.doc.rounded_total = round_based_on_smallest_currency_fraction(this.frm.doc.grand_total,
- this.frm.doc.currency, precision("rounded_total"));
- this.frm.doc.rounding_adjustment = flt(this.frm.doc.rounded_total - this.frm.doc.grand_total,
- precision("rounding_adjustment"));
+ if (frappe.meta.get_docfield(this.frm.doc.doctype, "rounded_total", this.frm.doc.name)) {
+ this.frm.doc.rounded_total = round_based_on_smallest_currency_fraction(
+ this.frm.doc.grand_total,
+ this.frm.doc.currency,
+ precision("rounded_total")
+ );
+ this.frm.doc.rounding_adjustment = flt(
+ this.frm.doc.rounded_total - this.frm.doc.grand_total,
+ precision("rounding_adjustment")
+ );
this.set_in_company_currency(this.frm.doc, ["rounding_adjustment", "rounded_total"]);
}
@@ -676,24 +756,34 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
this.frm.doc.base_in_words = this.frm.doc.in_words = "";
let items = this.frm.doc.items;
- if(items && items.length) {
- if(!frappe.meta.get_docfield(items[0].doctype, "item_tax_amount", this.frm.doctype)) {
- $.each(items || [], function(i, item) {
+ if (items && items.length) {
+ if (!frappe.meta.get_docfield(items[0].doctype, "item_tax_amount", this.frm.doctype)) {
+ $.each(items || [], function (i, item) {
delete item["item_tax_amount"];
});
}
}
- if(this.frm.doc["taxes"] && this.frm.doc["taxes"].length) {
- var temporary_fields = ["tax_amount_for_current_item", "grand_total_for_current_item",
- "tax_fraction_for_current_item", "grand_total_fraction_for_current_item"];
+ if (this.frm.doc["taxes"] && this.frm.doc["taxes"].length) {
+ var temporary_fields = [
+ "tax_amount_for_current_item",
+ "grand_total_for_current_item",
+ "tax_fraction_for_current_item",
+ "grand_total_fraction_for_current_item",
+ ];
- if(!frappe.meta.get_docfield(this.frm.doc["taxes"][0].doctype, "tax_amount_after_discount_amount", this.frm.doctype)) {
+ if (
+ !frappe.meta.get_docfield(
+ this.frm.doc["taxes"][0].doctype,
+ "tax_amount_after_discount_amount",
+ this.frm.doctype
+ )
+ ) {
temporary_fields.push("tax_amount_after_discount_amount");
}
- $.each(this.frm.doc["taxes"] || [], function(i, tax) {
- $.each(temporary_fields, function(i, fieldname) {
+ $.each(this.frm.doc["taxes"] || [], function (i, tax) {
+ $.each(temporary_fields, function (i, fieldname) {
delete tax[fieldname];
});
@@ -705,9 +795,13 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
}
set_discount_amount() {
- if(this.frm.doc.additional_discount_percentage) {
- this.frm.doc.discount_amount = flt(flt(this.frm.doc[frappe.scrub(this.frm.doc.apply_discount_on)])
- * this.frm.doc.additional_discount_percentage / 100, precision("discount_amount"));
+ if (this.frm.doc.additional_discount_percentage) {
+ this.frm.doc.discount_amount = flt(
+ (flt(this.frm.doc[frappe.scrub(this.frm.doc.apply_discount_on)]) *
+ this.frm.doc.additional_discount_percentage) /
+ 100,
+ precision("discount_amount")
+ );
}
}
@@ -717,13 +811,17 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
this.frm.doc.base_discount_amount = 0.0;
if (this.frm.doc.discount_amount) {
- if(!this.frm.doc.apply_discount_on)
- frappe.throw(__("Please select Apply Discount On"));
+ if (!this.frm.doc.apply_discount_on) frappe.throw(__("Please select Apply Discount On"));
- this.frm.doc.base_discount_amount = flt(this.frm.doc.discount_amount * this.frm.doc.conversion_rate,
- precision("base_discount_amount"));
+ this.frm.doc.base_discount_amount = flt(
+ this.frm.doc.discount_amount * this.frm.doc.conversion_rate,
+ precision("base_discount_amount")
+ );
- if (this.frm.doc.apply_discount_on == "Grand Total" && this.frm.doc.is_cash_or_non_trade_discount) {
+ if (
+ this.frm.doc.apply_discount_on == "Grand Total" &&
+ this.frm.doc.is_cash_or_non_trade_discount
+ ) {
return;
}
@@ -733,11 +831,12 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
// calculate item amount after Discount Amount
if (total_for_discount_amount) {
- $.each(this.frm._items || [], function(i, item) {
- distributed_amount = flt(me.frm.doc.discount_amount) * item.net_amount / total_for_discount_amount;
+ $.each(this.frm._items || [], function (i, item) {
+ distributed_amount =
+ (flt(me.frm.doc.discount_amount) * item.net_amount) / total_for_discount_amount;
const adjusted_net_amount = item.net_amount - distributed_amount;
- expected_net_total += adjusted_net_amount
+ expected_net_total += adjusted_net_amount;
item.net_amount = flt(adjusted_net_amount, precision("net_amount", item));
net_total += item.net_amount;
@@ -745,10 +844,15 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
// assignment to rounding_difference is intentional
const rounding_difference = flt(expected_net_total - net_total, precision("net_total"));
if (rounding_difference) {
- item.net_amount = flt(item.net_amount + rounding_difference, precision("net_amount", item));
+ item.net_amount = flt(
+ item.net_amount + rounding_difference,
+ precision("net_amount", item)
+ );
net_total += rounding_difference;
}
- item.net_rate = item.qty ? flt(item.net_amount / item.qty, precision("net_rate", item)) : 0;
+ item.net_rate = item.qty
+ ? flt(item.net_amount / item.qty, precision("net_rate", item))
+ : 0;
me.set_in_company_currency(item, ["net_rate", "net_amount"]);
});
@@ -761,8 +865,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
get_total_for_discount_amount() {
const doc = this.frm.doc;
- if (doc.apply_discount_on == "Net Total" || !doc.taxes?.length)
- return doc.net_total;
+ if (doc.apply_discount_on == "Net Total" || !doc.taxes?.length) return doc.net_total;
let total_actual_tax = 0.0;
let actual_taxes_dict = {};
@@ -773,11 +876,11 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
actual_taxes_dict[tax.idx] = {
tax_amount: tax_amount,
- cumulative_total: total_actual_tax
+ cumulative_total: total_actual_tax,
};
}
- doc.taxes.forEach(tax => {
+ doc.taxes.forEach((tax) => {
if (["Actual", "On Item Quantity"].includes(tax.charge_type)) {
update_actual_taxes_dict(tax, tax.tax_amount);
return;
@@ -788,17 +891,22 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
// if charge type is 'On Previous Row Amount', calculate tax on previous row amount
// else (On Previous Row Total) calculate tax on cumulative total
- const base_tax_amount = tax.charge_type == "On Previous Row Amount" ? base_row["tax_amount"]: base_row["cumulative_total"];
- update_actual_taxes_dict(tax, base_tax_amount * tax.rate / 100);
+ const base_tax_amount =
+ tax.charge_type == "On Previous Row Amount"
+ ? base_row["tax_amount"]
+ : base_row["cumulative_total"];
+ update_actual_taxes_dict(tax, (base_tax_amount * tax.rate) / 100);
});
return (this.grand_total_for_distributing_discount || doc.grand_total) - total_actual_tax;
}
calculate_total_advance(update_paid_amount) {
- var total_allocated_amount = frappe.utils.sum($.map(this.frm.doc["advances"] || [], function(adv) {
- return flt(adv.allocated_amount, precision("allocated_amount", adv));
- }));
+ var total_allocated_amount = frappe.utils.sum(
+ $.map(this.frm.doc["advances"] || [], function (adv) {
+ return flt(adv.allocated_amount, precision("allocated_amount", adv));
+ })
+ );
this.frm.doc.total_advance = flt(total_allocated_amount, precision("total_advance"));
if (this.frm.doc.write_off_outstanding_amount_automatically) {
@@ -810,7 +918,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
}
is_internal_invoice() {
- if (['Sales Invoice', 'Purchase Invoice'].includes(this.frm.doc.doctype)) {
+ if (["Sales Invoice", "Purchase Invoice"].includes(this.frm.doc.doctype)) {
if (this.frm.doc.company === this.frm.doc.represents_company) {
return true;
}
@@ -822,25 +930,28 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
// NOTE:
// paid_amount and write_off_amount is only for POS/Loyalty Point Redemption Invoice
// total_advance is only for non POS Invoice
- if(["Sales Invoice", "POS Invoice"].includes(this.frm.doc.doctype) && this.frm.doc.is_return){
+ if (["Sales Invoice", "POS Invoice"].includes(this.frm.doc.doctype) && this.frm.doc.is_return) {
this.calculate_paid_amount();
}
- if (this.frm.doc.is_return || (this.frm.doc.docstatus > 0) || this.is_internal_invoice()) return;
+ if (this.frm.doc.is_return || this.frm.doc.docstatus > 0 || this.is_internal_invoice()) return;
frappe.model.round_floats_in(this.frm.doc, ["grand_total", "total_advance", "write_off_amount"]);
- if(["Sales Invoice", "POS Invoice", "Purchase Invoice"].includes(this.frm.doc.doctype)) {
+ if (["Sales Invoice", "POS Invoice", "Purchase Invoice"].includes(this.frm.doc.doctype)) {
let grand_total = this.frm.doc.rounded_total || this.frm.doc.grand_total;
let base_grand_total = this.frm.doc.base_rounded_total || this.frm.doc.base_grand_total;
- if(this.frm.doc.party_account_currency == this.frm.doc.currency) {
- var total_amount_to_pay = flt((grand_total - this.frm.doc.total_advance
- - this.frm.doc.write_off_amount), precision("grand_total"));
+ if (this.frm.doc.party_account_currency == this.frm.doc.currency) {
+ var total_amount_to_pay = flt(
+ grand_total - this.frm.doc.total_advance - this.frm.doc.write_off_amount,
+ precision("grand_total")
+ );
} else {
var total_amount_to_pay = flt(
- (flt(base_grand_total, precision("base_grand_total"))
- - this.frm.doc.total_advance - this.frm.doc.base_write_off_amount),
+ flt(base_grand_total, precision("base_grand_total")) -
+ this.frm.doc.total_advance -
+ this.frm.doc.base_write_off_amount,
precision("base_grand_total")
);
}
@@ -848,24 +959,34 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
frappe.model.round_floats_in(this.frm.doc, ["paid_amount"]);
this.set_in_company_currency(this.frm.doc, ["paid_amount"]);
- if(this.frm.refresh_field){
+ if (this.frm.refresh_field) {
this.frm.refresh_field("paid_amount");
this.frm.refresh_field("base_paid_amount");
}
- if(["Sales Invoice", "POS Invoice"].includes(this.frm.doc.doctype)) {
- let total_amount_for_payment = (this.frm.doc.redeem_loyalty_points && this.frm.doc.loyalty_amount)
- ? flt(total_amount_to_pay - this.frm.doc.loyalty_amount, precision("base_grand_total"))
- : total_amount_to_pay;
+ if (["Sales Invoice", "POS Invoice"].includes(this.frm.doc.doctype)) {
+ let total_amount_for_payment =
+ this.frm.doc.redeem_loyalty_points && this.frm.doc.loyalty_amount
+ ? flt(
+ total_amount_to_pay - this.frm.doc.loyalty_amount,
+ precision("base_grand_total")
+ )
+ : total_amount_to_pay;
this.set_default_payment(total_amount_for_payment, update_paid_amount);
this.calculate_paid_amount();
}
this.calculate_change_amount();
- var paid_amount = (this.frm.doc.party_account_currency == this.frm.doc.currency) ?
- this.frm.doc.paid_amount : this.frm.doc.base_paid_amount;
- this.frm.doc.outstanding_amount = flt(total_amount_to_pay - flt(paid_amount) +
- flt(this.frm.doc.change_amount * this.frm.doc.conversion_rate), precision("outstanding_amount"));
+ var paid_amount =
+ this.frm.doc.party_account_currency == this.frm.doc.currency
+ ? this.frm.doc.paid_amount
+ : this.frm.doc.base_paid_amount;
+ this.frm.doc.outstanding_amount = flt(
+ total_amount_to_pay -
+ flt(paid_amount) +
+ flt(this.frm.doc.change_amount * this.frm.doc.conversion_rate),
+ precision("outstanding_amount")
+ );
}
}
@@ -880,13 +1001,9 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
);
} else {
var total_amount_to_pay = flt(
- (
- flt(
- base_grand_total,
- precision("base_grand_total")
- )
- - this.frm.doc.total_advance - this.frm.doc.base_write_off_amount
- ),
+ flt(base_grand_total, precision("base_grand_total")) -
+ this.frm.doc.total_advance -
+ this.frm.doc.base_write_off_amount,
precision("base_grand_total")
);
}
@@ -898,8 +1015,8 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
*/
let payment_amount = 0;
- this.frm.doc.payments.forEach(payment => {
- payment_amount += payment.amount
+ this.frm.doc.payments.forEach((payment) => {
+ payment_amount += payment.amount;
});
if (payment_amount == total_amount_to_pay) {
@@ -911,16 +1028,16 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
it should set the return to that mode of payment only.
*/
- if(this.frm.doc.return_against){
- let {message : return_against_mop } = await frappe.call({
- method: 'erpnext.controllers.sales_and_purchase_return.get_payment_data',
+ if (this.frm.doc.return_against) {
+ let { message: return_against_mop } = await frappe.call({
+ method: "erpnext.controllers.sales_and_purchase_return.get_payment_data",
args: {
- invoice: this.frm.doc.return_against
- }
+ invoice: this.frm.doc.return_against,
+ },
});
if (return_against_mop.length === 1) {
- this.frm.doc.payments.forEach(payment => {
+ this.frm.doc.payments.forEach((payment) => {
if (payment.mode_of_payment == return_against_mop[0].mode_of_payment) {
payment.amount = total_amount_to_pay;
} else {
@@ -932,11 +1049,11 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
}
}
- this.frm.doc.payments.find(payment => {
+ this.frm.doc.payments.find((payment) => {
if (payment.default) {
payment.amount = total_amount_to_pay;
} else {
- payment.amount = 0
+ payment.amount = 0;
}
});
@@ -946,28 +1063,37 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
set_default_payment(total_amount_to_pay, update_paid_amount) {
var me = this;
var payment_status = true;
- if(this.frm.doc.is_pos && (update_paid_amount===undefined || update_paid_amount)) {
- $.each(this.frm.doc['payments'] || [], function(index, data) {
- if(data.default && payment_status && total_amount_to_pay > 0) {
+ if (
+ this.frm.doc.is_pos &&
+ cint(this.frm.set_default_payment) &&
+ (update_paid_amount === undefined || update_paid_amount)
+ ) {
+ $.each(this.frm.doc["payments"] || [], function (index, data) {
+ if (data.default && payment_status && total_amount_to_pay > 0) {
let base_amount, amount;
if (me.frm.doc.party_account_currency == me.frm.doc.currency) {
// if customer/supplier currency is same as company currency
// total_amount_to_pay is already in customer/supplier currency
// so base_amount has to be calculated using total_amount_to_pay
- base_amount = flt(total_amount_to_pay * me.frm.doc.conversion_rate, precision("base_amount", data));
+ base_amount = flt(
+ total_amount_to_pay * me.frm.doc.conversion_rate,
+ precision("base_amount", data)
+ );
amount = flt(total_amount_to_pay, precision("amount", data));
} else {
base_amount = flt(total_amount_to_pay, precision("base_amount", data));
- amount = flt(total_amount_to_pay / me.frm.doc.conversion_rate, precision("amount", data));
+ amount = flt(
+ total_amount_to_pay / me.frm.doc.conversion_rate,
+ precision("amount", data)
+ );
}
frappe.model.set_value(data.doctype, data.name, "base_amount", base_amount);
frappe.model.set_value(data.doctype, data.name, "amount", amount);
payment_status = false;
-
- } else if(me.frm.doc.paid_amount) {
+ } else if (me.frm.doc.paid_amount) {
frappe.model.set_value(data.doctype, data.name, "amount", 0.0);
}
});
@@ -978,56 +1104,74 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
var me = this;
var paid_amount = 0.0;
var base_paid_amount = 0.0;
- if(this.frm.doc.is_pos) {
- $.each(this.frm.doc['payments'] || [], function(index, data){
- data.base_amount = flt(data.amount * me.frm.doc.conversion_rate, precision("base_amount", data));
+ if (this.frm.doc.is_pos) {
+ $.each(this.frm.doc["payments"] || [], function (index, data) {
+ data.base_amount = flt(
+ data.amount * me.frm.doc.conversion_rate,
+ precision("base_amount", data)
+ );
paid_amount += data.amount;
base_paid_amount += data.base_amount;
});
- } else if(!this.frm.doc.is_return){
+ } else if (!this.frm.doc.is_return) {
this.frm.doc.payments = [];
}
if (this.frm.doc.redeem_loyalty_points && this.frm.doc.loyalty_amount) {
base_paid_amount += this.frm.doc.loyalty_amount;
- paid_amount += flt(this.frm.doc.loyalty_amount / me.frm.doc.conversion_rate, precision("paid_amount"));
+ paid_amount += flt(
+ this.frm.doc.loyalty_amount / me.frm.doc.conversion_rate,
+ precision("paid_amount")
+ );
}
- this.frm.set_value('paid_amount', flt(paid_amount, precision("paid_amount")));
- this.frm.set_value('base_paid_amount', flt(base_paid_amount, precision("base_paid_amount")));
+ this.frm.set_value("paid_amount", flt(paid_amount, precision("paid_amount")));
+ this.frm.set_value("base_paid_amount", flt(base_paid_amount, precision("base_paid_amount")));
}
- calculate_change_amount(){
+ calculate_change_amount() {
this.frm.doc.change_amount = 0.0;
this.frm.doc.base_change_amount = 0.0;
- if(["Sales Invoice", "POS Invoice"].includes(this.frm.doc.doctype)
- && this.frm.doc.paid_amount > this.frm.doc.grand_total && !this.frm.doc.is_return) {
-
- var payment_types = $.map(this.frm.doc.payments, function(d) { return d.type; });
- if (in_list(payment_types, 'Cash')) {
+ if (
+ ["Sales Invoice", "POS Invoice"].includes(this.frm.doc.doctype) &&
+ this.frm.doc.paid_amount > this.frm.doc.grand_total &&
+ !this.frm.doc.is_return
+ ) {
+ var payment_types = $.map(this.frm.doc.payments, function (d) {
+ return d.type;
+ });
+ if (in_list(payment_types, "Cash")) {
var grand_total = this.frm.doc.rounded_total || this.frm.doc.grand_total;
var base_grand_total = this.frm.doc.base_rounded_total || this.frm.doc.base_grand_total;
- this.frm.doc.change_amount = flt(this.frm.doc.paid_amount - grand_total,
- precision("change_amount"));
+ this.frm.doc.change_amount = flt(
+ this.frm.doc.paid_amount - grand_total,
+ precision("change_amount")
+ );
- this.frm.doc.base_change_amount = flt(this.frm.doc.base_paid_amount -
- base_grand_total, precision("base_change_amount"));
+ this.frm.doc.base_change_amount = flt(
+ this.frm.doc.base_paid_amount - base_grand_total,
+ precision("base_change_amount")
+ );
}
}
}
calculate_write_off_amount() {
- if(this.frm.doc.write_off_outstanding_amount_automatically) {
- this.frm.doc.write_off_amount = flt(this.frm.doc.outstanding_amount, precision("write_off_amount"));
- this.frm.doc.base_write_off_amount = flt(this.frm.doc.write_off_amount * this.frm.doc.conversion_rate,
- precision("base_write_off_amount"));
+ if (this.frm.doc.write_off_outstanding_amount_automatically) {
+ this.frm.doc.write_off_amount = flt(
+ this.frm.doc.outstanding_amount,
+ precision("write_off_amount")
+ );
+ this.frm.doc.base_write_off_amount = flt(
+ this.frm.doc.write_off_amount * this.frm.doc.conversion_rate,
+ precision("base_write_off_amount")
+ );
this.calculate_outstanding_amount(false);
}
-
}
filtered_items() {
- return this.frm.doc.items.filter(item => !item["is_alternative"]);
+ return this.frm.doc.items.filter((item) => !item["is_alternative"]);
}
};
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index da5f74d652c..387fdd4892f 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -1,7 +1,6 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-
erpnext.TransactionController = class TransactionController extends erpnext.taxes_and_totals {
setup() {
super.setup();
@@ -12,32 +11,36 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
this.frm.ignore_doctypes_on_cancel_all = ["Serial and Batch Bundle"];
frappe.flags.hide_serial_batch_dialog = true;
- frappe.ui.form.on(this.frm.doctype + " Item", "rate", function(frm, cdt, cdn) {
+ frappe.ui.form.on(this.frm.doctype + " Item", "rate", function (frm, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn);
- var has_margin_field = frappe.meta.has_field(cdt, 'margin_type');
+ var has_margin_field = frappe.meta.has_field(cdt, "margin_type");
frappe.model.round_floats_in(item, ["rate", "price_list_rate"]);
- if(item.price_list_rate && !item.blanket_order_rate) {
- if(item.rate > item.price_list_rate && has_margin_field) {
+ if (item.price_list_rate && !item.blanket_order_rate) {
+ if (item.rate > item.price_list_rate && has_margin_field) {
// if rate is greater than price_list_rate, set margin
// or set discount
item.discount_percentage = 0;
- item.margin_type = 'Amount';
- item.margin_rate_or_amount = flt(item.rate - item.price_list_rate,
- precision("margin_rate_or_amount", item));
+ item.margin_type = "Amount";
+ item.margin_rate_or_amount = flt(
+ item.rate - item.price_list_rate,
+ precision("margin_rate_or_amount", item)
+ );
item.rate_with_margin = item.rate;
} else {
- item.discount_percentage = flt((1 - item.rate / item.price_list_rate) * 100.0,
- precision("discount_percentage", item));
+ item.discount_percentage = flt(
+ (1 - item.rate / item.price_list_rate) * 100.0,
+ precision("discount_percentage", item)
+ );
item.discount_amount = flt(item.price_list_rate) - flt(item.rate);
- item.margin_type = '';
+ item.margin_type = "";
item.margin_rate_or_amount = 0;
item.rate_with_margin = 0;
}
} else {
item.discount_percentage = 0.0;
- item.margin_type = '';
+ item.margin_type = "";
item.margin_rate_or_amount = 0;
item.rate_with_margin = 0;
}
@@ -60,64 +63,65 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
posting_date: frm.doc.posting_date,
bill_date: frm.doc.bill_date,
transaction_date: frm.doc.transaction_date,
- }
+ },
},
- callback: function(r) {
+ callback: function (r) {
const item_tax_template = r.message;
- frappe.model.set_value(cdt, cdn, 'item_tax_template', item_tax_template);
- }
+ frappe.model.set_value(cdt, cdn, "item_tax_template", item_tax_template);
+ },
});
}
});
- frappe.ui.form.on(this.frm.cscript.tax_table, "rate", function(frm, cdt, cdn) {
+ frappe.ui.form.on(this.frm.cscript.tax_table, "rate", function (frm, cdt, cdn) {
cur_frm.cscript.calculate_taxes_and_totals();
});
- frappe.ui.form.on(this.frm.cscript.tax_table, "tax_amount", function(frm, cdt, cdn) {
+ frappe.ui.form.on(this.frm.cscript.tax_table, "tax_amount", function (frm, cdt, cdn) {
cur_frm.cscript.calculate_taxes_and_totals();
});
- frappe.ui.form.on(this.frm.cscript.tax_table, "row_id", function(frm, cdt, cdn) {
+ frappe.ui.form.on(this.frm.cscript.tax_table, "row_id", function (frm, cdt, cdn) {
cur_frm.cscript.calculate_taxes_and_totals();
});
- frappe.ui.form.on(this.frm.cscript.tax_table, "included_in_print_rate", function(frm, cdt, cdn) {
+ frappe.ui.form.on(this.frm.cscript.tax_table, "included_in_print_rate", function (frm, cdt, cdn) {
cur_frm.cscript.set_dynamic_labels();
cur_frm.cscript.calculate_taxes_and_totals();
});
- frappe.ui.form.on(this.frm.doctype, "apply_discount_on", function(frm) {
- if(frm.doc.additional_discount_percentage) {
+ frappe.ui.form.on(this.frm.doctype, "apply_discount_on", function (frm) {
+ if (frm.doc.additional_discount_percentage) {
frm.trigger("additional_discount_percentage");
} else {
cur_frm.cscript.calculate_taxes_and_totals();
}
});
- frappe.ui.form.on(this.frm.doctype, "additional_discount_percentage", function(frm) {
- if(!frm.doc.apply_discount_on) {
+ frappe.ui.form.on(this.frm.doctype, "additional_discount_percentage", function (frm) {
+ if (!frm.doc.apply_discount_on) {
frappe.msgprint(__("Please set 'Apply Additional Discount On'"));
return;
}
frm.via_discount_percentage = true;
- if(frm.doc.additional_discount_percentage && frm.doc.discount_amount) {
+ if (frm.doc.additional_discount_percentage && frm.doc.discount_amount) {
// Reset discount amount and net / grand total
frm.doc.discount_amount = 0;
frm.cscript.calculate_taxes_and_totals();
}
var total = flt(frm.doc[frappe.model.scrub(frm.doc.apply_discount_on)]);
- var discount_amount = flt(total*flt(frm.doc.additional_discount_percentage) / 100,
- precision("discount_amount"));
+ var discount_amount = flt(
+ (total * flt(frm.doc.additional_discount_percentage)) / 100,
+ precision("discount_amount")
+ );
- frm.set_value("discount_amount", discount_amount)
- .then(() => delete frm.via_discount_percentage);
+ frm.set_value("discount_amount", discount_amount).then(() => delete frm.via_discount_percentage);
});
- frappe.ui.form.on(this.frm.doctype, "discount_amount", function(frm) {
+ frappe.ui.form.on(this.frm.doctype, "discount_amount", function (frm) {
frm.cscript.set_dynamic_labels();
if (!frm.via_discount_percentage) {
@@ -128,7 +132,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
});
frappe.ui.form.on(this.frm.doctype + " Item", {
- items_add: function(frm, cdt, cdn) {
+ items_add: function (frm, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn);
if (!item.warehouse && frm.doc.set_warehouse) {
item.warehouse = frm.doc.set_warehouse;
@@ -142,133 +146,132 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
item.from_warehouse = frm.doc.set_from_warehouse;
}
- if (item.docstatus === 0
- && frappe.meta.has_field(item.doctype, "use_serial_batch_fields")
- && cint(frappe.user_defaults?.use_serial_batch_fields) === 1
+ if (
+ item.docstatus === 0 &&
+ frappe.meta.has_field(item.doctype, "use_serial_batch_fields") &&
+ cint(frappe.user_defaults?.use_serial_batch_fields) === 1
) {
frappe.model.set_value(item.doctype, item.name, "use_serial_batch_fields", 1);
}
- erpnext.accounts.dimensions.copy_dimension_from_first_row(frm, cdt, cdn, 'items');
- }
+ erpnext.accounts.dimensions.copy_dimension_from_first_row(frm, cdt, cdn, "items");
+ },
});
- if(this.frm.fields_dict["items"].grid.get_field('serial_and_batch_bundle')) {
- this.frm.set_query("serial_and_batch_bundle", "items", function(doc, cdt, cdn) {
+ if (this.frm.fields_dict["items"].grid.get_field("serial_and_batch_bundle")) {
+ this.frm.set_query("serial_and_batch_bundle", "items", function (doc, cdt, cdn) {
let item_row = locals[cdt][cdn];
return {
filters: {
- 'item_code': item_row.item_code,
- 'voucher_type': doc.doctype,
- 'voucher_no': ["in", [doc.name, ""]],
- 'is_cancelled': 0,
- }
- }
+ item_code: item_row.item_code,
+ voucher_type: doc.doctype,
+ voucher_no: ["in", [doc.name, ""]],
+ is_cancelled: 0,
+ },
+ };
});
}
- if(this.frm.fields_dict['items'].grid.get_field('batch_no')) {
- this.frm.set_query('batch_no', 'items', function(doc, cdt, cdn) {
+ if (this.frm.fields_dict["items"].grid.get_field("batch_no")) {
+ this.frm.set_query("batch_no", "items", function (doc, cdt, cdn) {
return me.set_query_for_batch(doc, cdt, cdn);
});
}
if (this.frm.fields_dict["items"].grid.get_field("uom")) {
- this.frm.set_query("uom", "items", function(doc, cdt, cdn) {
+ this.frm.set_query("uom", "items", function (doc, cdt, cdn) {
let row = locals[cdt][cdn];
return {
query: "erpnext.controllers.queries.get_item_uom_query",
filters: {
- "item_code": row.item_code
- }
+ item_code: row.item_code,
+ },
};
});
}
- if(
- this.frm.docstatus < 2
- && this.frm.fields_dict["payment_terms_template"]
- && this.frm.fields_dict["payment_schedule"]
- && this.frm.doc.payment_terms_template
- && !this.frm.doc.payment_schedule.length
- ){
+ if (
+ this.frm.docstatus < 2 &&
+ this.frm.fields_dict["payment_terms_template"] &&
+ this.frm.fields_dict["payment_schedule"] &&
+ this.frm.doc.payment_terms_template &&
+ !this.frm.doc.payment_schedule.length
+ ) {
this.frm.trigger("payment_terms_template");
}
- if(this.frm.fields_dict["taxes"]) {
+ if (this.frm.fields_dict["taxes"]) {
this["taxes_remove"] = this.calculate_taxes_and_totals;
}
- if(this.frm.fields_dict["items"]) {
+ if (this.frm.fields_dict["items"]) {
this["items_remove"] = this.process_item_removal;
}
- if(this.frm.fields_dict["recurring_print_format"]) {
- this.frm.set_query("recurring_print_format", function(doc) {
- return{
- filters: [
- ['Print Format', 'doc_type', '=', cur_frm.doctype],
- ]
+ if (this.frm.fields_dict["recurring_print_format"]) {
+ this.frm.set_query("recurring_print_format", function (doc) {
+ return {
+ filters: [["Print Format", "doc_type", "=", cur_frm.doctype]],
};
});
}
- if(this.frm.fields_dict["return_against"]) {
- this.frm.set_query("return_against", function(doc) {
+ if (this.frm.fields_dict["return_against"]) {
+ this.frm.set_query("return_against", function (doc) {
var filters = {
- "docstatus": 1,
- "is_return": 0,
- "company": doc.company
+ docstatus: 1,
+ is_return: 0,
+ company: doc.company,
};
if (me.frm.fields_dict["customer"] && doc.customer) filters["customer"] = doc.customer;
if (me.frm.fields_dict["supplier"] && doc.supplier) filters["supplier"] = doc.supplier;
return {
- filters: filters
+ filters: filters,
};
});
}
if (this.frm.fields_dict["items"].grid.get_field("expense_account")) {
- this.frm.set_query("expense_account", "items", function(doc) {
+ this.frm.set_query("expense_account", "items", function (doc) {
return {
filters: {
- "company": doc.company,
- "report_type": "Profit and Loss",
- "is_group": 0
- }
+ company: doc.company,
+ report_type: "Profit and Loss",
+ is_group: 0,
+ },
};
});
}
- if(frappe.meta.get_docfield(this.frm.doc.doctype, "pricing_rules")) {
- this.frm.set_indicator_formatter('pricing_rule', function(doc) {
- return (doc.rule_applied) ? "green" : "red";
+ if (frappe.meta.get_docfield(this.frm.doc.doctype, "pricing_rules")) {
+ this.frm.set_indicator_formatter("pricing_rule", function (doc) {
+ return doc.rule_applied ? "green" : "red";
});
}
- if (this.frm.fields_dict["items"].grid.get_field('blanket_order')) {
- this.frm.set_query("blanket_order", "items", function(doc, cdt, cdn) {
+ if (this.frm.fields_dict["items"].grid.get_field("blanket_order")) {
+ this.frm.set_query("blanket_order", "items", function (doc, cdt, cdn) {
var item = locals[cdt][cdn];
return {
query: "erpnext.controllers.queries.get_blanket_orders",
filters: {
- "company": doc.company,
- "blanket_order_type": doc.doctype === "Sales Order" ? "Selling" : "Purchasing",
- "item": item.item_code
- }
- }
+ company: doc.company,
+ blanket_order_type: doc.doctype === "Sales Order" ? "Selling" : "Purchasing",
+ item: item.item_code,
+ },
+ };
});
}
if (this.frm.fields_dict.taxes_and_charges) {
- this.frm.set_query("taxes_and_charges", function() {
+ this.frm.set_query("taxes_and_charges", function () {
return {
filters: [
- ['company', '=', me.frm.doc.company],
- ['docstatus', '!=', 2]
- ]
+ ["company", "=", me.frm.doc.company],
+ ["docstatus", "!=", 2],
+ ],
};
});
}
@@ -285,65 +288,74 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
set_fields_onload_for_line_item() {
if (this.frm.is_new() && this.frm.doc?.items) {
- this.frm.doc.items.forEach(item => {
- if (item.docstatus === 0
- && frappe.meta.has_field(item.doctype, "use_serial_batch_fields")
- && cint(frappe.user_defaults?.use_serial_batch_fields) === 1
+ this.frm.doc.items.forEach((item) => {
+ if (
+ item.docstatus === 0 &&
+ frappe.meta.has_field(item.doctype, "use_serial_batch_fields") &&
+ cint(frappe.user_defaults?.use_serial_batch_fields) === 1
) {
frappe.model.set_value(item.doctype, item.name, "use_serial_batch_fields", 1);
}
- })
+ });
}
}
toggle_enable_for_stock_uom(field) {
frappe.call({
- method: 'erpnext.stock.doctype.stock_settings.stock_settings.get_enable_stock_uom_editing',
+ method: "erpnext.stock.doctype.stock_settings.stock_settings.get_enable_stock_uom_editing",
callback: (r) => {
if (r.message) {
var value = r.message[field];
this.frm.fields_dict["items"].grid.toggle_enable("stock_qty", value);
}
- }
+ },
});
}
onload() {
var me = this;
- if(this.frm.doc.__islocal) {
+ if (this.frm.doc.__islocal) {
var currency = frappe.defaults.get_user_default("currency");
let set_value = (fieldname, value) => {
- if(me.frm.fields_dict[fieldname] && !me.frm.doc[fieldname]) {
+ if (me.frm.fields_dict[fieldname] && !me.frm.doc[fieldname]) {
return me.frm.set_value(fieldname, value);
}
};
- this.frm.trigger('set_default_internal_warehouse');
+ this.frm.trigger("set_default_internal_warehouse");
return frappe.run_serially([
- () => set_value('currency', currency),
- () => set_value('price_list_currency', currency),
- () => set_value('status', 'Draft'),
- () => set_value('is_subcontracted', 0),
+ () => set_value("currency", currency),
+ () => set_value("price_list_currency", currency),
+ () => set_value("status", "Draft"),
+ () => set_value("is_subcontracted", 0),
() => {
- if(this.frm.doc.company && !this.frm.doc.amended_from) {
+ if (this.frm.doc.company && !this.frm.doc.amended_from) {
this.frm.trigger("company");
}
- }
+ },
]);
}
}
is_return() {
- if(!this.frm.doc.is_return && this.frm.doc.return_against) {
- this.frm.set_value('return_against', '');
+ if (!this.frm.doc.is_return && this.frm.doc.return_against) {
+ this.frm.set_value("return_against", "");
}
}
setup_quality_inspection() {
- if(!["Delivery Note", "Sales Invoice", "Purchase Receipt", "Purchase Invoice", "Subcontracting Receipt"].includes(this.frm.doc.doctype)) {
+ if (
+ ![
+ "Delivery Note",
+ "Sales Invoice",
+ "Purchase Receipt",
+ "Purchase Invoice",
+ "Subcontracting Receipt",
+ ].includes(this.frm.doc.doctype)
+ ) {
return;
}
@@ -353,34 +365,43 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
}
const me = this;
- if (!this.frm.is_new()
- && (this.frm.doc.docstatus === 0 || this.frm.doc.__onload?.allow_to_make_qc_after_submission)
- && frappe.model.can_create("Quality Inspection")
- && show_qc_button) {
- this.frm.add_custom_button(__("Quality Inspection(s)"), () => {
- me.make_quality_inspection();
- }, __("Create"));
+ if (
+ !this.frm.is_new() &&
+ (this.frm.doc.docstatus === 0 || this.frm.doc.__onload?.allow_to_make_qc_after_submission) &&
+ frappe.model.can_create("Quality Inspection") &&
+ show_qc_button
+ ) {
+ this.frm.add_custom_button(
+ __("Quality Inspection(s)"),
+ () => {
+ me.make_quality_inspection();
+ },
+ __("Create")
+ );
}
- const inspection_type = ["Purchase Receipt", "Purchase Invoice", "Subcontracting Receipt"].includes(this.frm.doc.doctype)
- ? "Incoming" : "Outgoing";
+ const inspection_type = ["Purchase Receipt", "Purchase Invoice", "Subcontracting Receipt"].includes(
+ this.frm.doc.doctype
+ )
+ ? "Incoming"
+ : "Outgoing";
let quality_inspection_field = this.frm.get_docfield("items", "quality_inspection");
- quality_inspection_field.get_route_options_for_new_doc = function(row) {
- if(me.frm.is_new()) return {};
+ quality_inspection_field.get_route_options_for_new_doc = function (row) {
+ if (me.frm.is_new()) return {};
return {
- "inspection_type": inspection_type,
- "reference_type": me.frm.doc.doctype,
- "reference_name": me.frm.doc.name,
- "child_row_reference": row.doc.name,
- "item_code": row.doc.item_code,
- "description": row.doc.description,
- "item_serial_no": row.doc.serial_no ? row.doc.serial_no.split("\n")[0] : null,
- "batch_no": row.doc.batch_no
- }
- }
+ inspection_type: inspection_type,
+ reference_type: me.frm.doc.doctype,
+ reference_name: me.frm.doc.name,
+ child_row_reference: row.doc.name,
+ item_code: row.doc.item_code,
+ description: row.doc.description,
+ item_serial_no: row.doc.serial_no ? row.doc.serial_no.split("\n")[0] : null,
+ batch_no: row.doc.batch_no,
+ };
+ };
- this.frm.set_query("quality_inspection", "items", function(doc, cdt, cdn) {
+ this.frm.set_query("quality_inspection", "items", function (doc, cdt, cdn) {
let d = locals[cdt][cdn];
return {
filters: {
@@ -388,46 +409,55 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
inspection_type: inspection_type,
reference_name: doc.name,
item_code: d.item_code,
- child_row_reference : d.name
- }
- }
+ child_row_reference: d.name,
+ },
+ };
});
}
make_payment_request() {
let me = this;
- const payment_request_type = (['Sales Order', 'Sales Invoice'].includes(this.frm.doc.doctype))
- ? "Inward" : "Outward";
+ const payment_request_type = ["Sales Order", "Sales Invoice"].includes(this.frm.doc.doctype)
+ ? "Inward"
+ : "Outward";
frappe.call({
- method:"erpnext.accounts.doctype.payment_request.payment_request.make_payment_request",
+ method: "erpnext.accounts.doctype.payment_request.payment_request.make_payment_request",
args: {
dt: me.frm.doc.doctype,
dn: me.frm.doc.name,
recipient_id: me.frm.doc.contact_email,
payment_request_type: payment_request_type,
- party_type: payment_request_type == 'Outward' ? "Supplier" : "Customer",
- party: payment_request_type == 'Outward' ? me.frm.doc.supplier : me.frm.doc.customer,
- party_name:payment_request_type == 'Outward' ? me.frm.doc.supplier_name : me.frm.doc.customer_name
+ party_type: payment_request_type == "Outward" ? "Supplier" : "Customer",
+ party: payment_request_type == "Outward" ? me.frm.doc.supplier : me.frm.doc.customer,
+ party_name:
+ payment_request_type == "Outward" ? me.frm.doc.supplier_name : me.frm.doc.customer_name,
},
- callback: function(r) {
- if(!r.exc){
+ callback: function (r) {
+ if (!r.exc) {
frappe.model.sync(r.message);
frappe.set_route("Form", r.message.doctype, r.message.name);
}
- }
- })
+ },
+ });
}
onload_post_render() {
- if(this.frm.doc.__islocal && !(this.frm.doc.taxes || []).length
- && !this.frm.doc.__onload?.load_after_mapping) {
+ if (
+ this.frm.doc.__islocal &&
+ !(this.frm.doc.taxes || []).length &&
+ !this.frm.doc.__onload?.load_after_mapping
+ ) {
frappe.after_ajax(() => this.apply_default_taxes());
- } else if(this.frm.doc.__islocal && this.frm.doc.company && this.frm.doc["items"]
- && !this.frm.doc.is_pos) {
+ } else if (
+ this.frm.doc.__islocal &&
+ this.frm.doc.company &&
+ this.frm.doc["items"] &&
+ !this.frm.doc.is_pos
+ ) {
frappe.after_ajax(() => this.calculate_taxes_and_totals());
}
- if(frappe.meta.get_docfield(this.frm.doc.doctype + " Item", "item_code")) {
+ if (frappe.meta.get_docfield(this.frm.doc.doctype + " Item", "item_code")) {
this.setup_item_selector();
this.frm.get_field("items").grid.set_multiple_add("item_code", "qty");
}
@@ -447,26 +477,26 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
set_route_options_for_new_doc() {
// While creating the batch from the link field, copy item from line item to batch form
- if(this.frm.fields_dict['items'].grid.get_field('batch_no')) {
- let batch_no_field = this.frm.get_docfield('items', 'batch_no');
+ if (this.frm.fields_dict["items"].grid.get_field("batch_no")) {
+ let batch_no_field = this.frm.get_docfield("items", "batch_no");
if (batch_no_field) {
- batch_no_field.get_route_options_for_new_doc = function(row) {
+ batch_no_field.get_route_options_for_new_doc = function (row) {
return {
- 'item': row.doc.item_code
- }
+ item: row.doc.item_code,
+ };
};
}
}
// While creating the SABB from the link field, copy item, doctype from line item to SABB form
- if(this.frm.fields_dict['items'].grid.get_field('serial_and_batch_bundle')) {
- let sbb_field = this.frm.get_docfield('items', 'serial_and_batch_bundle');
+ if (this.frm.fields_dict["items"].grid.get_field("serial_and_batch_bundle")) {
+ let sbb_field = this.frm.get_docfield("items", "serial_and_batch_bundle");
if (sbb_field) {
sbb_field.get_route_options_for_new_doc = (row) => {
return {
- "item_code": row.doc.item_code,
- "voucher_type": this.frm.doc.doctype,
- }
+ item_code: row.doc.item_code,
+ voucher_type: this.frm.doc.doctype,
+ };
};
}
}
@@ -477,28 +507,30 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
this.barcode_scanner.process_scan();
}
- barcode(doc, cdt, cdn) {
+ barcode(doc, cdt, cdn) {
let row = locals[cdt][cdn];
if (row.barcode) {
erpnext.stock.utils.set_item_details_using_barcode(this.frm, row, (r) => {
frappe.model.set_value(cdt, cdn, {
- "item_code": r.message.item_code,
- "qty": 1,
+ item_code: r.message.item_code,
+ qty: 1,
});
});
}
}
- validate_has_items () {
+ validate_has_items() {
let table = this.frm.doc.items;
- this.frm.has_items = (table && table.length
- && table[0].qty && table[0].item_code);
+ this.frm.has_items = table && table.length && table[0].qty && table[0].item_code;
}
apply_default_taxes() {
var me = this;
- var taxes_and_charges_field = frappe.meta.get_docfield(me.frm.doc.doctype, "taxes_and_charges",
- me.frm.doc.name);
+ var taxes_and_charges_field = frappe.meta.get_docfield(
+ me.frm.doc.doctype,
+ "taxes_and_charges",
+ me.frm.doc.name
+ );
if (!this.frm.doc.taxes_and_charges && this.frm.doc.taxes && this.frm.doc.taxes.length > 0) {
return;
@@ -508,40 +540,46 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
return frappe.call({
method: "erpnext.controllers.accounts_controller.get_default_taxes_and_charges",
args: {
- "master_doctype": taxes_and_charges_field.options,
- "tax_template": me.frm.doc.taxes_and_charges || "",
- "company": me.frm.doc.company
+ master_doctype: taxes_and_charges_field.options,
+ tax_template: me.frm.doc.taxes_and_charges || "",
+ company: me.frm.doc.company,
},
debounce: 2000,
- callback: function(r) {
- if(!r.exc && r.message) {
+ callback: function (r) {
+ if (!r.exc && r.message) {
frappe.run_serially([
() => {
// directly set in doc, so as not to call triggers
- if(r.message.taxes_and_charges) {
+ if (r.message.taxes_and_charges) {
me.frm.doc.taxes_and_charges = r.message.taxes_and_charges;
}
// set taxes table
- if(r.message.taxes) {
+ if (r.message.taxes) {
me.frm.set_value("taxes", r.message.taxes);
}
},
() => me.set_dynamic_labels(),
- () => me.calculate_taxes_and_totals()
+ () => me.calculate_taxes_and_totals(),
]);
}
- }
+ },
});
}
}
setup_sms() {
var me = this;
- let blacklist = ['Purchase Invoice', 'BOM'];
- if(frappe.boot.sms_gateway_enabled && this.frm.doc.docstatus===1 && !["Lost", "Stopped", "Closed"].includes(this.frm.doc.status)
- && !blacklist.includes(this.frm.doctype)) {
- this.frm.page.add_menu_item(__('Send SMS'), function() { me.send_sms(); });
+ let blacklist = ["Purchase Invoice", "BOM"];
+ if (
+ frappe.boot.sms_gateway_enabled &&
+ this.frm.doc.docstatus === 1 &&
+ !["Lost", "Stopped", "Closed"].includes(this.frm.doc.status) &&
+ !blacklist.includes(this.frm.doctype)
+ ) {
+ this.frm.page.add_menu_item(__("Send SMS"), function () {
+ me.send_sms();
+ });
}
}
@@ -558,13 +596,13 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
doc: doc,
method: "process_item_selection",
args: {
- item_idx: item.idx
+ item_idx: item.idx,
},
- callback: function(r) {
- if(!r.exc) {
+ callback: function (r) {
+ if (!r.exc) {
me.frm.refresh_fields();
}
- }
+ },
});
} else {
me.process_item_selection(doc, cdt, cdn);
@@ -574,18 +612,17 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
process_item_selection(doc, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn);
var me = this;
- var update_stock = 0, show_batch_dialog = 0;
+ var update_stock = 0,
+ show_batch_dialog = 0;
item.weight_per_unit = 0;
- item.weight_uom = '';
+ item.weight_uom = "";
item.conversion_factor = 0;
- if(['Sales Invoice', 'Purchase Invoice'].includes(this.frm.doc.doctype)) {
+ if (["Sales Invoice", "Purchase Invoice"].includes(this.frm.doc.doctype)) {
update_stock = cint(me.frm.doc.update_stock);
show_batch_dialog = update_stock;
-
- } else if((this.frm.doc.doctype === 'Purchase Receipt') ||
- this.frm.doc.doctype === 'Delivery Note') {
+ } else if (this.frm.doc.doctype === "Purchase Receipt" || this.frm.doc.doctype === "Delivery Note") {
show_batch_dialog = 1;
}
@@ -595,12 +632,11 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
item.barcode = null;
-
- if(item.item_code || item.serial_no) {
- if(!this.validate_company_and_party()) {
+ if (item.item_code || item.serial_no) {
+ if (!this.validate_company_and_party()) {
this.frm.fields_dict["items"].grid.grid_rows[item.idx - 1].remove();
} else {
- item.pricing_rules = ''
+ item.pricing_rules = "";
return this.frm.call({
method: "erpnext.stock.get_item_details.get_item_details",
child: item,
@@ -643,7 +679,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
weight_uom: item.weight_uom,
manufacturer: item.manufacturer,
stock_uom: item.stock_uom,
- pos_profile: cint(me.frm.doc.is_pos) ? me.frm.doc.pos_profile : '',
+ pos_profile: cint(me.frm.doc.is_pos) ? me.frm.doc.pos_profile : "",
cost_center: item.cost_center,
tax_category: me.frm.doc.tax_category,
item_tax_template: item.item_tax_template,
@@ -652,18 +688,19 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
is_old_subcontracting_flow: me.frm.doc.is_old_subcontracting_flow,
use_serial_batch_fields: item.use_serial_batch_fields,
serial_and_batch_bundle: item.serial_and_batch_bundle,
- }
+ },
},
- callback: function(r) {
- if(!r.exc) {
+ callback: function (r) {
+ if (!r.exc) {
frappe.run_serially([
() => {
- if (item.docstatus === 0
- && frappe.meta.has_field(item.doctype, "use_serial_batch_fields")
- && !item.use_serial_batch_fields
- && cint(frappe.user_defaults?.use_serial_batch_fields) === 1
- ) {
+ if (
+ item.docstatus === 0 &&
+ frappe.meta.has_field(item.doctype, "use_serial_batch_fields") &&
+ !item.use_serial_batch_fields &&
+ cint(frappe.user_defaults?.use_serial_batch_fields) === 1
+ ) {
item["use_serial_batch_fields"] = 1;
}
},
@@ -676,12 +713,23 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
},
async () => {
// for internal customer instead of pricing rule directly apply valuation rate on item
- const fetch_valuation_rate_for_internal_transactions = await frappe.db.get_single_value(
- "Accounts Settings", "fetch_valuation_rate_for_internal_transaction"
- );
- if ((me.frm.doc.is_internal_customer || me.frm.doc.is_internal_supplier) && fetch_valuation_rate_for_internal_transactions) {
- me.get_incoming_rate(item, me.frm.posting_date, me.frm.posting_time,
- me.frm.doc.doctype, me.frm.doc.company);
+ const fetch_valuation_rate_for_internal_transactions =
+ await frappe.db.get_single_value(
+ "Accounts Settings",
+ "fetch_valuation_rate_for_internal_transaction"
+ );
+ if (
+ (me.frm.doc.is_internal_customer ||
+ me.frm.doc.is_internal_supplier) &&
+ fetch_valuation_rate_for_internal_transactions
+ ) {
+ me.get_incoming_rate(
+ item,
+ me.frm.posting_date,
+ me.frm.posting_time,
+ me.frm.doc.doctype,
+ me.frm.doc.company
+ );
} else {
me.frm.script_manager.trigger("price_list_rate", cdt, cdn);
}
@@ -694,31 +742,45 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
() => me.toggle_conversion_factor(item),
() => {
if (show_batch_dialog && !frappe.flags.trigger_from_barcode_scanner)
- return frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"])
- .then((r) => {
- if (r.message &&
- (r.message.has_batch_no || r.message.has_serial_no)) {
- frappe.flags.hide_serial_batch_dialog = false;
- } else {
- show_batch_dialog = false;
- }
- });
+ return frappe.db
+ .get_value("Item", item.item_code, [
+ "has_batch_no",
+ "has_serial_no",
+ ])
+ .then((r) => {
+ if (
+ r.message &&
+ (r.message.has_batch_no || r.message.has_serial_no)
+ ) {
+ frappe.flags.hide_serial_batch_dialog = false;
+ } else {
+ show_batch_dialog = false;
+ }
+ });
},
() => {
// check if batch serial selector is disabled or not
if (show_batch_dialog && !frappe.flags.hide_serial_batch_dialog)
- return frappe.db.get_single_value('Stock Settings', 'disable_serial_no_and_batch_selector')
- .then((value) => {
- if (value) {
- frappe.flags.hide_serial_batch_dialog = true;
- }
- });
+ return frappe.db
+ .get_single_value(
+ "Stock Settings",
+ "disable_serial_no_and_batch_selector"
+ )
+ .then((value) => {
+ if (value) {
+ frappe.flags.hide_serial_batch_dialog = true;
+ }
+ });
},
() => {
- if(show_batch_dialog && !frappe.flags.hide_serial_batch_dialog && !frappe.flags.dialog_set) {
+ if (
+ show_batch_dialog &&
+ !frappe.flags.hide_serial_batch_dialog &&
+ !frappe.flags.dialog_set
+ ) {
var d = locals[cdt][cdn];
- $.each(r.message, function(k, v) {
- if(!d[k]) d[k] = v;
+ $.each(r.message, function (k, v) {
+ if (!d[k]) d[k] = v;
});
if (d.has_batch_no && d.has_serial_no) {
@@ -726,12 +788,22 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
}
frappe.flags.dialog_set = true;
- erpnext.show_serial_batch_selector(me.frm, d, (item) => {
- me.frm.script_manager.trigger('qty', item.doctype, item.name);
- if (!me.frm.doc.set_warehouse)
- me.frm.script_manager.trigger('warehouse', item.doctype, item.name);
- me.apply_price_list(item, true);
- }, undefined, !frappe.flags.hide_serial_batch_dialog);
+ erpnext.show_serial_batch_selector(
+ me.frm,
+ d,
+ (item) => {
+ me.frm.script_manager.trigger("qty", item.doctype, item.name);
+ if (!me.frm.doc.set_warehouse)
+ me.frm.script_manager.trigger(
+ "warehouse",
+ item.doctype,
+ item.name
+ );
+ me.apply_price_list(item, true);
+ },
+ undefined,
+ !frappe.flags.hide_serial_batch_dialog
+ );
} else {
frappe.flags.dialog_set = false;
}
@@ -741,32 +813,45 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
() => {
if (item.apply_rule_on_other_items) {
let key = item.name;
- me.apply_rule_on_other_items({key: item});
+ me.apply_rule_on_other_items({ key: item });
}
},
() => {
var company_currency = me.get_company_currency();
me.update_item_grid_labels(company_currency);
- }
+ },
]);
}
- }
+ },
});
}
}
}
-
price_list_rate(doc, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn);
frappe.model.round_floats_in(item, ["price_list_rate", "discount_percentage"]);
// check if child doctype is Sales Order Item/Quotation Item and calculate the rate
- if (in_list(["Quotation Item", "Sales Order Item", "Delivery Note Item", "Sales Invoice Item", "POS Invoice Item", "Purchase Invoice Item", "Purchase Order Item", "Purchase Receipt Item"]), cdt)
+ if (
+ (in_list([
+ "Quotation Item",
+ "Sales Order Item",
+ "Delivery Note Item",
+ "Sales Invoice Item",
+ "POS Invoice Item",
+ "Purchase Invoice Item",
+ "Purchase Order Item",
+ "Purchase Receipt Item",
+ ]),
+ cdt)
+ )
this.apply_pricing_rule_on_item(item);
else
- item.rate = flt(item.price_list_rate * (1 - item.discount_percentage / 100.0),
- precision("rate", item));
+ item.rate = flt(
+ item.price_list_rate * (1 - item.discount_percentage / 100.0),
+ precision("rate", item)
+ );
this.calculate_taxes_and_totals();
}
@@ -792,28 +877,27 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
}
get_incoming_rate(item, posting_date, posting_time, voucher_type, company) {
-
let item_args = {
- 'item_code': item.item_code,
- 'warehouse': in_list('Purchase Receipt', 'Purchase Invoice') ? item.from_warehouse : item.warehouse,
- 'posting_date': posting_date,
- 'posting_time': posting_time,
- 'qty': item.qty * item.conversion_factor,
- 'serial_no': item.serial_no,
- 'batch_no': item.batch_no,
- 'voucher_type': voucher_type,
- 'company': company,
- 'allow_zero_valuation_rate': item.allow_zero_valuation_rate
- }
+ item_code: item.item_code,
+ warehouse: in_list("Purchase Receipt", "Purchase Invoice") ? item.from_warehouse : item.warehouse,
+ posting_date: posting_date,
+ posting_time: posting_time,
+ qty: item.qty * item.conversion_factor,
+ serial_no: item.serial_no,
+ batch_no: item.batch_no,
+ voucher_type: voucher_type,
+ company: company,
+ allow_zero_valuation_rate: item.allow_zero_valuation_rate,
+ };
frappe.call({
- method: 'erpnext.stock.utils.get_incoming_rate',
+ method: "erpnext.stock.utils.get_incoming_rate",
args: {
- args: item_args
+ args: item_args,
+ },
+ callback: function (r) {
+ frappe.model.set_value(item.doctype, item.name, "rate", r.message * item.conversion_factor);
},
- callback: function(r) {
- frappe.model.set_value(item.doctype, item.name, 'rate', r.message * item.conversion_factor);
- }
});
}
@@ -821,21 +905,20 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
var me = this;
var item = frappe.get_doc(cdt, cdn);
- if (item && item.doctype === 'Purchase Receipt Item Supplied') {
+ if (item && item.doctype === "Purchase Receipt Item Supplied") {
return;
}
if (item.serial_no) {
- item.use_serial_batch_fields = 1
+ item.use_serial_batch_fields = 1;
}
if (item && item.serial_no) {
if (!item.item_code) {
this.frm.trigger("item_code", cdt, cdn);
- }
- else {
+ } else {
// Replace all occurences of comma with line feed
- item.serial_no = item.serial_no.replace(/,/g, '\n');
+ item.serial_no = item.serial_no.replace(/,/g, "\n");
item.conversion_factor = item.conversion_factor || 1;
refresh_field("serial_no", item.name, item.parentfield);
if (!doc.is_return) {
@@ -848,8 +931,10 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
}
on_submit() {
- if (["Purchase Invoice", "Sales Invoice"].includes(this.frm.doc.doctype)
- && !this.frm.doc.update_stock) {
+ if (
+ ["Purchase Invoice", "Sales Invoice"].includes(this.frm.doc.doctype) &&
+ !this.frm.doc.update_stock
+ ) {
return;
}
@@ -859,7 +944,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
refresh_serial_batch_bundle_field() {
frappe.route_hooks.after_submit = (frm_obj) => {
frm_obj.reload_doc();
- }
+ };
}
update_qty(cdt, cdn) {
@@ -872,14 +957,18 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
valid_serial_nos.push(serialnos[i]);
}
}
- frappe.model.set_value(item.doctype, item.name,
- "qty", valid_serial_nos.length / item.conversion_factor);
+ frappe.model.set_value(
+ item.doctype,
+ item.name,
+ "qty",
+ valid_serial_nos.length / item.conversion_factor
+ );
frappe.model.set_value(item.doctype, item.name, "stock_qty", valid_serial_nos.length);
}
async validate() {
await this.calculate_taxes_and_totals(false);
- await this.confirm_posting_date_change()
+ await this.confirm_posting_date_change();
}
async confirm_posting_date_change() {
@@ -888,8 +977,9 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
if (frappe.datetime.get_today() == this.frm.doc.posting_date) return;
let is_confirmation_reqd = await frappe.db.get_single_value(
- 'Accounts Settings', 'confirm_before_resetting_posting_date'
- )
+ "Accounts Settings",
+ "confirm_before_resetting_posting_date"
+ );
if (!is_confirmation_reqd) return;
@@ -909,34 +999,54 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
}
update_stock() {
- this.frm.trigger('set_default_internal_warehouse');
+ this.frm.trigger("set_default_internal_warehouse");
}
set_default_internal_warehouse() {
let me = this;
- if ((this.frm.doc.doctype === 'Sales Invoice' && me.frm.doc.update_stock)
- || this.frm.doc.doctype == 'Delivery Note') {
- if (this.frm.doc.is_internal_customer && this.frm.doc.company === this.frm.doc.represents_company) {
- frappe.db.get_value('Company', this.frm.doc.company, 'default_in_transit_warehouse', function(value) {
- me.frm.set_value('set_target_warehouse', value.default_in_transit_warehouse);
- });
+ if (
+ (this.frm.doc.doctype === "Sales Invoice" && me.frm.doc.update_stock) ||
+ this.frm.doc.doctype == "Delivery Note"
+ ) {
+ if (
+ this.frm.doc.is_internal_customer &&
+ this.frm.doc.company === this.frm.doc.represents_company
+ ) {
+ frappe.db.get_value(
+ "Company",
+ this.frm.doc.company,
+ "default_in_transit_warehouse",
+ function (value) {
+ me.frm.set_value("set_target_warehouse", value.default_in_transit_warehouse);
+ }
+ );
}
}
- if ((this.frm.doc.doctype === 'Purchase Invoice' && me.frm.doc.update_stock)
- || this.frm.doc.doctype == 'Purchase Receipt') {
- if (this.frm.doc.is_internal_supplier && this.frm.doc.company === this.frm.doc.represents_company) {
- frappe.db.get_value('Company', this.frm.doc.company, 'default_in_transit_warehouse', function(value) {
- me.frm.set_value('set_from_warehouse', value.default_in_transit_warehouse);
- });
+ if (
+ (this.frm.doc.doctype === "Purchase Invoice" && me.frm.doc.update_stock) ||
+ this.frm.doc.doctype == "Purchase Receipt"
+ ) {
+ if (
+ this.frm.doc.is_internal_supplier &&
+ this.frm.doc.company === this.frm.doc.represents_company
+ ) {
+ frappe.db.get_value(
+ "Company",
+ this.frm.doc.company,
+ "default_in_transit_warehouse",
+ function (value) {
+ me.frm.set_value("set_from_warehouse", value.default_in_transit_warehouse);
+ }
+ );
}
}
}
company() {
var me = this;
- var set_pricing = function() {
- if(me.frm.doc.company && me.frm.fields_dict.currency) {
+ var set_pricing = function () {
+ if (me.frm.doc.company && me.frm.fields_dict.currency) {
frappe.run_serially([
() => get_party_currency(),
() => me.update_item_tax_map(),
@@ -946,15 +1056,20 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
() => set_letter_head(),
]);
}
- }
+ };
- var get_party_currency = function() {
+ var get_party_currency = function () {
if (me.is_a_mapped_document() || me.frm.doc.__onload?.load_after_mapping) {
return;
}
- var party_type = frappe.meta.has_field(me.frm.doc.doctype, "customer") ? "Customer" : "Supplier";
- var party_name = me.frm.doc[party_type.toLowerCase()];
+ var party_type, party_name;
+ if (me.frm.doc.doctype == "Quotation" && me.frm.doc.quotation_to == "Customer") {
+ (party_type = "Customer"), (party_name = me.frm.doc.party_name);
+ } else {
+ party_type = frappe.meta.has_field(me.frm.doc.doctype, "customer") ? "Customer" : "Supplier";
+ party_name = me.frm.doc[party_type.toLowerCase()];
+ }
if (party_name) {
frappe.call({
method: "frappe.client.get_value",
@@ -967,14 +1082,14 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
if (r.message) {
set_currency(r.message.default_currency);
}
- }
- })
+ },
+ });
} else {
set_currency();
}
- }
+ };
- var set_currency = function(party_default_currency) {
+ var set_currency = function (party_default_currency) {
var company_currency = me.get_company_currency();
var currency = party_default_currency || company_currency;
if (me.frm.doc.currency != currency) {
@@ -985,57 +1100,63 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
me.frm.set_value("conversion_rate", 1.0);
}
if (me.frm.doc.price_list_currency == company_currency) {
- me.frm.set_value('plc_conversion_rate', 1.0);
+ me.frm.set_value("plc_conversion_rate", 1.0);
}
me.frm.script_manager.trigger("currency");
- }
+ };
- var set_terms = function() {
+ var set_terms = function () {
if (frappe.meta.has_field(me.frm.doc.doctype, "tc_name") && !me.frm.doc.tc_name) {
var company_doc = frappe.get_doc(":Company", me.frm.doc.company);
var selling_doctypes = ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice"];
- var company_terms_fieldname = selling_doctypes.includes(me.frm.doc.doctype) ? "default_selling_terms" : "default_buying_terms";
+ var company_terms_fieldname = selling_doctypes.includes(me.frm.doc.doctype)
+ ? "default_selling_terms"
+ : "default_buying_terms";
if (company_doc && company_doc[company_terms_fieldname]) {
me.frm.set_value("tc_name", company_doc[company_terms_fieldname]);
}
}
- }
+ };
- var set_letter_head = function() {
- if(me.frm.fields_dict.letter_head) {
+ var set_letter_head = function () {
+ if (me.frm.fields_dict.letter_head) {
var company_doc = frappe.get_doc(":Company", me.frm.doc.company);
if (company_doc && company_doc.default_letter_head) {
me.frm.set_value("letter_head", company_doc.default_letter_head);
}
}
- }
+ };
- var set_party_account = function(set_pricing) {
+ var set_party_account = function (set_pricing) {
if (["Sales Invoice", "Purchase Invoice"].includes(me.frm.doc.doctype)) {
- if(me.frm.doc.doctype=="Sales Invoice") {
+ if (me.frm.doc.doctype == "Sales Invoice") {
var party_type = "Customer";
- var party_account_field = 'debit_to';
+ var party_account_field = "debit_to";
} else {
var party_type = "Supplier";
- var party_account_field = 'credit_to';
+ var party_account_field = "credit_to";
}
var party = me.frm.doc[frappe.model.scrub(party_type)];
- if(party && me.frm.doc.company && (!me.frm.doc.__onload?.load_after_mapping || !me.frm.doc[party_account_field])) {
+ if (
+ party &&
+ me.frm.doc.company &&
+ (!me.frm.doc.__onload?.load_after_mapping || !me.frm.doc[party_account_field])
+ ) {
return frappe.call({
method: "erpnext.accounts.party.get_party_account",
args: {
company: me.frm.doc.company,
party_type: party_type,
- party: party
+ party: party,
},
- callback: function(r) {
- if(!r.exc && r.message) {
+ callback: function (r) {
+ if (!r.exc && r.message) {
me.frm.set_value(party_account_field, r.message);
set_pricing();
}
- }
+ },
});
} else {
set_pricing();
@@ -1043,24 +1164,24 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
} else {
set_pricing();
}
+ };
- }
-
- if (frappe.meta.get_docfield(this.frm.doctype, "shipping_address") &&
- ['Purchase Order', 'Purchase Receipt', 'Purchase Invoice'].includes(this.frm.doctype)) {
- let is_drop_ship = me.frm.doc.items.some(item => item.delivered_by_supplier);
-
- if (!is_drop_ship) {
- erpnext.utils.get_shipping_address(this.frm, function() {
- set_party_account(set_pricing);
- });
- }
+ if (
+ frappe.meta.get_docfield(this.frm.doctype, "shipping_address") &&
+ ["Purchase Order", "Purchase Receipt", "Purchase Invoice"].includes(this.frm.doctype)
+ ) {
+ let is_drop_ship = me.frm.doc.items.some((item) => item.delivered_by_supplier);
+ if (!is_drop_ship) {
+ erpnext.utils.get_shipping_address(this.frm, function () {
+ set_party_account(set_pricing);
+ });
+ }
} else {
set_party_account(set_pricing);
}
- if(this.frm.doc.company) {
+ if (this.frm.doc.company) {
erpnext.last_selected_company = this.frm.doc.company;
}
}
@@ -1077,26 +1198,29 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
if (this.frm.doc.posting_date) {
this.frm.posting_date = this.frm.doc.posting_date;
- if ((this.frm.doc.doctype == "Sales Invoice" && this.frm.doc.customer) ||
- (this.frm.doc.doctype == "Purchase Invoice" && this.frm.doc.supplier)) {
+ if (
+ (this.frm.doc.doctype == "Sales Invoice" && this.frm.doc.customer) ||
+ (this.frm.doc.doctype == "Purchase Invoice" && this.frm.doc.supplier)
+ ) {
return frappe.call({
method: "erpnext.accounts.party.get_due_date",
args: {
- "posting_date": me.frm.doc.posting_date,
- "party_type": me.frm.doc.doctype == "Sales Invoice" ? "Customer" : "Supplier",
- "bill_date": me.frm.doc.bill_date,
- "party": me.frm.doc.doctype == "Sales Invoice" ? me.frm.doc.customer : me.frm.doc.supplier,
- "company": me.frm.doc.company
+ posting_date: me.frm.doc.posting_date,
+ party_type: me.frm.doc.doctype == "Sales Invoice" ? "Customer" : "Supplier",
+ bill_date: me.frm.doc.bill_date,
+ party:
+ me.frm.doc.doctype == "Sales Invoice" ? me.frm.doc.customer : me.frm.doc.supplier,
+ company: me.frm.doc.company,
},
- callback: function(r, rt) {
- if(r.message) {
+ callback: function (r, rt) {
+ if (r.message) {
me.frm.doc.due_date = r.message;
refresh_field("due_date");
frappe.ui.form.trigger(me.frm.doc.doctype, "currency");
me.recalculate_terms();
}
- }
- })
+ },
+ });
} else {
frappe.ui.form.trigger(me.frm.doc.doctype, "currency");
}
@@ -1113,20 +1237,17 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
}
// if there is only one row in payment schedule child table, set its due date as the due date
- if (doc.payment_schedule.length == 1){
+ if (doc.payment_schedule.length == 1) {
doc.payment_schedule[0].due_date = doc.due_date;
this.frm.refresh_field("payment_schedule");
- return
+ return;
}
if (
doc.due_date &&
!this.frm.updating_party_details &&
!doc.is_pos &&
- (
- doc.payment_terms_template ||
- doc.payment_schedule?.length
- )
+ (doc.payment_terms_template || doc.payment_schedule?.length)
) {
const to_clear = [];
if (doc.payment_terms_template) {
@@ -1140,10 +1261,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
frappe.confirm(
__(
"For the new {0} to take effect, would you like to clear the current {1}?",
- [
- __(frappe.meta.get_label(cdt, "due_date")),
- frappe.utils.comma_and(to_clear)
- ],
+ [__(frappe.meta.get_label(cdt, "due_date")), frappe.utils.comma_and(to_clear)],
"Clear payment terms template and/or payment schedule when due date is changed"
),
() => {
@@ -1165,18 +1283,18 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
this.payment_terms_template();
} else if (doc.payment_schedule) {
const me = this;
- doc.payment_schedule.forEach(
- function(term) {
- if (term.payment_term) {
- me.payment_term(doc, term.doctype, term.name);
- } else {
- frappe.model.set_value(
- term.doctype, term.name, 'due_date',
- doc.posting_date || doc.transaction_date
- );
- }
+ doc.payment_schedule.forEach(function (term) {
+ if (term.payment_term) {
+ me.payment_term(doc, term.doctype, term.name);
+ } else {
+ frappe.model.set_value(
+ term.doctype,
+ term.name,
+ "due_date",
+ doc.posting_date || doc.transaction_date
+ );
}
- );
+ });
}
}
@@ -1191,27 +1309,34 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
currency() {
// The transaction date be either transaction_date (from orders) or posting_date (from invoices)
let transaction_date = this.frm.doc.transaction_date || this.frm.doc.posting_date;
- let inter_company_reference = this.frm.doc.inter_company_order_reference || this.frm.doc.inter_company_invoice_reference;
+ let inter_company_reference =
+ this.frm.doc.inter_company_order_reference || this.frm.doc.inter_company_invoice_reference;
let me = this;
this.set_dynamic_labels();
let company_currency = this.get_company_currency();
// Added `load_after_mapping` to determine if document is loading after mapping from another doc
- if(this.frm.doc.currency && this.frm.doc.currency !== company_currency
- && (!this.frm.doc.__onload?.load_after_mapping || inter_company_reference)) {
-
- this.get_exchange_rate(transaction_date, this.frm.doc.currency, company_currency,
- function(exchange_rate) {
- if(exchange_rate != me.frm.doc.conversion_rate) {
+ if (
+ this.frm.doc.currency &&
+ this.frm.doc.currency !== company_currency &&
+ (!this.frm.doc.__onload?.load_after_mapping || inter_company_reference)
+ ) {
+ this.get_exchange_rate(
+ transaction_date,
+ this.frm.doc.currency,
+ company_currency,
+ function (exchange_rate) {
+ if (exchange_rate != me.frm.doc.conversion_rate) {
me.set_margin_amount_based_on_currency(exchange_rate);
me.set_actual_charges_based_on_currency(exchange_rate);
me.frm.set_value("conversion_rate", exchange_rate);
}
- });
+ }
+ );
} else {
// company currency and doc currency is same
// this will prevent unnecessary conversion rate triggers
- if(this.frm.doc.currency === this.get_company_currency()) {
+ if (this.frm.doc.currency === this.get_company_currency()) {
this.frm.set_value("conversion_rate", 1.0);
} else {
this.conversion_rate();
@@ -1221,21 +1346,22 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
conversion_rate() {
const me = this.frm;
- if(this.frm.doc.currency === this.get_company_currency()) {
+ if (this.frm.doc.currency === this.get_company_currency()) {
this.frm.set_value("conversion_rate", 1.0);
}
- if(this.frm.doc.currency === this.frm.doc.price_list_currency &&
- this.frm.doc.plc_conversion_rate !== this.frm.doc.conversion_rate) {
+ if (
+ this.frm.doc.currency === this.frm.doc.price_list_currency &&
+ this.frm.doc.plc_conversion_rate !== this.frm.doc.conversion_rate
+ ) {
this.frm.set_value("plc_conversion_rate", this.frm.doc.conversion_rate);
}
- if(flt(this.frm.doc.conversion_rate)>0.0) {
- if(this.frm.doc.__onload?.load_after_mapping) {
+ if (flt(this.frm.doc.conversion_rate) > 0.0) {
+ if (this.frm.doc.__onload?.load_after_mapping) {
this.calculate_taxes_and_totals();
- } else if (!this.in_apply_price_list){
+ } else if (!this.in_apply_price_list) {
this.apply_price_list();
}
-
}
// Make read only if Accounts Settings doesn't allow stale rates
this.frm.set_df_property("conversion_rate", "read_only", erpnext.stale_rate_allowed() ? 0 : 1);
@@ -1243,7 +1369,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
apply_discount_on_item(doc, cdt, cdn, field) {
var item = frappe.get_doc(cdt, cdn);
- if(item && !item.price_list_rate) {
+ if (item && !item.price_list_rate) {
item[field] = 0.0;
} else {
this.price_list_rate(doc, cdt, cdn);
@@ -1253,24 +1379,41 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
shipping_rule() {
var me = this;
- if(this.frm.doc.shipping_rule) {
- return this.frm.call({
- doc: this.frm.doc,
- method: "apply_shipping_rule",
- callback: function(r) {
- me._calculate_taxes_and_totals();
- }
- }).fail(() => this.frm.set_value('shipping_rule', ''));
+ if (this.frm.doc.shipping_rule) {
+ return this.frm
+ .call({
+ doc: this.frm.doc,
+ method: "apply_shipping_rule",
+ callback: function (r) {
+ me._calculate_taxes_and_totals();
+ },
+ })
+ .fail(() => this.frm.set_value("shipping_rule", ""));
}
}
set_margin_amount_based_on_currency(exchange_rate) {
- if (in_list(["Quotation", "Sales Order", "Delivery Note", "Sales Invoice", "Purchase Invoice", "Purchase Order", "Purchase Receipt"]), this.frm.doc.doctype) {
+ if (
+ (in_list([
+ "Quotation",
+ "Sales Order",
+ "Delivery Note",
+ "Sales Invoice",
+ "Purchase Invoice",
+ "Purchase Order",
+ "Purchase Receipt",
+ ]),
+ this.frm.doc.doctype)
+ ) {
var me = this;
- $.each(this.frm.doc.items || [], function(i, d) {
- if(d.margin_type == "Amount") {
- frappe.model.set_value(d.doctype, d.name, "margin_rate_or_amount",
- flt(d.margin_rate_or_amount) / flt(exchange_rate));
+ $.each(this.frm.doc.items || [], function (i, d) {
+ if (d.margin_type == "Amount") {
+ frappe.model.set_value(
+ d.doctype,
+ d.name,
+ "margin_rate_or_amount",
+ flt(d.margin_rate_or_amount) / flt(exchange_rate)
+ );
}
});
}
@@ -1278,10 +1421,14 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
set_actual_charges_based_on_currency(exchange_rate) {
var me = this;
- $.each(this.frm.doc.taxes || [], function(i, d) {
- if(d.charge_type == "Actual") {
- frappe.model.set_value(d.doctype, d.name, "tax_amount",
- flt(d.base_tax_amount) / flt(exchange_rate));
+ $.each(this.frm.doc.taxes || [], function (i, d) {
+ if (d.charge_type == "Actual") {
+ frappe.model.set_value(
+ d.doctype,
+ d.name,
+ "tax_amount",
+ flt(d.base_tax_amount) / flt(exchange_rate)
+ );
}
});
}
@@ -1290,8 +1437,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
var args;
if (["Quotation", "Sales Order", "Delivery Note", "Sales Invoice"].includes(this.frm.doctype)) {
args = "for_selling";
- }
- else if (["Purchase Order", "Purchase Receipt", "Purchase Invoice"].includes(this.frm.doctype)) {
+ } else if (["Purchase Order", "Purchase Receipt", "Purchase Invoice"].includes(this.frm.doctype)) {
args = "for_buying";
}
@@ -1302,43 +1448,52 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
transaction_date: transaction_date,
from_currency: from_currency,
to_currency: to_currency,
- args: args
+ args: args,
},
freeze: true,
freeze_message: __("Fetching exchange rates ..."),
- callback: function(r) {
+ callback: function (r) {
callback(flt(r.message));
- }
+ },
});
}
price_list_currency() {
- var me=this;
+ var me = this;
this.set_dynamic_labels();
var company_currency = this.get_company_currency();
// Added `load_after_mapping` to determine if document is loading after mapping from another doc
- if(this.frm.doc.price_list_currency !== company_currency &&
- !this.frm.doc.__onload?.load_after_mapping) {
- this.get_exchange_rate(this.frm.doc.posting_date, this.frm.doc.price_list_currency, company_currency,
- function(exchange_rate) {
+ if (
+ this.frm.doc.price_list_currency !== company_currency &&
+ !this.frm.doc.__onload?.load_after_mapping
+ ) {
+ this.get_exchange_rate(
+ this.frm.doc.posting_date,
+ this.frm.doc.price_list_currency,
+ company_currency,
+ function (exchange_rate) {
me.frm.set_value("plc_conversion_rate", exchange_rate);
- });
+ }
+ );
} else {
this.plc_conversion_rate();
}
}
plc_conversion_rate() {
- if(this.frm.doc.price_list_currency === this.get_company_currency()) {
+ if (this.frm.doc.price_list_currency === this.get_company_currency()) {
this.frm.set_value("plc_conversion_rate", 1.0);
- } else if(this.frm.doc.price_list_currency === this.frm.doc.currency
- && this.frm.doc.plc_conversion_rate && cint(this.frm.doc.plc_conversion_rate) != 1 &&
- cint(this.frm.doc.plc_conversion_rate) != cint(this.frm.doc.conversion_rate)) {
+ } else if (
+ this.frm.doc.price_list_currency === this.frm.doc.currency &&
+ this.frm.doc.plc_conversion_rate &&
+ cint(this.frm.doc.plc_conversion_rate) != 1 &&
+ cint(this.frm.doc.plc_conversion_rate) != cint(this.frm.doc.conversion_rate)
+ ) {
this.frm.set_value("conversion_rate", this.frm.doc.plc_conversion_rate);
}
- if(!this.in_apply_price_list) {
+ if (!this.in_apply_price_list) {
this.apply_price_list(null, true);
}
}
@@ -1346,46 +1501,45 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
uom(doc, cdt, cdn) {
var me = this;
var item = frappe.get_doc(cdt, cdn);
- item.pricing_rules = ''
- if(item.item_code && item.uom) {
+ item.pricing_rules = "";
+ if (item.item_code && item.uom) {
return this.frm.call({
method: "erpnext.stock.get_item_details.get_conversion_factor",
args: {
item_code: item.item_code,
- uom: item.uom
+ uom: item.uom,
},
- callback: function(r) {
- if(!r.exc) {
- frappe.model.set_value(cdt, cdn, 'conversion_factor', r.message.conversion_factor);
+ callback: function (r) {
+ if (!r.exc) {
+ frappe.model.set_value(cdt, cdn, "conversion_factor", r.message.conversion_factor);
me.apply_price_list(item, true);
}
- }
+ },
});
}
me.calculate_stock_uom_rate(doc, cdt, cdn);
}
conversion_factor(doc, cdt, cdn, dont_fetch_price_list_rate) {
- if(frappe.meta.get_docfield(cdt, "stock_qty", cdn)) {
+ if (frappe.meta.get_docfield(cdt, "stock_qty", cdn)) {
var item = frappe.get_doc(cdt, cdn);
frappe.model.round_floats_in(item, ["qty", "conversion_factor"]);
item.stock_qty = flt(item.qty * item.conversion_factor, precision("stock_qty", item));
refresh_field("stock_qty", item.name, item.parentfield);
this.toggle_conversion_factor(item);
- if(doc.doctype != "Material Request") {
+ if (doc.doctype != "Material Request") {
item.total_weight = flt(item.stock_qty * item.weight_per_unit);
refresh_field("total_weight", item.name, item.parentfield);
this.calculate_net_weight();
}
// for handling customization not to fetch price list rate
- if(frappe.flags.dont_fetch_price_list_rate) {
- return
+ if (frappe.flags.dont_fetch_price_list_rate) {
+ return;
}
- if (!dont_fetch_price_list_rate &&
- frappe.meta.has_field(doc.doctype, "price_list_currency")) {
+ if (!dont_fetch_price_list_rate && frappe.meta.has_field(doc.doctype, "price_list_currency")) {
this.apply_price_list(item, true);
}
this.calculate_stock_uom_rate(doc, cdt, cdn);
@@ -1404,16 +1558,14 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
const mappped_fields = mapped_item_field_map[this.frm.doc.doctype] || [];
if (item) {
- return mappped_fields
- .map((field) => item[field])
- .filter(Boolean).length > 0;
+ return mappped_fields.map((field) => item[field]).filter(Boolean).length > 0;
} else if (this.frm.doc?.items) {
let first_row = this.frm.doc.items[0];
if (!first_row) {
- return false
- };
+ return false;
+ }
- let mapped_rows = mappped_fields.filter(d => first_row[d])
+ let mapped_rows = mappped_fields.filter((d) => first_row[d]);
return mapped_rows?.length > 0;
}
@@ -1421,9 +1573,15 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
toggle_conversion_factor(item) {
// toggle read only property for conversion factor field if the uom and stock uom are same
- if(this.frm.get_field('items').grid.fields_map.conversion_factor) {
- this.frm.fields_dict.items.grid.toggle_enable("conversion_factor",
- ((item.uom != item.stock_uom) && !frappe.meta.get_docfield(cur_frm.fields_dict.items.grid.doctype, "conversion_factor").read_only)? true: false);
+ if (this.frm.get_field("items").grid.fields_map.conversion_factor) {
+ this.frm.fields_dict.items.grid.toggle_enable(
+ "conversion_factor",
+ item.uom != item.stock_uom &&
+ !frappe.meta.get_docfield(cur_frm.fields_dict.items.grid.doctype, "conversion_factor")
+ .read_only
+ ? true
+ : false
+ );
}
}
@@ -1436,11 +1594,11 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
() => this.conversion_factor(doc, cdt, cdn, true),
() => this.apply_price_list(item, true), //reapply price list before applying pricing rule
() => this.calculate_stock_uom_rate(doc, cdt, cdn),
- () => this.apply_pricing_rule(item, true)
+ () => this.apply_pricing_rule(item, true),
]);
} else {
- this.conversion_factor(doc, cdt, cdn, true)
- this.calculate_taxes_and_totals()
+ this.conversion_factor(doc, cdt, cdn, true);
+ this.calculate_taxes_and_totals();
}
}
@@ -1465,12 +1623,12 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
service_stop_date(frm, cdt, cdn) {
var child = locals[cdt][cdn];
- if(child.service_stop_date) {
+ if (child.service_stop_date) {
let start_date = Date.parse(child.service_start_date);
let end_date = Date.parse(child.service_end_date);
let stop_date = Date.parse(child.service_stop_date);
- if(stop_date < start_date) {
+ if (stop_date < start_date) {
frappe.model.set_value(cdt, cdn, "service_stop_date", "");
frappe.throw(__("Service Stop Date cannot be before Service Start Date"));
} else if (stop_date > end_date) {
@@ -1483,14 +1641,14 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
service_start_date(frm, cdt, cdn) {
var child = locals[cdt][cdn];
- if(child.service_start_date) {
+ if (child.service_start_date) {
frappe.call({
- "method": "erpnext.stock.get_item_details.calculate_service_end_date",
- args: {ctx: child},
- callback: function(r) {
+ method: "erpnext.stock.get_item_details.calculate_service_end_date",
+ args: { ctx: child },
+ callback: function (r) {
frappe.model.set_value(cdt, cdn, "service_end_date", r.message.service_end_date);
- }
- })
+ },
+ });
}
}
@@ -1499,12 +1657,12 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
this.frm.trigger("calculate_net_weight");
}
- calculate_net_weight(){
+ calculate_net_weight() {
/* Calculate Total Net Weight then further applied shipping rule to calculate shipping charges.*/
var me = this;
- this.frm.doc.total_net_weight= 0.0;
+ this.frm.doc.total_net_weight = 0.0;
- $.each(this.frm.doc["items"] || [], function(i, item) {
+ $.each(this.frm.doc["items"] || [], function (i, item) {
me.frm.doc.total_net_weight += flt(item.total_weight);
});
refresh_field("total_net_weight");
@@ -1513,8 +1671,10 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
set_dynamic_labels() {
// What TODO? should we make price list system non-mandatory?
- this.frm.toggle_reqd("plc_conversion_rate",
- !!(this.frm.doc.price_list_name && this.frm.doc.price_list_currency));
+ this.frm.toggle_reqd(
+ "plc_conversion_rate",
+ !!(this.frm.doc.price_list_name && this.frm.doc.price_list_currency)
+ );
var company_currency = this.get_company_currency();
this.change_form_labels(company_currency);
@@ -1525,50 +1685,114 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
change_form_labels(company_currency) {
let me = this;
- this.frm.set_currency_labels(["base_total", "base_net_total", "base_total_taxes_and_charges",
- "base_discount_amount", "base_grand_total", "base_rounded_total", "base_in_words",
- "base_taxes_and_charges_added", "base_taxes_and_charges_deducted", "total_amount_to_pay",
- "base_paid_amount", "base_write_off_amount", "base_change_amount", "base_operating_cost",
- "base_raw_material_cost", "base_total_cost", "base_scrap_material_cost",
- "base_rounding_adjustment"], company_currency);
+ this.frm.set_currency_labels(
+ [
+ "base_total",
+ "base_net_total",
+ "base_total_taxes_and_charges",
+ "base_discount_amount",
+ "base_grand_total",
+ "base_rounded_total",
+ "base_in_words",
+ "base_taxes_and_charges_added",
+ "base_taxes_and_charges_deducted",
+ "total_amount_to_pay",
+ "base_paid_amount",
+ "base_write_off_amount",
+ "base_change_amount",
+ "base_operating_cost",
+ "base_raw_material_cost",
+ "base_total_cost",
+ "base_scrap_material_cost",
+ "base_rounding_adjustment",
+ ],
+ company_currency
+ );
- this.frm.set_currency_labels(["total", "net_total", "total_taxes_and_charges", "discount_amount",
- "grand_total", "taxes_and_charges_added", "taxes_and_charges_deducted","tax_withholding_net_total",
- "rounded_total", "in_words", "paid_amount", "write_off_amount", "operating_cost",
- "scrap_material_cost", "rounding_adjustment", "raw_material_cost",
- "total_cost"], this.frm.doc.currency);
+ this.frm.set_currency_labels(
+ [
+ "total",
+ "net_total",
+ "total_taxes_and_charges",
+ "discount_amount",
+ "grand_total",
+ "taxes_and_charges_added",
+ "taxes_and_charges_deducted",
+ "tax_withholding_net_total",
+ "rounded_total",
+ "in_words",
+ "paid_amount",
+ "write_off_amount",
+ "operating_cost",
+ "scrap_material_cost",
+ "rounding_adjustment",
+ "raw_material_cost",
+ "total_cost",
+ ],
+ this.frm.doc.currency
+ );
- this.frm.set_currency_labels(["outstanding_amount", "total_advance"],
- this.frm.doc.party_account_currency);
+ this.frm.set_currency_labels(
+ ["outstanding_amount", "total_advance"],
+ this.frm.doc.party_account_currency
+ );
- this.frm.set_df_property("conversion_rate", "description", "1 " + this.frm.doc.currency
- + " = [?] " + company_currency);
+ this.frm.set_df_property(
+ "conversion_rate",
+ "description",
+ "1 " + this.frm.doc.currency + " = [?] " + company_currency
+ );
- if(this.frm.doc.price_list_currency && this.frm.doc.price_list_currency!=company_currency) {
- this.frm.set_df_property("plc_conversion_rate", "description", "1 "
- + this.frm.doc.price_list_currency + " = [?] " + company_currency);
+ if (this.frm.doc.price_list_currency && this.frm.doc.price_list_currency != company_currency) {
+ this.frm.set_df_property(
+ "plc_conversion_rate",
+ "description",
+ "1 " + this.frm.doc.price_list_currency + " = [?] " + company_currency
+ );
}
// toggle fields
- this.frm.toggle_display(["conversion_rate", "base_total", "base_net_total", "base_tax_withholding_net_total",
- "base_total_taxes_and_charges", "base_taxes_and_charges_added", "base_taxes_and_charges_deducted",
- "base_grand_total", "base_rounded_total", "base_in_words", "base_discount_amount",
- "base_paid_amount", "base_write_off_amount", "base_operating_cost", "base_raw_material_cost",
- "base_total_cost", "base_scrap_material_cost", "base_rounding_adjustment"],
- this.frm.doc.currency != company_currency);
+ this.frm.toggle_display(
+ [
+ "conversion_rate",
+ "base_total",
+ "base_net_total",
+ "base_tax_withholding_net_total",
+ "base_total_taxes_and_charges",
+ "base_taxes_and_charges_added",
+ "base_taxes_and_charges_deducted",
+ "base_grand_total",
+ "base_rounded_total",
+ "base_in_words",
+ "base_discount_amount",
+ "base_paid_amount",
+ "base_write_off_amount",
+ "base_operating_cost",
+ "base_raw_material_cost",
+ "base_total_cost",
+ "base_scrap_material_cost",
+ "base_rounding_adjustment",
+ ],
+ this.frm.doc.currency != company_currency
+ );
- this.frm.toggle_display(["plc_conversion_rate", "price_list_currency"],
- this.frm.doc.price_list_currency != company_currency);
+ this.frm.toggle_display(
+ ["plc_conversion_rate", "price_list_currency"],
+ this.frm.doc.price_list_currency != company_currency
+ );
- let show = cint(this.frm.doc.discount_amount) ||
- ((this.frm.doc.taxes || []).filter(function(d) {return d.included_in_print_rate===1}).length);
+ let show =
+ cint(this.frm.doc.discount_amount) ||
+ (this.frm.doc.taxes || []).filter(function (d) {
+ return d.included_in_print_rate === 1;
+ }).length;
- if(this.frm.doc.doctype && frappe.meta.get_docfield(this.frm.doc.doctype, "net_total")) {
+ if (this.frm.doc.doctype && frappe.meta.get_docfield(this.frm.doc.doctype, "net_total")) {
this.frm.toggle_display("net_total", show);
}
- if(this.frm.doc.doctype && frappe.meta.get_docfield(this.frm.doc.doctype, "base_net_total")) {
- this.frm.toggle_display("base_net_total", (show && (me.frm.doc.currency != company_currency)));
+ if (this.frm.doc.doctype && frappe.meta.get_docfield(this.frm.doc.doctype, "base_net_total")) {
+ this.frm.toggle_display("base_net_total", show && me.frm.doc.currency != company_currency);
}
}
@@ -1580,12 +1804,20 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
this.toggle_item_grid_columns(company_currency);
if (this.frm.doc.operations && this.frm.doc.operations.length > 0) {
- this.frm.set_currency_labels(["operating_cost", "hour_rate"], this.frm.doc.currency, "operations");
- this.frm.set_currency_labels(["base_operating_cost", "base_hour_rate"], company_currency, "operations");
+ this.frm.set_currency_labels(
+ ["operating_cost", "hour_rate"],
+ this.frm.doc.currency,
+ "operations"
+ );
+ this.frm.set_currency_labels(
+ ["base_operating_cost", "base_hour_rate"],
+ company_currency,
+ "operations"
+ );
var item_grid = this.frm.fields_dict["operations"].grid;
- $.each(["base_operating_cost", "base_hour_rate"], function(i, fname) {
- if(frappe.meta.get_docfield(item_grid.doctype, fname))
+ $.each(["base_operating_cost", "base_hour_rate"], function (i, fname) {
+ if (frappe.meta.get_docfield(item_grid.doctype, fname))
item_grid.set_column_disp(fname, me.frm.doc.currency != company_currency);
});
}
@@ -1595,48 +1827,82 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
this.frm.set_currency_labels(["base_rate", "base_amount"], company_currency, "scrap_items");
var item_grid = this.frm.fields_dict["scrap_items"].grid;
- $.each(["base_rate", "base_amount"], function(i, fname) {
- if(frappe.meta.get_docfield(item_grid.doctype, fname))
+ $.each(["base_rate", "base_amount"], function (i, fname) {
+ if (frappe.meta.get_docfield(item_grid.doctype, fname))
item_grid.set_column_disp(fname, me.frm.doc.currency != company_currency);
});
}
if (this.frm.doc.taxes && this.frm.doc.taxes.length > 0) {
- this.frm.set_currency_labels(["tax_amount", "total", "tax_amount_after_discount"], this.frm.doc.currency, "taxes");
+ this.frm.set_currency_labels(
+ ["tax_amount", "total", "tax_amount_after_discount"],
+ this.frm.doc.currency,
+ "taxes"
+ );
- this.frm.set_currency_labels(["base_tax_amount", "base_total", "base_tax_amount_after_discount"], company_currency, "taxes");
+ this.frm.set_currency_labels(
+ ["base_tax_amount", "base_total", "base_tax_amount_after_discount"],
+ company_currency,
+ "taxes"
+ );
}
if (this.frm.doc.advances && this.frm.doc.advances.length > 0) {
- this.frm.set_currency_labels(["advance_amount", "allocated_amount"],
- this.frm.doc.party_account_currency, "advances");
+ this.frm.set_currency_labels(
+ ["advance_amount", "allocated_amount"],
+ this.frm.doc.party_account_currency,
+ "advances"
+ );
}
this.update_payment_schedule_grid_labels(company_currency);
}
update_item_grid_labels(company_currency) {
- this.frm.set_currency_labels([
- "base_rate", "base_net_rate", "base_price_list_rate",
- "base_amount", "base_net_amount", "base_rate_with_margin"
- ], company_currency, "items");
+ this.frm.set_currency_labels(
+ [
+ "base_rate",
+ "base_net_rate",
+ "base_price_list_rate",
+ "base_amount",
+ "base_net_amount",
+ "base_rate_with_margin",
+ ],
+ company_currency,
+ "items"
+ );
- this.frm.set_currency_labels([
- "rate", "net_rate", "price_list_rate", "amount",
- "net_amount", "stock_uom_rate", "rate_with_margin"
- ], this.frm.doc.currency, "items");
+ this.frm.set_currency_labels(
+ [
+ "rate",
+ "net_rate",
+ "price_list_rate",
+ "amount",
+ "net_amount",
+ "stock_uom_rate",
+ "rate_with_margin",
+ ],
+ this.frm.doc.currency,
+ "items"
+ );
}
update_payment_schedule_grid_labels(company_currency) {
const me = this;
if (this.frm.doc.payment_schedule && this.frm.doc.payment_schedule.length > 0) {
- this.frm.set_currency_labels(["base_payment_amount", "base_outstanding", "base_paid_amount"],
- company_currency, "payment_schedule");
- this.frm.set_currency_labels(["payment_amount", "outstanding", "paid_amount"],
- this.frm.doc.currency, "payment_schedule");
+ this.frm.set_currency_labels(
+ ["base_payment_amount", "base_outstanding", "base_paid_amount"],
+ company_currency,
+ "payment_schedule"
+ );
+ this.frm.set_currency_labels(
+ ["payment_amount", "outstanding", "paid_amount"],
+ this.frm.doc.currency,
+ "payment_schedule"
+ );
var schedule_grid = this.frm.fields_dict["payment_schedule"].grid;
- $.each(["base_payment_amount", "base_outstanding", "base_paid_amount"], function(i, fname) {
+ $.each(["base_payment_amount", "base_outstanding", "base_paid_amount"], function (i, fname) {
if (frappe.meta.get_docfield(schedule_grid.doctype, fname))
schedule_grid.set_column_disp(fname, me.frm.doc.currency != company_currency);
});
@@ -1647,7 +1913,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
let row = locals[cdt][cdn];
if (row.batch_no) {
- row.use_serial_batch_fields = 1
+ row.use_serial_batch_fields = 1;
}
if (row.batch_no) {
@@ -1661,15 +1927,15 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
pctx: params,
item_code: row.item_code,
},
- callback: function(r) {
+ callback: function (r) {
if (!r.exc && r.message) {
row.price_list_rate = r.message;
row.rate = r.message;
refresh_field("rate", row.name, row.parentfield);
refresh_field("price_list_rate", row.name, row.parentfield);
}
- }
- })
+ },
+ });
}
}
@@ -1677,22 +1943,27 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
const me = this;
// toggle columns
var item_grid = this.frm.fields_dict["items"].grid;
- $.each(["base_rate", "base_price_list_rate", "base_amount", "base_rate_with_margin"], function(i, fname) {
- if(frappe.meta.get_docfield(item_grid.doctype, fname))
- item_grid.set_column_disp(fname, me.frm.doc.currency != company_currency);
+ $.each(
+ ["base_rate", "base_price_list_rate", "base_amount", "base_rate_with_margin"],
+ function (i, fname) {
+ if (frappe.meta.get_docfield(item_grid.doctype, fname))
+ item_grid.set_column_disp(fname, me.frm.doc.currency != company_currency);
+ }
+ );
+
+ var show =
+ cint(this.frm.doc.discount_amount) ||
+ (this.frm.doc.taxes || []).filter(function (d) {
+ return d.included_in_print_rate === 1;
+ }).length;
+
+ $.each(["net_rate", "net_amount"], function (i, fname) {
+ if (frappe.meta.get_docfield(item_grid.doctype, fname)) item_grid.set_column_disp(fname, show);
});
- var show = (cint(this.frm.doc.discount_amount)) ||
- ((this.frm.doc.taxes || []).filter(function(d) {return d.included_in_print_rate===1}).length);
-
- $.each(["net_rate", "net_amount"], function(i, fname) {
- if(frappe.meta.get_docfield(item_grid.doctype, fname))
- item_grid.set_column_disp(fname, show);
- });
-
- $.each(["base_net_rate", "base_net_amount"], function(i, fname) {
- if(frappe.meta.get_docfield(item_grid.doctype, fname))
- item_grid.set_column_disp(fname, (show && (me.frm.doc.currency != company_currency)));
+ $.each(["base_net_rate", "base_net_amount"], function (i, fname) {
+ if (frappe.meta.get_docfield(item_grid.doctype, fname))
+ item_grid.set_column_disp(fname, show && me.frm.doc.currency != company_currency);
});
}
@@ -1709,41 +1980,41 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
}
ignore_pricing_rule() {
- if(this.frm.doc.ignore_pricing_rule) {
+ if (this.frm.doc.ignore_pricing_rule) {
let me = this;
let item_list = [];
- $.each(this.frm.doc["items"] || [], function(i, d) {
+ $.each(this.frm.doc["items"] || [], function (i, d) {
if (d.item_code) {
if (d.is_free_item) {
// Simply remove free items
me.frm.get_field("items").grid.grid_rows[i].remove();
} else {
item_list.push({
- "doctype": d.doctype,
- "name": d.name,
- "item_code": d.item_code,
- "pricing_rules": d.pricing_rules,
- "parenttype": d.parenttype,
- "parent": d.parent,
- "price_list_rate": d.price_list_rate
- })
+ doctype: d.doctype,
+ name: d.name,
+ item_code: d.item_code,
+ pricing_rules: d.pricing_rules,
+ parenttype: d.parenttype,
+ parent: d.parent,
+ price_list_rate: d.price_list_rate,
+ });
}
}
});
return this.frm.call({
method: "erpnext.accounts.doctype.pricing_rule.pricing_rule.remove_pricing_rules",
args: { item_list: item_list },
- callback: function(r) {
+ callback: function (r) {
if (!r.exc && r.message) {
- r.message.forEach(row_item => {
+ r.message.forEach((row_item) => {
me.remove_pricing_rule(row_item);
});
me._set_values_for_item_list(r.message);
me.calculate_taxes_and_totals();
- if(me.frm.doc.apply_discount_on) me.frm.trigger("apply_discount_on");
+ if (me.frm.doc.apply_discount_on) me.frm.trigger("apply_discount_on");
}
- }
+ },
});
} else {
this.apply_pricing_rule();
@@ -1753,31 +2024,31 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
remove_pricing_rule_for_item(item) {
// capture pricing rule before removing it to delete free items
let removed_pricing_rule = item.pricing_rules;
- if (item.pricing_rules){
+ if (item.pricing_rules) {
let me = this;
return this.frm.call({
method: "erpnext.accounts.doctype.pricing_rule.pricing_rule.remove_pricing_rule_for_item",
args: {
pricing_rules: item.pricing_rules,
item_details: {
- "doctype": item.doctype,
- "name": item.name,
- "item_code": item.item_code,
- "pricing_rules": item.pricing_rules,
- "parenttype": item.parenttype,
- "parent": item.parent,
- "price_list_rate": item.price_list_rate
+ doctype: item.doctype,
+ name: item.name,
+ item_code: item.item_code,
+ pricing_rules: item.pricing_rules,
+ parenttype: item.parenttype,
+ parent: item.parent,
+ price_list_rate: item.price_list_rate,
},
item_code: item.item_code,
rate: item.price_list_rate,
},
- callback: function(r) {
+ callback: function (r) {
if (!r.exc && r.message) {
me.remove_pricing_rule(r.message, removed_pricing_rule, item.name);
me.calculate_taxes_and_totals();
- if(me.frm.doc.apply_discount_on) me.frm.trigger("apply_discount_on");
+ if (me.frm.doc.apply_discount_on) me.frm.trigger("apply_discount_on");
}
- }
+ },
});
}
}
@@ -1800,79 +2071,92 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
return this.frm.call({
method: "erpnext.accounts.doctype.pricing_rule.pricing_rule.apply_pricing_rule",
- args: { args: args, doc: me.frm.doc },
- callback: function(r) {
+ args: { args: args, doc: me.frm.doc },
+ callback: function (r) {
if (!r.exc && r.message) {
me._set_values_for_item_list(r.message);
- if(item) me.set_gross_profit(item);
- if (me.frm.doc.apply_discount_on) me.frm.trigger("apply_discount_on")
+ if (item) me.set_gross_profit(item);
+ if (me.frm.doc.apply_discount_on) me.frm.trigger("apply_discount_on");
}
- }
+ },
});
}
_get_args(item) {
var me = this;
return {
- "items": this._get_item_list(item),
- "customer": me.frm.doc.customer || me.frm.doc.party_name,
- "quotation_to": me.frm.doc.quotation_to,
- "customer_group": me.frm.doc.customer_group,
- "territory": me.frm.doc.territory,
- "supplier": me.frm.doc.supplier,
- "supplier_group": me.frm.doc.supplier_group,
- "currency": me.frm.doc.currency,
- "conversion_rate": me.frm.doc.conversion_rate,
- "price_list": me.frm.doc.selling_price_list || me.frm.doc.buying_price_list,
- "price_list_currency": me.frm.doc.price_list_currency,
- "plc_conversion_rate": me.frm.doc.plc_conversion_rate,
- "company": me.frm.doc.company,
- "transaction_date": me.frm.doc.transaction_date || me.frm.doc.posting_date,
- "campaign": me.frm.doc.campaign,
- "sales_partner": me.frm.doc.sales_partner,
- "ignore_pricing_rule": me.frm.doc.ignore_pricing_rule,
- "doctype": me.frm.doc.doctype,
- "name": me.frm.doc.name,
- "is_return": cint(me.frm.doc.is_return),
- "update_stock": ['Sales Invoice', 'Purchase Invoice'].includes(me.frm.doc.doctype) ? cint(me.frm.doc.update_stock) : 0,
- "conversion_factor": me.frm.doc.conversion_factor,
- "pos_profile": me.frm.doc.doctype == 'Sales Invoice' ? me.frm.doc.pos_profile : '',
- "coupon_code": me.frm.doc.coupon_code,
- "is_internal_supplier": me.frm.doc.is_internal_supplier,
- "is_internal_customer": me.frm.doc.is_internal_customer,
+ items: this._get_item_list(item),
+ customer: me.frm.doc.customer || me.frm.doc.party_name,
+ quotation_to: me.frm.doc.quotation_to,
+ customer_group: me.frm.doc.customer_group,
+ territory: me.frm.doc.territory,
+ supplier: me.frm.doc.supplier,
+ supplier_group: me.frm.doc.supplier_group,
+ currency: me.frm.doc.currency,
+ conversion_rate: me.frm.doc.conversion_rate,
+ price_list: me.frm.doc.selling_price_list || me.frm.doc.buying_price_list,
+ price_list_currency: me.frm.doc.price_list_currency,
+ plc_conversion_rate: me.frm.doc.plc_conversion_rate,
+ company: me.frm.doc.company,
+ transaction_date: me.frm.doc.transaction_date || me.frm.doc.posting_date,
+ campaign: me.frm.doc.campaign,
+ sales_partner: me.frm.doc.sales_partner,
+ ignore_pricing_rule: me.frm.doc.ignore_pricing_rule,
+ doctype: me.frm.doc.doctype,
+ name: me.frm.doc.name,
+ is_return: cint(me.frm.doc.is_return),
+ update_stock: ["Sales Invoice", "Purchase Invoice"].includes(me.frm.doc.doctype)
+ ? cint(me.frm.doc.update_stock)
+ : 0,
+ conversion_factor: me.frm.doc.conversion_factor,
+ pos_profile: me.frm.doc.doctype == "Sales Invoice" ? me.frm.doc.pos_profile : "",
+ coupon_code: me.frm.doc.coupon_code,
+ is_internal_supplier: me.frm.doc.is_internal_supplier,
+ is_internal_customer: me.frm.doc.is_internal_customer,
};
}
_get_item_list(item) {
var item_list = [];
- var append_item = function(d) {
+ var append_item = function (d) {
if (d.item_code) {
item_list.push({
- "doctype": d.doctype,
- "name": d.name,
- "child_docname": d.name,
- "item_code": d.item_code,
- "item_group": d.item_group,
- "brand": d.brand,
- "qty": d.qty,
- "stock_qty": d.stock_qty,
- "uom": d.uom,
- "stock_uom": d.stock_uom,
- "parenttype": d.parenttype,
- "parent": d.parent,
- "pricing_rules": d.pricing_rules,
- "is_free_item": d.is_free_item,
- "warehouse": d.warehouse,
- "serial_no": d.serial_no,
- "batch_no": d.batch_no,
- "price_list_rate": d.price_list_rate,
- "conversion_factor": d.conversion_factor || 1.0,
- "discount_percentage" : d.discount_percentage,
- "discount_amount" : d.discount_amount,
+ doctype: d.doctype,
+ name: d.name,
+ child_docname: d.name,
+ item_code: d.item_code,
+ item_group: d.item_group,
+ brand: d.brand,
+ qty: d.qty,
+ stock_qty: d.stock_qty,
+ uom: d.uom,
+ stock_uom: d.stock_uom,
+ parenttype: d.parenttype,
+ parent: d.parent,
+ pricing_rules: d.pricing_rules,
+ is_free_item: d.is_free_item,
+ warehouse: d.warehouse,
+ serial_no: d.serial_no,
+ batch_no: d.batch_no,
+ price_list_rate: d.price_list_rate,
+ conversion_factor: d.conversion_factor || 1.0,
+ discount_percentage: d.discount_percentage,
+ discount_amount: d.discount_amount,
});
// if doctype is Quotation Item / Sales Order Iten then add Margin Type and rate in item_list
- if (in_list(["Quotation Item", "Sales Order Item", "Delivery Note Item", "Sales Invoice Item", "Purchase Invoice Item", "Purchase Order Item", "Purchase Receipt Item"]), d.doctype) {
+ if (
+ (in_list([
+ "Quotation Item",
+ "Sales Order Item",
+ "Delivery Note Item",
+ "Sales Invoice Item",
+ "Purchase Invoice Item",
+ "Purchase Order Item",
+ "Purchase Receipt Item",
+ ]),
+ d.doctype)
+ ) {
item_list[0]["margin_type"] = d.margin_type;
item_list[0]["margin_rate_or_amount"] = d.margin_rate_or_amount;
}
@@ -1882,7 +2166,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
if (item) {
append_item(item);
} else {
- $.each(this.frm.doc["items"] || [], function(i, d) {
+ $.each(this.frm.doc["items"] || [], function (i, d) {
append_item(d);
});
}
@@ -1906,7 +2190,10 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
}
if (key !== "free_item_data") {
- if (child.apply_rule_on_other_items && JSON.parse(child.apply_rule_on_other_items).length) {
+ if (
+ child.apply_rule_on_other_items &&
+ JSON.parse(child.apply_rule_on_other_items).length
+ ) {
if (!in_list(JSON.parse(child.apply_rule_on_other_items), child.item_code)) {
continue;
}
@@ -1917,10 +2204,10 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
}
}
- frappe.model.round_floats_in(
- frappe.get_doc(child.doctype, child.name),
- ["price_list_rate", "discount_percentage"],
- );
+ frappe.model.round_floats_in(frappe.get_doc(child.doctype, child.name), [
+ "price_list_rate",
+ "discount_percentage",
+ ]);
// if pricing rule set as blank from an existing value, apply price_list
if (!this.frm.doc.ignore_pricing_rule && existing_pricing_rule && !child.pricing_rules) {
@@ -1946,16 +2233,19 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
const me = this;
const fields = ["pricing_rules"];
- for(var k in args) {
+ for (var k in args) {
let data = args[k];
if (data && data.apply_rule_on_other_items && JSON.parse(data.apply_rule_on_other_items)) {
- fields.push(frappe.scrub(data.pricing_rule_for))
- me.frm.doc.items.forEach(d => {
+ fields.push(frappe.scrub(data.pricing_rule_for));
+ me.frm.doc.items.forEach((d) => {
if (JSON.parse(data.apply_rule_on_other_items).includes(d[data.apply_rule_on])) {
- for(var k in data) {
-
- if (in_list(fields, k) && data[k] && (data.price_or_product_discount === 'Price' || k === 'pricing_rules')) {
+ for (var k in data) {
+ if (
+ in_list(fields, k) &&
+ data[k] &&
+ (data.price_or_product_discount === "Price" || k === "pricing_rules")
+ ) {
frappe.model.set_value(d.doctype, d.name, k, data[k]);
}
}
@@ -1966,23 +2256,27 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
}
apply_product_discount(args) {
- const items = this.frm.doc.items.filter(d => (d.is_free_item)) || [];
+ const items = this.frm.doc.items.filter((d) => d.is_free_item) || [];
- const exist_items = items.map(row => { return {item_code: row.item_code, pricing_rules: row.pricing_rules};});
+ const exist_items = items.map((row) => {
+ return { item_code: row.item_code, pricing_rules: row.pricing_rules };
+ });
- args.free_item_data.forEach(async pr_row => {
+ args.free_item_data.forEach(async (pr_row) => {
let row_to_modify = {};
// If there are no free items, or if the current free item doesn't exist in the table, add it
- if (!items || !exist_items.filter(e_row => {
- return e_row.item_code == pr_row.item_code && e_row.pricing_rules == pr_row.pricing_rules;
- }).length) {
- row_to_modify = frappe.model.add_child(this.frm.doc,
- this.frm.doc.doctype + ' Item', 'items');
-
- } else if(items) {
- row_to_modify = items.filter(d => (d.item_code === pr_row.item_code
- && d.pricing_rules === pr_row.pricing_rules))[0];
+ if (
+ !items ||
+ !exist_items.filter((e_row) => {
+ return e_row.item_code == pr_row.item_code && e_row.pricing_rules == pr_row.pricing_rules;
+ }).length
+ ) {
+ row_to_modify = frappe.model.add_child(this.frm.doc, this.frm.doc.doctype + " Item", "items");
+ } else if (items) {
+ row_to_modify = items.filter(
+ (d) => d.item_code === pr_row.item_code && d.pricing_rules === pr_row.pricing_rules
+ )[0];
}
for (let key in pr_row) {
@@ -1996,19 +2290,21 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
}
}
- this.frm.script_manager.copy_from_first_row("items", row_to_modify, ["expense_account", "income_account"]);
+ this.frm.script_manager.copy_from_first_row("items", row_to_modify, [
+ "expense_account",
+ "income_account",
+ ]);
});
// free_item_data is a temporary variable
- args.free_item_data = '';
- refresh_field('items');
+ args.free_item_data = "";
+ refresh_field("items");
}
apply_price_list(item, reset_plc_conversion) {
// We need to reset plc_conversion_rate sometimes because the call to
// `erpnext.stock.get_item_details.apply_price_list` is sensitive to its value
-
if (this.frm.doc.doctype === "Material Request") {
return;
}
@@ -2026,81 +2322,102 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
if (me.in_apply_price_list == true) return;
me.in_apply_price_list = true;
- return this.frm.call({
- method: "erpnext.stock.get_item_details.apply_price_list",
- args: { ctx: args, doc: me.frm.doc },
- callback: function(r) {
- if (!r.exc) {
- frappe.run_serially([
- () => {
- if (r.message.parent.price_list_currency)
- me.frm.set_value("price_list_currency", r.message.parent.price_list_currency);
- },
- () => {
- if (r.message.parent.plc_conversion_rate)
- me.frm.set_value("plc_conversion_rate", r.message.parent.plc_conversion_rate);
- },
- () => {
- if(args.items.length) {
- me._set_values_for_item_list(r.message.children);
- $.each(r.message.children || [], function(i, d) {
- me.apply_discount_on_item(d, d.doctype, d.name, 'discount_percentage');
- });
- }
- },
- () => { me.in_apply_price_list = false; }
- ]);
-
- } else {
- me.in_apply_price_list = false;
- }
- }
- }).always(() => {
- me.in_apply_price_list = false;
- });
+ return this.frm
+ .call({
+ method: "erpnext.stock.get_item_details.apply_price_list",
+ args: { ctx: args, doc: me.frm.doc },
+ callback: function (r) {
+ if (!r.exc) {
+ frappe.run_serially([
+ () => {
+ if (r.message.parent.price_list_currency)
+ me.frm.set_value(
+ "price_list_currency",
+ r.message.parent.price_list_currency
+ );
+ },
+ () => {
+ if (r.message.parent.plc_conversion_rate)
+ me.frm.set_value(
+ "plc_conversion_rate",
+ r.message.parent.plc_conversion_rate
+ );
+ },
+ () => {
+ if (args.items.length) {
+ me._set_values_for_item_list(r.message.children);
+ $.each(r.message.children || [], function (i, d) {
+ me.apply_discount_on_item(
+ d,
+ d.doctype,
+ d.name,
+ "discount_percentage"
+ );
+ });
+ }
+ },
+ () => {
+ me.in_apply_price_list = false;
+ },
+ ]);
+ } else {
+ me.in_apply_price_list = false;
+ }
+ },
+ })
+ .always(() => {
+ me.in_apply_price_list = false;
+ });
}
remove_pricing_rule(item, removed_pricing_rule, row_name) {
let me = this;
- const fields = ["discount_percentage",
- "discount_amount", "margin_rate_or_amount", "rate_with_margin"];
+ const fields = [
+ "discount_percentage",
+ "discount_amount",
+ "margin_rate_or_amount",
+ "rate_with_margin",
+ ];
if (!item) {
return;
}
- if(item.remove_free_item) {
+ if (item.remove_free_item) {
let items = [];
- me.frm.doc.items.forEach(d => {
+ me.frm.doc.items.forEach((d) => {
// if same item was added as free item through a different pricing rule, keep it
- if(d.item_code != item.remove_free_item || !d.is_free_item || !removed_pricing_rule?.includes(d.pricing_rules)) {
+ if (
+ d.item_code != item.remove_free_item ||
+ !d.is_free_item ||
+ !removed_pricing_rule?.includes(d.pricing_rules)
+ ) {
items.push(d);
}
});
me.frm.doc.items = items;
- refresh_field('items');
- } else if(item.applied_on_items && item.apply_on) {
- const applied_on_items = item.applied_on_items.split(',');
- me.frm.doc.items.forEach(row => {
- if(applied_on_items.includes(row[item.apply_on])) {
- fields.forEach(f => {
+ refresh_field("items");
+ } else if (item.applied_on_items && item.apply_on) {
+ const applied_on_items = item.applied_on_items.split(",");
+ me.frm.doc.items.forEach((row) => {
+ if (applied_on_items.includes(row[item.apply_on])) {
+ fields.forEach((f) => {
row[f] = 0;
});
- ["pricing_rules", "margin_type"].forEach(field => {
+ ["pricing_rules", "margin_type"].forEach((field) => {
if (row[field]) {
- row[field] = '';
+ row[field] = "";
}
- })
+ });
}
});
me.trigger_price_list_rate();
- }
- else if(!item.is_free_item && row_name){
- me.frm.doc.items.forEach(d => {
+ } else if (!item.is_free_item && row_name) {
+ me.frm.doc.items.forEach((d) => {
if (d.name != row_name) return;
Object.assign(d, item);
@@ -2109,12 +2426,11 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
}
trigger_price_list_rate() {
- var me = this;
+ var me = this;
- this.frm.doc.items.forEach(child_row => {
- me.frm.script_manager.trigger("price_list_rate",
- child_row.doctype, child_row.name);
- })
+ this.frm.doc.items.forEach((child_row) => {
+ me.frm.script_manager.trigger("price_list_rate", child_row.doctype, child_row.name);
+ });
}
validate_company_and_party() {
@@ -2125,12 +2441,19 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
return valid;
}
- $.each(["company", "customer"], function(i, fieldname) {
- if(frappe.meta.has_field(me.frm.doc.doctype, fieldname) && !["Purchase Order","Purchase Invoice"].includes(me.frm.doc.doctype)) {
+ $.each(["company", "customer"], function (i, fieldname) {
+ if (
+ frappe.meta.has_field(me.frm.doc.doctype, fieldname) &&
+ !["Purchase Order", "Purchase Invoice"].includes(me.frm.doc.doctype)
+ ) {
if (!me.frm.doc[fieldname]) {
- frappe.msgprint(__("Please specify") + ": " +
- __(frappe.meta.get_label(me.frm.doc.doctype, fieldname, me.frm.doc.name)) +
- ". " + __("It is needed to fetch Item Details."));
+ frappe.msgprint(
+ __("Please specify") +
+ ": " +
+ __(frappe.meta.get_label(me.frm.doc.doctype, fieldname, me.frm.doc.name)) +
+ ". " +
+ __("It is needed to fetch Item Details.")
+ );
valid = false;
}
}
@@ -2141,8 +2464,8 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
get_terms() {
var me = this;
- erpnext.utils.get_terms(this.frm.doc.tc_name, this.frm.doc, function(r) {
- if(!r.exc) {
+ erpnext.utils.get_terms(this.frm.doc.tc_name, this.frm.doc, function (r) {
+ if (!r.exc) {
me.frm.set_value("terms", r.message);
}
});
@@ -2150,17 +2473,20 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
taxes_and_charges() {
var me = this;
- if(this.frm.doc.taxes_and_charges) {
+ if (this.frm.doc.taxes_and_charges) {
return this.frm.call({
method: "erpnext.controllers.accounts_controller.get_taxes_and_charges",
args: {
- "master_doctype": frappe.meta.get_docfield(this.frm.doc.doctype, "taxes_and_charges",
- this.frm.doc.name).options,
- "master_name": this.frm.doc.taxes_and_charges
+ master_doctype: frappe.meta.get_docfield(
+ this.frm.doc.doctype,
+ "taxes_and_charges",
+ this.frm.doc.name
+ ).options,
+ master_name: this.frm.doc.taxes_and_charges,
},
- callback: function(r) {
- if(!r.exc) {
- if(me.frm.doc.shipping_rule && me.frm.doc.taxes) {
+ callback: function (r) {
+ if (!r.exc) {
+ if (me.frm.doc.shipping_rule && me.frm.doc.taxes) {
for (let tax of r.message) {
me.frm.add_child("taxes", tax);
}
@@ -2171,14 +2497,14 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
me.calculate_taxes_and_totals();
}
}
- }
+ },
});
}
}
tax_category() {
var me = this;
- if(me.frm.updating_party_details) return;
+ if (me.frm.updating_party_details) return;
frappe.run_serially([
() => this.update_item_tax_map(),
@@ -2194,7 +2520,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
if (me.frm.doc.is_return && me.frm.doc.return_against) return;
- $.each(this.frm.doc.items || [], function(i, item) {
+ $.each(this.frm.doc.items || [], function (i, item) {
if (item.item_code) {
// Use combination of name and item code in case same item is added multiple times
item_codes.push([item.item_code, item.name]);
@@ -2211,44 +2537,48 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
tax_category: cstr(me.frm.doc.tax_category),
item_codes: item_codes,
item_rates: item_rates,
- item_tax_templates: item_tax_templates
+ item_tax_templates: item_tax_templates,
},
- callback: function(r) {
+ callback: function (r) {
if (!r.exc) {
- $.each(me.frm.doc.items || [], function(i, item) {
- if (item.name && r.message.hasOwnProperty(item.name) && r.message[item.name].item_tax_template) {
+ $.each(me.frm.doc.items || [], function (i, item) {
+ if (
+ item.name &&
+ r.message.hasOwnProperty(item.name) &&
+ r.message[item.name].item_tax_template
+ ) {
item.item_tax_template = r.message[item.name].item_tax_template;
item.item_tax_rate = r.message[item.name].item_tax_rate;
me.add_taxes_from_item_tax_template(item.item_tax_rate);
}
});
}
- }
+ },
});
}
}
item_tax_template(doc, cdt, cdn) {
var me = this;
- if(me.frm.updating_party_details) return;
+ if (me.frm.updating_party_details) return;
var item = frappe.get_doc(cdt, cdn);
- if(item.item_tax_template) {
+ if (item.item_tax_template) {
return this.frm.call({
method: "erpnext.stock.get_item_details.get_item_tax_map",
args: {
doc: me.frm.doc,
tax_template: item.item_tax_template,
- as_json: true
+ as_json: true,
},
- callback: function(r) {
- if(!r.exc) {
+ callback: function (r) {
+ if (!r.exc) {
item.item_tax_rate = r.message;
me.add_taxes_from_item_tax_template(item.item_tax_rate);
me.calculate_taxes_and_totals();
}
- }
+ },
});
} else {
item.item_tax_rate = "{}";
@@ -2256,27 +2586,33 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
}
}
-
is_recurring() {
// set default values for recurring documents
- if(this.frm.doc.is_recurring && this.frm.doc.__islocal) {
+ if (this.frm.doc.is_recurring && this.frm.doc.__islocal) {
frappe.msgprint(__("Please set recurring after saving"));
- this.frm.set_value('is_recurring', 0);
+ this.frm.set_value("is_recurring", 0);
return;
}
- if(this.frm.doc.is_recurring) {
- if(!this.frm.doc.recurring_id) {
- this.frm.set_value('recurring_id', this.frm.doc.name);
+ if (this.frm.doc.is_recurring) {
+ if (!this.frm.doc.recurring_id) {
+ this.frm.set_value("recurring_id", this.frm.doc.name);
}
- var owner_email = this.frm.doc.owner=="Administrator"
- ? frappe.user_info("Administrator").email
- : this.frm.doc.owner;
+ var owner_email =
+ this.frm.doc.owner == "Administrator"
+ ? frappe.user_info("Administrator").email
+ : this.frm.doc.owner;
- this.frm.doc.notification_email_address = $.map([cstr(owner_email),
- cstr(this.frm.doc.contact_email)], function(v) { return v || null; }).join(", ");
- this.frm.doc.repeat_on_day_of_month = frappe.datetime.str_to_obj(this.frm.doc.posting_date).getDate();
+ this.frm.doc.notification_email_address = $.map(
+ [cstr(owner_email), cstr(this.frm.doc.contact_email)],
+ function (v) {
+ return v || null;
+ }
+ ).join(", ");
+ this.frm.doc.repeat_on_day_of_month = frappe.datetime
+ .str_to_obj(this.frm.doc.posting_date)
+ .getDate();
}
refresh_many(["notification_email_address", "repeat_on_day_of_month"]);
@@ -2284,16 +2620,14 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
from_date() {
// set to_date
- if(this.frm.doc.from_date) {
- var recurring_type_map = {'Monthly': 1, 'Quarterly': 3, 'Half-yearly': 6,
- 'Yearly': 12};
+ if (this.frm.doc.from_date) {
+ var recurring_type_map = { Monthly: 1, Quarterly: 3, "Half-yearly": 6, Yearly: 12 };
var months = recurring_type_map[this.frm.doc.recurring_type];
- if(months) {
- var to_date = frappe.datetime.add_months(this.frm.doc.from_date,
- months);
+ if (months) {
+ var to_date = frappe.datetime.add_months(this.frm.doc.from_date, months);
this.frm.doc.to_date = frappe.datetime.add_days(to_date, -1);
- refresh_field('to_date');
+ refresh_field("to_date");
}
}
}
@@ -2301,7 +2635,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
set_gross_profit(item) {
if (["Sales Order", "Quotation"].includes(this.frm.doc.doctype) && item.valuation_rate) {
var rate = flt(item.rate) * flt(this.frm.doc.conversion_rate || 1);
- item.gross_profit = flt(((rate - item.valuation_rate) * item.stock_qty), precision("amount", item));
+ item.gross_profit = flt((rate - item.valuation_rate) * item.stock_qty, precision("amount", item));
}
}
@@ -2315,22 +2649,22 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
}
get_advances() {
- if(!this.frm.is_return) {
+ if (!this.frm.is_return) {
var me = this;
return this.frm.call({
method: "set_advances",
doc: this.frm.doc,
- callback: function(r, rt) {
+ callback: function (r, rt) {
refresh_field("advances");
me.frm.dirty();
- }
- })
+ },
+ });
}
}
make_payment_entry() {
let via_journal_entry = this.frm.doc.__onload && this.frm.doc.__onload.make_payment_via_journal_entry;
- if(this.has_discount_in_schedule() && !via_journal_entry) {
+ if (this.has_discount_in_schedule() && !via_journal_entry) {
// If early payment discount is applied, ask user for reference date
this.prompt_user_for_reference_date();
} else {
@@ -2340,34 +2674,36 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
make_mapped_payment_entry(args) {
var me = this;
- args = args || { "dt": this.frm.doc.doctype, "dn": this.frm.doc.name };
+ args = args || { dt: this.frm.doc.doctype, dn: this.frm.doc.name };
return frappe.call({
method: me.get_method_for_payment(),
args: args,
- callback: function(r) {
+ callback: function (r) {
var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
- }
+ },
});
}
- prompt_user_for_reference_date(){
+ prompt_user_for_reference_date() {
let me = this;
- frappe.prompt({
- label: __("Cheque/Reference Date"),
- fieldname: "reference_date",
- fieldtype: "Date",
- reqd: 1,
- }, (values) => {
- let args = {
- "dt": me.frm.doc.doctype,
- "dn": me.frm.doc.name,
- "reference_date": values.reference_date
- }
- me.make_mapped_payment_entry(args);
- },
- __("Reference Date for Early Payment Discount"),
- __("Continue")
+ frappe.prompt(
+ {
+ label: __("Cheque/Reference Date"),
+ fieldname: "reference_date",
+ fieldtype: "Date",
+ reqd: 1,
+ },
+ (values) => {
+ let args = {
+ dt: me.frm.doc.doctype,
+ dn: me.frm.doc.name,
+ reference_date: values.reference_date,
+ };
+ me.make_mapped_payment_entry(args);
+ },
+ __("Reference Date for Early Payment Discount"),
+ __("Continue")
);
}
@@ -2377,9 +2713,9 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
this.frm.doctype
);
let has_payment_schedule = this.frm.doc.payment_schedule && this.frm.doc.payment_schedule.length;
- if(!is_eligible || !has_payment_schedule) return false;
+ if (!is_eligible || !has_payment_schedule) return false;
- let has_discount = this.frm.doc.payment_schedule.some(row => row.discount);
+ let has_discount = this.frm.doc.payment_schedule.some((row) => row.discount);
return has_discount;
}
@@ -2400,79 +2736,82 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
{
fieldtype: "Data",
fieldname: "docname",
- hidden: true
+ hidden: true,
},
{
fieldtype: "Read Only",
fieldname: "item_code",
label: __("Item Code"),
- in_list_view: true
+ in_list_view: true,
},
{
fieldtype: "Read Only",
fieldname: "item_name",
label: __("Item Name"),
- in_list_view: true
+ in_list_view: true,
},
{
fieldtype: "Float",
fieldname: "qty",
label: __("Accepted Quantity"),
in_list_view: true,
- read_only: true
+ read_only: true,
},
{
fieldtype: "Float",
fieldname: "sample_size",
label: __("Sample Size"),
reqd: true,
- in_list_view: true
+ in_list_view: true,
},
{
fieldtype: "Data",
fieldname: "description",
label: __("Description"),
- hidden: true
+ hidden: true,
},
{
fieldtype: "Data",
fieldname: "serial_no",
label: __("Serial No"),
- hidden: true
+ hidden: true,
},
{
fieldtype: "Data",
fieldname: "batch_no",
label: __("Batch No"),
- hidden: true
+ hidden: true,
},
{
fieldtype: "Data",
fieldname: "child_row_reference",
label: __("Child Row Reference"),
- hidden: true
- }
- ]
- }
+ hidden: true,
+ },
+ ],
+ },
];
const me = this;
- const inspection_type = ["Purchase Receipt", "Purchase Invoice", "Subcontracting Receipt"].includes(this.frm.doc.doctype)
- ? "Incoming" : "Outgoing";
+ const inspection_type = ["Purchase Receipt", "Purchase Invoice", "Subcontracting Receipt"].includes(
+ this.frm.doc.doctype
+ )
+ ? "Incoming"
+ : "Outgoing";
const dialog = new frappe.ui.Dialog({
title: __("Select Items for Quality Inspection"),
size: "extra-large",
fields: fields,
primary_action: function () {
const data = dialog.get_values();
- const selected_data = data.items.filter(item => item?.__checked == 1 );
+ const selected_data = data.items.filter((item) => item?.__checked == 1);
frappe.call({
method: "erpnext.controllers.stock_controller.make_quality_inspections",
args: {
doctype: me.frm.doc.doctype,
docname: me.frm.doc.name,
items: selected_data,
- inspection_type: inspection_type
+ inspection_type: inspection_type,
},
freeze: true,
callback: function (r) {
@@ -2481,39 +2820,39 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
frappe.set_route("Form", "Quality Inspection", r.message[0]);
} else {
frappe.route_options = {
- "reference_type": me.frm.doc.doctype,
- "reference_name": me.frm.doc.name
+ reference_type: me.frm.doc.doctype,
+ reference_name: me.frm.doc.name,
};
frappe.set_route("List", "Quality Inspection");
}
}
dialog.hide();
- }
+ },
});
},
- primary_action_label: __("Create")
+ primary_action_label: __("Create"),
});
frappe.call({
method: "erpnext.controllers.stock_controller.check_item_quality_inspection",
args: {
doctype: this.frm.doc.doctype,
- items: this.frm.doc.items
+ items: this.frm.doc.items,
},
freeze: true,
callback: function (r) {
- r.message.forEach(item => {
+ r.message.forEach((item) => {
if (me.has_inspection_required(item)) {
let dialog_items = dialog.fields_dict.items;
dialog_items.df.data.push({
- "item_code": item.item_code,
- "item_name": item.item_name,
- "qty": item.qty,
- "description": item.description,
- "serial_no": item.serial_no,
- "batch_no": item.batch_no,
- "sample_size": item.sample_quantity,
- "child_row_reference": item.name,
+ item_code: item.item_code,
+ item_name: item.item_name,
+ qty: item.qty,
+ description: item.description,
+ serial_no: item.serial_no,
+ batch_no: item.batch_no,
+ sample_size: item.sample_quantity,
+ child_row_reference: item.name,
});
dialog_items.grid.refresh();
}
@@ -2521,16 +2860,18 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
data = dialog.fields_dict.items.df.data;
if (!data.length) {
- frappe.msgprint(__("All items in this document already have a linked Quality Inspection."));
+ frappe.msgprint(
+ __("All items in this document already have a linked Quality Inspection.")
+ );
} else {
dialog.show();
}
- }
+ },
});
}
has_inspection_required(item) {
- if (this.frm.doc.doctype === "Stock Entry" && this.frm.doc.purpose == "Manufacture" ) {
+ if (this.frm.doc.doctype === "Stock Entry" && this.frm.doc.purpose == "Manufacture") {
if (item.is_finished_item && !item.quality_inspection) {
return true;
}
@@ -2541,15 +2882,17 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
get_method_for_payment() {
let method = "erpnext.accounts.doctype.payment_entry.payment_entry.get_payment_entry";
- if(this.frm.doc.__onload && this.frm.doc.__onload.make_payment_via_journal_entry){
- if(['Sales Invoice', 'Purchase Invoice'].includes( this.frm.doc.doctype)){
- method = "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_invoice";
- }else {
- method= "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_order";
+ if (this.frm.doc.__onload && this.frm.doc.__onload.make_payment_via_journal_entry) {
+ if (["Sales Invoice", "Purchase Invoice"].includes(this.frm.doc.doctype)) {
+ method =
+ "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_invoice";
+ } else {
+ method =
+ "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_order";
}
}
- return method
+ return method;
}
set_query_for_batch(doc, cdt, cdn) {
@@ -2558,18 +2901,20 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
var me = this;
var item = frappe.get_doc(cdt, cdn);
- if(!item.item_code) {
+ if (!item.item_code) {
frappe.throw(__("Please enter Item Code to get batch no"));
- } else if (doc.doctype == "Purchase Receipt" ||
- (doc.doctype == "Purchase Invoice" && doc.update_stock)) {
+ } else if (
+ doc.doctype == "Purchase Receipt" ||
+ (doc.doctype == "Purchase Invoice" && doc.update_stock)
+ ) {
return {
- filters: {'item': item.item_code}
- }
+ filters: { item: item.item_code },
+ };
} else {
let filters = {
- 'item_code': item.item_code,
- 'posting_date': me.frm.doc.posting_date || frappe.datetime.nowdate(),
- }
+ item_code: item.item_code,
+ posting_date: me.frm.doc.posting_date || frappe.datetime.nowdate(),
+ };
if (doc.is_return) {
filters["is_return"] = 1;
@@ -2581,39 +2926,37 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
if (item.warehouse) filters["warehouse"] = item.warehouse;
return {
- query : "erpnext.controllers.queries.get_batch_no",
- filters: filters
- }
+ query: "erpnext.controllers.queries.get_batch_no",
+ filters: filters,
+ };
}
}
set_query_for_item_tax_template(doc, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn);
- if(!item.item_code) {
- return doc.company ? {filters: {company: doc.company}} : {};
+ if (!item.item_code) {
+ return doc.company ? { filters: { company: doc.company } } : {};
} else {
let filters = {
- 'item_code': item.item_code,
- 'valid_from': ["<=", doc.transaction_date || doc.bill_date || doc.posting_date],
- 'item_group': item.item_group,
- "base_net_rate": item.base_net_rate,
- }
+ item_code: item.item_code,
+ valid_from: ["<=", doc.transaction_date || doc.bill_date || doc.posting_date],
+ item_group: item.item_group,
+ base_net_rate: item.base_net_rate,
+ };
- if (doc.tax_category)
- filters['tax_category'] = doc.tax_category;
- if (doc.company)
- filters['company'] = doc.company;
+ if (doc.tax_category) filters["tax_category"] = doc.tax_category;
+ if (doc.company) filters["company"] = doc.company;
return {
query: "erpnext.controllers.queries.get_tax_template",
- filters: filters
- }
+ filters: filters,
+ };
}
}
payment_terms_template() {
var me = this;
const doc = this.frm.doc;
- if(doc.payment_terms_template && doc.doctype !== 'Delivery Note' && !doc.is_return) {
+ if (doc.payment_terms_template && doc.doctype !== "Delivery Note" && !doc.is_return) {
var posting_date = doc.posting_date || doc.transaction_date;
frappe.call({
method: "erpnext.controllers.accounts_controller.get_payment_terms",
@@ -2622,23 +2965,23 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
posting_date: posting_date,
grand_total: doc.rounded_total || doc.grand_total,
base_grand_total: doc.base_rounded_total || doc.base_grand_total,
- bill_date: doc.bill_date
+ bill_date: doc.bill_date,
},
- callback: function(r) {
- if(r.message && !r.exc) {
+ callback: function (r) {
+ if (r.message && !r.exc) {
me.frm.set_value("payment_schedule", r.message);
const company_currency = me.get_company_currency();
me.update_payment_schedule_grid_labels(company_currency);
}
- }
- })
+ },
+ });
}
}
payment_term(doc, cdt, cdn) {
const me = this;
var row = locals[cdt][cdn];
- if(row.payment_term) {
+ if (row.payment_term) {
frappe.call({
method: "erpnext.controllers.accounts_controller.get_payment_term_details",
args: {
@@ -2646,61 +2989,71 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
bill_date: this.frm.doc.bill_date,
posting_date: this.frm.doc.posting_date || this.frm.doc.transaction_date,
grand_total: this.frm.doc.rounded_total || this.frm.doc.grand_total,
- base_grand_total: this.frm.doc.base_rounded_total || this.frm.doc.base_grand_total
+ base_grand_total: this.frm.doc.base_rounded_total || this.frm.doc.base_grand_total,
},
- callback: function(r) {
- if(r.message && !r.exc) {
+ callback: function (r) {
+ if (r.message && !r.exc) {
for (var d in r.message) {
frappe.model.set_value(cdt, cdn, d, r.message[d]);
const company_currency = me.get_company_currency();
me.update_payment_schedule_grid_labels(company_currency);
}
}
- }
- })
+ },
+ });
}
}
against_blanket_order(doc, cdt, cdn) {
var item = locals[cdt][cdn];
- if(!item.against_blanket_order) {
+ if (!item.against_blanket_order) {
frappe.model.set_value(this.frm.doctype + " Item", item.name, "blanket_order", null);
- frappe.model.set_value(this.frm.doctype + " Item", item.name, "blanket_order_rate", 0.00);
+ frappe.model.set_value(this.frm.doctype + " Item", item.name, "blanket_order_rate", 0.0);
}
}
blanket_order(doc, cdt, cdn) {
var me = this;
var item = locals[cdt][cdn];
- if (item.blanket_order && (item.parenttype=="Sales Order" || item.parenttype=="Purchase Order")) {
+ if (item.blanket_order && (item.parenttype == "Sales Order" || item.parenttype == "Purchase Order")) {
frappe.call({
method: "erpnext.stock.get_item_details.get_blanket_order_details",
args: {
- ctx:{
+ ctx: {
item_code: item.item_code,
customer: doc.customer,
supplier: doc.supplier,
company: doc.company,
transaction_date: doc.transaction_date,
- blanket_order: item.blanket_order
- }
+ blanket_order: item.blanket_order,
+ },
},
- callback: function(r) {
+ callback: function (r) {
if (!r.message) {
frappe.throw(__("Invalid Blanket Order for the selected Customer and Item"));
} else {
frappe.run_serially([
- () => frappe.model.set_value(cdt, cdn, "blanket_order_rate", r.message.blanket_order_rate),
- () => me.frm.script_manager.trigger("price_list_rate", cdt, cdn)
+ () =>
+ frappe.model.set_value(
+ cdt,
+ cdn,
+ "blanket_order_rate",
+ r.message.blanket_order_rate
+ ),
+ () => me.frm.script_manager.trigger("price_list_rate", cdt, cdn),
]);
}
- }
- })
+ },
+ });
}
}
set_reserve_warehouse() {
- this.autofill_warehouse(this.frm.doc.supplied_items, "reserve_warehouse", this.frm.doc.set_reserve_warehouse);
+ this.autofill_warehouse(
+ this.frm.doc.supplied_items,
+ "reserve_warehouse",
+ this.frm.doc.set_reserve_warehouse
+ );
}
set_warehouse() {
@@ -2718,7 +3071,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
autofill_warehouse(child_table, warehouse_field, warehouse) {
if (warehouse && child_table && child_table.length) {
let doctype = child_table[0].doctype;
- $.each(child_table || [], function(i, item) {
+ $.each(child_table || [], function (i, item) {
frappe.model.set_value(doctype, item.name, warehouse_field, warehouse);
});
}
@@ -2729,11 +3082,11 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
// reset pricing rules if coupon code is set or is unset
const _ignore_pricing_rule = this.frm.doc.ignore_pricing_rule;
return frappe.run_serially([
- () => this.frm.doc.ignore_pricing_rule=1,
- () => this.frm.trigger('ignore_pricing_rule'),
- () => this.frm.doc.ignore_pricing_rule=_ignore_pricing_rule,
- () => this.frm.trigger('apply_pricing_rule'),
- () => this.frm._last_coupon_code = this.frm.doc.coupon_code
+ () => (this.frm.doc.ignore_pricing_rule = 1),
+ () => this.frm.trigger("ignore_pricing_rule"),
+ () => (this.frm.doc.ignore_pricing_rule = _ignore_pricing_rule),
+ () => this.frm.trigger("apply_pricing_rule"),
+ () => (this.frm._last_coupon_code = this.frm.doc.coupon_code),
]);
}
}
@@ -2759,13 +3112,17 @@ erpnext.show_serial_batch_selector = function (frm, item_row, callback, on_close
warehouse = item_row.s_warehouse;
}
- if (in_list([
- "Material Transfer",
- "Send to Subcontractor",
- "Material Issue",
- "Material Consumption for Manufacture",
- "Material Transfer for Manufacture"
- ], frm.doc.purpose)
+ if (
+ in_list(
+ [
+ "Material Transfer",
+ "Send to Subcontractor",
+ "Material Issue",
+ "Material Consumption for Manufacture",
+ "Material Transfer for Manufacture",
+ ],
+ frm.doc.purpose
+ )
) {
warehouse_field = "s_warehouse";
} else {
@@ -2794,9 +3151,9 @@ erpnext.show_serial_batch_selector = function (frm, item_row, callback, on_close
new erpnext.SerialBatchPackageSelector(frm, item_row, (r) => {
if (r) {
let update_values = {
- "serial_and_batch_bundle": r.name,
- "qty": Math.abs(r.total_qty)
- }
+ serial_and_batch_bundle: r.name,
+ qty: Math.abs(r.total_qty),
+ };
if (r.warehouse) {
update_values[warehouse_field] = r.warehouse;
@@ -2805,11 +3162,11 @@ erpnext.show_serial_batch_selector = function (frm, item_row, callback, on_close
frappe.model.set_value(item_row.doctype, item_row.name, update_values);
}
});
-}
+};
-erpnext.apply_putaway_rule = (frm, purpose=null) => {
+erpnext.apply_putaway_rule = (frm, purpose = null) => {
if (!frm.doc.company) {
- frappe.throw({message: __("Please select a Company first."), title: __("Mandatory")});
+ frappe.throw({ message: __("Please select a Company first."), title: __("Mandatory") });
}
if (!frm.doc.items.length) return;
@@ -2820,13 +3177,13 @@ erpnext.apply_putaway_rule = (frm, purpose=null) => {
items: frm.doc.items,
company: frm.doc.company,
sync: true,
- purpose: purpose
+ purpose: purpose,
},
callback: (result) => {
if (!result.exc && result.message) {
frm.clear_table("items");
- let items = result.message;
+ let items = result.message;
items.forEach((row) => {
delete row["name"]; // dont overwrite name from server side
let child = frm.add_child("items");
@@ -2835,7 +3192,7 @@ erpnext.apply_putaway_rule = (frm, purpose=null) => {
});
frm.get_field("items").grid.refresh();
}
- }
+ },
});
};
@@ -2843,7 +3200,9 @@ erpnext.set_unit_price_items_note = (frm) => {
if (frm.doc.has_unit_price_items && !frm.is_new()) {
// Remove existing note
const $note = $(frm.layout.wrapper.find(".unit-price-items-note"));
- if ($note.length) { $note.parent().remove(); }
+ if ($note.length) {
+ $note.parent().remove();
+ }
frm.layout.show_message(
`
diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
index cf438b04e5b..3e53d0e4de9 100644
--- a/erpnext/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py
@@ -1828,7 +1828,7 @@ class TestSalesOrder(AccountsTestMixin, IntegrationTestCase):
wo.reload()
so.reload()
self.assertEqual(so.items[0].work_order_qty, wo.produced_qty)
- self.assertEqual(mr.status, "Manufactured")
+ self.assertEqual(mr.status, "Ordered")
def test_sales_order_with_shipping_rule(self):
from erpnext.accounts.doctype.shipping_rule.test_shipping_rule import create_shipping_rule
diff --git a/erpnext/selling/page/point_of_sale/pos_payment.js b/erpnext/selling/page/point_of_sale/pos_payment.js
index 5c4efff1dc5..964886506f0 100644
--- a/erpnext/selling/page/point_of_sale/pos_payment.js
+++ b/erpnext/selling/page/point_of_sale/pos_payment.js
@@ -450,7 +450,6 @@ erpnext.PointOfSale.Payment = class {
}
render_payment_section() {
- this.grand_total_to_default_mop();
this.render_payment_mode_dom();
this.make_invoice_field_dialog();
this.update_totals_section();
@@ -498,17 +497,6 @@ erpnext.PointOfSale.Payment = class {
}
}
- grand_total_to_default_mop() {
- if (this.set_gt_to_default_mop) return;
- const doc = this.events.get_frm().doc;
- const payments = doc.payments;
- payments.forEach((p) => {
- if (p.default) {
- frappe.model.set_value(p.doctype, p.name, "amount", 0);
- }
- });
- }
-
render_payment_mode_dom() {
const doc = this.events.get_frm().doc;
const payments = doc.payments;
diff --git a/erpnext/setup/setup_wizard/operations/install_fixtures.py b/erpnext/setup/setup_wizard/operations/install_fixtures.py
index ee37399e583..660c458c757 100644
--- a/erpnext/setup/setup_wizard/operations/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/operations/install_fixtures.py
@@ -294,6 +294,10 @@ def install(country=None):
{"doctype": "Market Segment", "market_segment": _("Upper Income")},
# Warehouse Type
{"doctype": "Warehouse Type", "name": "Transit"},
+ {"doctype": "Workstation Operating Component", "component_name": _("Electricity")},
+ {"doctype": "Workstation Operating Component", "component_name": _("Consumables")},
+ {"doctype": "Workstation Operating Component", "component_name": _("Rent")},
+ {"doctype": "Workstation Operating Component", "component_name": _("Wages")},
]
for doctype, title_field, filename in (
@@ -481,14 +485,19 @@ def install_defaults(args=None): # nosemgrep
create_bank_account(args)
-def set_global_defaults(args):
+def set_global_defaults(kwargs):
global_defaults = frappe.get_doc("Global Defaults", "Global Defaults")
+ company = frappe.db.get_value(
+ "Company",
+ {"company_name": kwargs.get("company_name")},
+ "name",
+ )
global_defaults.update(
{
- "default_currency": args.get("currency"),
- "default_company": args.get("company_name"),
- "country": args.get("country"),
+ "default_currency": kwargs.get("currency"),
+ "default_company": company,
+ "country": kwargs.get("country"),
}
)
diff --git a/erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py b/erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py
index 98d4a43ff94..6adb5932f24 100644
--- a/erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py
+++ b/erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py
@@ -667,13 +667,13 @@ def prepare_data_for_internal_transfer():
company = "_Test Company with perpetual inventory"
customer = create_internal_customer(
- "_Test Internal Customer 3",
+ "_Test Internal Customer 2",
company,
company,
)
supplier = create_internal_supplier(
- "_Test Internal Supplier 3",
+ "_Test Internal Supplier 2",
company,
company,
)
diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index a67d44b3860..81680af6806 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -11,6 +11,7 @@ import frappe
import frappe.defaults
from frappe import _, msgprint
from frappe.model.mapper import get_mapped_doc
+from frappe.query_builder import Order
from frappe.query_builder.functions import Sum
from frappe.utils import cint, cstr, flt, get_link_to_form, getdate, new_line_sep, nowdate
@@ -624,39 +625,44 @@ def get_items_based_on_default_supplier(supplier):
@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
def get_material_requests_based_on_supplier(doctype, txt, searchfield, start, page_len, filters):
- conditions = ""
- if txt:
- conditions += "and mr.name like '%%" + txt + "%%' "
-
- if filters.get("transaction_date"):
- date = filters.get("transaction_date")[1]
- conditions += f"and mr.transaction_date between '{date[0]}' and '{date[1]}' "
-
supplier = filters.get("supplier")
supplier_items = get_items_based_on_default_supplier(supplier)
if not supplier_items:
frappe.throw(_("{0} is not the default supplier for any items.").format(supplier))
- material_requests = frappe.db.sql(
- """select distinct mr.name, transaction_date,company
- from `tabMaterial Request` mr, `tabMaterial Request Item` mr_item
- where mr.name = mr_item.parent
- and mr_item.item_code in ({})
- and mr.material_request_type = 'Purchase'
- and mr.per_ordered < 99.99
- and mr.docstatus = 1
- and mr.status != 'Stopped'
- and mr.company = %s
- {}
- order by mr_item.item_code ASC
- limit {} offset {} """.format(
- ", ".join(["%s"] * len(supplier_items)), conditions, cint(page_len), cint(start)
- ),
- (*tuple(supplier_items), filters.get("company")),
- as_dict=1,
+ mr = frappe.qb.DocType("Material Request")
+ mr_item = frappe.qb.DocType("Material Request Item")
+
+ query = (
+ frappe.qb.from_(mr)
+ .from_(mr_item)
+ .select(mr.name)
+ .distinct()
+ .select(mr.transaction_date, mr.company)
+ .where(
+ (mr.name == mr_item.parent)
+ & (mr_item.item_code.isin(supplier_items))
+ & (mr.material_request_type == "Purchase")
+ & (mr.per_ordered < 99.99)
+ & (mr.docstatus == 1)
+ & (mr.status != "Stopped")
+ & (mr.company == filters.get("company"))
+ )
+ .orderby(mr_item.item_code, order=Order.asc)
+ .limit(cint(page_len))
+ .offset(cint(start))
)
+ if txt:
+ query = query.where(mr.name.like(f"%%{txt}%%"))
+
+ if filters.get("transaction_date"):
+ date = filters.get("transaction_date")[1]
+ query = query.where(mr.transaction_date[date[0] : date[1]])
+
+ material_requests = query.run(as_dict=True)
+
return material_requests
diff --git a/erpnext/stock/doctype/material_request/material_request_list.js b/erpnext/stock/doctype/material_request/material_request_list.js
index b2671b3207c..bd6d3462013 100644
--- a/erpnext/stock/doctype/material_request/material_request_list.js
+++ b/erpnext/stock/doctype/material_request/material_request_list.js
@@ -35,7 +35,7 @@ frappe.listview_settings["Material Request"] = {
return [__("Partially Received"), "yellow", "per_received,<,100"];
} else if (doc.material_request_type == "Purchase" && flt(doc.per_received, precision) == 100) {
return [__("Received"), "green", "per_received,=,100"];
- } else if (doc.material_request_type == "Purchase") {
+ } else if (["Purchase", "Manufacture"].includes(doc.material_request_type)) {
return [__("Ordered"), "green", "per_ordered,=,100"];
} else if (doc.material_request_type == "Material Transfer") {
return [__("Transferred"), "green", "per_ordered,=,100"];
@@ -43,8 +43,6 @@ frappe.listview_settings["Material Request"] = {
return [__("Issued"), "green", "per_ordered,=,100"];
} else if (doc.material_request_type == "Customer Provided") {
return [__("Received"), "green", "per_ordered,=,100"];
- } else if (doc.material_request_type == "Manufacture") {
- return [__("Manufactured"), "green", "per_ordered,=,100"];
}
}
},
diff --git a/erpnext/stock/doctype/material_request/test_material_request.py b/erpnext/stock/doctype/material_request/test_material_request.py
index 5f5c2b657b6..bb1f9c637a2 100644
--- a/erpnext/stock/doctype/material_request/test_material_request.py
+++ b/erpnext/stock/doctype/material_request/test_material_request.py
@@ -916,6 +916,23 @@ class TestMaterialRequest(IntegrationTestCase):
for perm in permissions:
perm.delete()
+ def test_manufacture_type_status_over_wo(self):
+ from erpnext.stock.doctype.material_request.material_request import raise_work_orders
+
+ mr = make_material_request(
+ item_code="_Test FG Item", material_request_type="Manufacture", do_not_submit=False
+ )
+
+ work_order = raise_work_orders(mr.name)
+ wo = frappe.get_doc("Work Order", work_order[0])
+ wo.wip_warehouse = "_Test Warehouse 1 - _TC"
+ wo.submit()
+
+ mr.reload()
+
+ self.assertEqual(mr.per_ordered, 100)
+ self.assertEqual(mr.status, "Ordered")
+
def get_in_transit_warehouse(company):
if not frappe.db.exists("Warehouse Type", "Transit"):
diff --git a/erpnext/stock/doctype/pick_list/pick_list.js b/erpnext/stock/doctype/pick_list/pick_list.js
index c72fa864960..bcb349cf3b7 100644
--- a/erpnext/stock/doctype/pick_list/pick_list.js
+++ b/erpnext/stock/doctype/pick_list/pick_list.js
@@ -100,7 +100,11 @@ frappe.ui.form.on("Pick List", {
}
},
- pick_manually: function (frm) {
+ pick_manually: (frm) => {
+ frm.trigger("update_warehouse_property");
+ },
+
+ update_warehouse_property: (frm) => {
frm.fields_dict.locations.grid.update_docfield_property(
"warehouse",
"read_only",
@@ -114,6 +118,7 @@ frappe.ui.form.on("Pick List", {
},
refresh: (frm) => {
frm.trigger("add_get_items_button");
+ frm.trigger("update_warehouse_property");
if (frm.doc.docstatus === 1) {
const status_completed = frm.doc.status === "Completed";
frm.set_df_property("locations", "allow_on_submit", status_completed ? 0 : 1);
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index c38d3aa17f0..6400c826245 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -1421,8 +1421,8 @@ def make_purchase_invoice(source_name, target_doc=None, args=None):
"postprocess": update_item,
"filter": lambda d: (
get_pending_qty(d)[0] <= 0 if not doc.get("is_return") else get_pending_qty(d)[0] > 0
- )
- and select_item(d),
+ ),
+ "condition": select_item,
},
"Purchase Taxes and Charges": {
"doctype": "Purchase Taxes and Charges",
diff --git a/erpnext/stock/doctype/putaway_rule/putaway_rule.py b/erpnext/stock/doctype/putaway_rule/putaway_rule.py
index 923c34e1b95..c2e596f1128 100644
--- a/erpnext/stock/doctype/putaway_rule/putaway_rule.py
+++ b/erpnext/stock/doctype/putaway_rule/putaway_rule.py
@@ -131,7 +131,12 @@ def apply_putaway_rule(doctype, items, company, sync=None, purpose=None):
at_capacity, rules = get_ordered_putaway_rules(item_code, company, source_warehouse=source_warehouse)
if not rules:
- warehouse = source_warehouse or item.get("warehouse")
+ warehouse = (
+ (source_warehouse or item.get("warehouse"))
+ if not item.get("t_warehouse")
+ else item.get("t_warehouse")
+ )
+
if at_capacity:
# rules available, but no free space
items_not_accomodated.append([item_code, pending_qty])
diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index ef92c5ea2a2..d0143941660 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -2083,6 +2083,70 @@ class TestStockEntry(IntegrationTestCase):
self.assertEqual(jv.accounts[0].account, "Stock In Hand - _TPC")
self.assertEqual(jv.accounts[1].account, "Stock Adjustment - _TPC")
+ def test_batch_item_additional_cost_for_material_transfer_entry(self):
+ item_code = "_Test Batch Item Additional Cost MTE"
+ make_item(
+ item_code,
+ {
+ "is_stock_item": 1,
+ "has_batch_no": 1,
+ "create_new_batch": 1,
+ "batch_naming_series": "BT-MTE.#####",
+ },
+ )
+
+ se = make_stock_entry(
+ item_code=item_code,
+ target="_Test Warehouse - _TC",
+ qty=2,
+ basic_rate=100,
+ use_serial_batch_fields=1,
+ )
+
+ batch_no = get_batch_from_bundle(se.items[0].serial_and_batch_bundle)
+
+ se = make_stock_entry(
+ item_code=item_code,
+ source="_Test Warehouse - _TC",
+ target="_Test Warehouse 1 - _TC",
+ batch_no=batch_no,
+ use_serial_batch_fields=1,
+ qty=2,
+ purpose="Material Transfer",
+ do_not_save=True,
+ )
+
+ se.append(
+ "additional_costs",
+ {
+ "cost_center": "Main - _TC",
+ "amount": 50,
+ "expense_account": "Stock Adjustment - _TC",
+ "description": "Test Additional Cost",
+ },
+ )
+ se.save()
+ self.assertEqual(se.additional_costs[0].amount, 50)
+ self.assertEqual(se.items[0].basic_rate, 100)
+ self.assertEqual(se.items[0].valuation_rate, 125)
+
+ se.submit()
+ self.assertEqual(se.items[0].basic_rate, 100)
+ self.assertEqual(se.items[0].valuation_rate, 125)
+
+ incoming_rate = frappe.db.get_value(
+ "Stock Ledger Entry",
+ {
+ "item_code": item_code,
+ "warehouse": "_Test Warehouse 1 - _TC",
+ "voucher_type": "Stock Entry",
+ "voucher_no": se.name,
+ },
+ "incoming_rate",
+ )
+
+ self.assertEqual(incoming_rate, 125.0)
+
def make_serialized_item(self, **args):
args = frappe._dict(args)
diff --git a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py
index 17508cacf25..fae038441d3 100644
--- a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py
+++ b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py
@@ -696,7 +696,7 @@ def get_available_qty_to_reserve(
sre = frappe.qb.DocType("Stock Reservation Entry")
query = (
frappe.qb.from_(sre)
- .select(Sum(sre.reserved_qty - sre.delivered_qty))
+ .select(Sum(sre.reserved_qty - sre.delivered_qty - sre.transferred_qty - sre.consumed_qty))
.where(
(sre.docstatus == 1)
& (sre.item_code == item_code)
@@ -1329,6 +1329,36 @@ class StockReservation:
self.update_delivered_qty(data)
self.make_stock_reservation_entry(data)
+ extra_items = set((entry.item_code, entry.warehouse) for entry in items_to_reserve) - set(
+ (row.item_code, row.warehouse) for row in reservation_entries
+ )
+ for entry in [
+ entry for entry in items_to_reserve if (entry.item_code, entry.warehouse) in extra_items
+ ]:
+ available_qty = get_available_qty_to_reserve(entry.item_code, entry.warehouse)
+ if not available_qty:
+ frappe.msgprint(
+ _("No available quantity to reserve for item {0} in warehouse {1}").format(
+ frappe.bold(entry.item_code), frappe.bold(entry.warehouse)
+ ),
+ alert=True,
+ )
+ continue
+ sre = frappe.new_doc("Stock Reservation Entry")
+ sre.company = self.doc.company
+ sre.voucher_type = entry.voucher_type
+ sre.voucher_no = entry.voucher_no
+ sre.voucher_detail_no = entry.voucher_detail_no
+ sre.available_qty = available_qty
+ sre.voucher_qty = entry.required_qty
+ sre.item_code = entry.item_code
+ sre.warehouse = entry.warehouse
+ sre.reserved_qty = min(sre.available_qty, entry.qty)
+ sre.has_serial_no = frappe.get_value("Item", sre.item_code, "has_serial_no")
+ sre.has_batch_no = frappe.get_value("Item", sre.item_code, "has_batch_no")
+ sre.insert()
+ sre.submit()
+
def update_delivered_qty(self, data):
for name, delivered_qty in data.get("sre_names").items():
doctype = frappe.qb.DocType("Stock Reservation Entry")
diff --git a/erpnext/stock/report/stock_balance/stock_balance.js b/erpnext/stock/report/stock_balance/stock_balance.js
index c53e80096d3..b59ee57b154 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.js
+++ b/erpnext/stock/report/stock_balance/stock_balance.js
@@ -61,10 +61,10 @@ frappe.query_reports["Stock Balance"] = {
},
});
- data = data.map(({ name, description }) => {
+ data = data.map(({ name, ...rest }) => {
return {
value: name,
- description: description,
+ description: Object.values(rest),
};
});
diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.js b/erpnext/stock/report/stock_ledger/stock_ledger.js
index db6c0c06281..9b85a83c03b 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.js
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.js
@@ -56,11 +56,10 @@ frappe.query_reports["Stock Ledger"] = {
as_dict: 1,
},
});
-
- data = data.map(({ name, description }) => {
+ data = data.map(({ name, ...rest }) => {
return {
value: name,
- description: description,
+ description: Object.values(rest),
};
});
diff --git a/erpnext/stock/serial_batch_bundle.py b/erpnext/stock/serial_batch_bundle.py
index e896f0bc8fd..d34b449c819 100644
--- a/erpnext/stock/serial_batch_bundle.py
+++ b/erpnext/stock/serial_batch_bundle.py
@@ -186,7 +186,23 @@ class SerialBatchBundle:
}
if self.sle.actual_qty < 0 and self.is_material_transfer():
- values_to_update["valuation_rate"] = flt(sn_doc.avg_rate)
+ basic_rate = flt(sn_doc.avg_rate)
+ ste_detail = frappe.db.get_value(
+ "Stock Entry Detail",
+ self.sle.voucher_detail_no,
+ ["additional_cost", "landed_cost_voucher_amount", "transfer_qty"],
+ as_dict=True,
+ )
+
+ additional_cost = 0.0
+
+ if ste_detail:
+ additional_cost = (
+ flt(ste_detail.additional_cost) + flt(ste_detail.landed_cost_voucher_amount)
+ ) / flt(ste_detail.transfer_qty)
+
+ values_to_update["basic_rate"] = basic_rate
+ values_to_update["valuation_rate"] = basic_rate + additional_cost
if not frappe.get_single_value(
"Stock Settings", "do_not_update_serial_batch_on_creation_of_auto_bundle"
diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py
index fa081db21b9..78fd3ca2a75 100644
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -126,8 +126,9 @@ def get_stock_balance(
extra_cond = ""
if inventory_dimensions_dict:
for field, value in inventory_dimensions_dict.items():
+ column = frappe.utils.sanitize_column(field)
args[field] = value
- extra_cond += f" and {field} = %({field})s"
+ extra_cond += f" and {column} = %({field})s"
last_entry = get_previous_sle(args, extra_cond=extra_cond)